Attachment #145577 for bug #192532

Lines 1-9 Link Here

(-)./ephemera/Makefile (-4 / +11 lines)
1	# Created by: James Bailie <jimmy@mammothcheese.ca>	1	# New ports collection makefile for: ephemera
2	# $FreeBSD: head/www/ephemera/Makefile 360161 2014-07-02 10:18:07Z vanilla $	2	# Date created: Sat, 17 Apr 2010 18:17:00 EDT
		3	# Whom: James Bailie <jimmy@mammothcheese.ca>
		4	#
		5	# $FreeBSD: ports/www/ephemera/Makefile,v 1.15 2011/04/29 23:49:54 tabthorpe Exp $
		6	#
3		7
4	PORTNAME= ephemera	8	PORTNAME= ephemera
5	PORTVERSION= 2.9	9	PORTVERSION= 4.0
6	PORTREVISION= 1
7	CATEGORIES= www	10	CATEGORIES= www
8	MASTER_SITES= http://www.mammothcheese.ca/	11	MASTER_SITES= http://www.mammothcheese.ca/
9		12
Lines 12-15 Link Here
12		15
13	RUN_DEPENDS= munger:${PORTSDIR}/lang/munger	16	RUN_DEPENDS= munger:${PORTSDIR}/lang/munger
14		17
		18	SQLITE_USE= SQLITE=3
		19
		20	MANCOMPRESSED= yes
		21
15	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./ephemera/distinfo (-2 / +2 lines)
1	SHA256 (ephemera-2.9.tar.gz) = 6fc71c9628f66dcd34a3c46f4d96246d1862b62c5f73289a0139d6b1c81b6223	1	SHA256 (ephemera-4.0.tar.gz) = 3452d6b7c425a56df4b039aaacc8d29720b9ee21d7ea566da309a87bae6e4f91
2	SIZE (ephemera-2.9.tar.gz) = 27160	2	SIZE (ephemera-4.0.tar.gz) = 46295




--- Makefile.orig	2014-07-02 18:12:33.669901208 +0800
+++ Makefile	2014-07-02 18:13:37.501883432 +0800
@@ -52,18 +52,17 @@ ephemera.css.sample: ephemera.css
 
 .PHONY: install
 install: all
-	${INSTALL_SCRIPT} ephemera ${DEST}
+	${INSTALL_SCRIPT} ephemera $(DESTDIR)${DEST}
 	${GZIP_CMD} ephemera.8
-	${INSTALL_MAN} ephemera.8.gz ${MANDIR}
-	${INSTALL_DATA} ephemera.css.sample ${ETCDIR}
-	${INSTALL_DATA} ephemera.config.dist ${ETCDIR}	
-	if [ ! -e ${ETCDIR}/ephemera.config ]; then ${INSTALL_DATA} ephemera.config ${ETCDIR}; fi
-	${INSTALL_SCRIPT} ephemera.rc ${ETCDIR}/rc.d/ephemera
-	${INSTALL_SCRIPT} ephemera-add ${DEST}
-	${INSTALL_SCRIPT} ephemera-replace ${DEST}
-	${INSTALL_SCRIPT} ephemera-extract ${DEST}
-	${INSTALL_SCRIPT} ephemera-delete ${DEST}
-	${INSTALL_SCRIPT} ephemera-generate ${DEST}
+	${INSTALL_MAN} ephemera.8.gz $(DESTDIR)${MANDIR}
+	${INSTALL_DATA} ephemera.css.sample $(DESTDIR)${ETCDIR}
+	${INSTALL_DATA} ephemera.config.dist $(DESTDIR)${ETCDIR}/ephemera.config.sample
+	${INSTALL_SCRIPT} ephemera.rc $(DESTDIR)${ETCDIR}/rc.d/ephemera
+	${INSTALL_SCRIPT} ephemera-add $(DESTDIR)${DEST}
+	${INSTALL_SCRIPT} ephemera-replace $(DESTDIR)${DEST}
+	${INSTALL_SCRIPT} ephemera-extract $(DESTDIR)${DEST}
+	${INSTALL_SCRIPT} ephemera-delete $(DESTDIR)${DEST}
+	${INSTALL_SCRIPT} ephemera-generate $(DESTDIR)${DEST}
 
 .PHONY: deinstall
 deinstall:

Lines 1-5 Link Here

(-)./ephemera/pkg-descr (-2 / +2 lines)
1	Ephemera is an SCGI application server dedicated to serving-up a single	1	Ephemera is an SCGI application server dedicated to serving-up a single
2	blog, implemented in 1000 lines of Munger(1). Ephemera creates the	2	blog. Ephemera creates the simplest blog that is still useful, in its
3	simplest blog that is still useful, in its author's estimation.	3	author's estimation.
4		4
5	WWW: http://www.mammothcheese.ca/	5	WWW: http://www.mammothcheese.ca/

Lines 1-10 Link Here

(-)./ephemera/pkg-plist (-7 / +7 lines)
1	bin/ephemera	1	bin/ephemera
2	bin/ephemera-add	2	bin/add.munger
3	bin/ephemera-delete	3	bin/delete.munger
4	bin/ephemera-extract	4	bin/extract.munger
5	bin/ephemera-replace	5	bin/replace.munger
6	bin/ephemera-generate	6	etc/ephemera.css
7	etc/ephemera.css.sample	7	etc/ephemera.config
8	etc/rc.d/ephemera	8	etc/rc.d/ephemera
9	@sample etc/ephemera.config.sample
10	man/man8/ephemera.8.gz	9	man/man8/ephemera.8.gz
		10	@unexec if cmp -s %D/etc/ephemera.config %D/etc/ephemera.config.dist; then rm -f %D/etc/ephemera.config; fi

Return to bug 192532

Lines 1-31 Link Here

(-)./ephemera/files/patch-Makefile (-31 lines)
1	--- Makefile.orig 2014-07-02 18:12:33.669901208 +0800
2	+++ Makefile 2014-07-02 18:13:37.501883432 +0800
3	@@ -52,18 +52,17 @@ ephemera.css.sample: ephemera.css
4
5	.PHONY: install
6	install: all
7	- ${INSTALL_SCRIPT} ephemera ${DEST}
8	+ ${INSTALL_SCRIPT} ephemera $(DESTDIR)${DEST}
9	${GZIP_CMD} ephemera.8
10	- ${INSTALL_MAN} ephemera.8.gz ${MANDIR}
11	- ${INSTALL_DATA} ephemera.css.sample ${ETCDIR}
12	- ${INSTALL_DATA} ephemera.config.dist ${ETCDIR}
13	- if [ ! -e ${ETCDIR}/ephemera.config ]; then ${INSTALL_DATA} ephemera.config ${ETCDIR}; fi
14	- ${INSTALL_SCRIPT} ephemera.rc ${ETCDIR}/rc.d/ephemera
15	- ${INSTALL_SCRIPT} ephemera-add ${DEST}
16	- ${INSTALL_SCRIPT} ephemera-replace ${DEST}
17	- ${INSTALL_SCRIPT} ephemera-extract ${DEST}
18	- ${INSTALL_SCRIPT} ephemera-delete ${DEST}
19	- ${INSTALL_SCRIPT} ephemera-generate ${DEST}
20	+ ${INSTALL_MAN} ephemera.8.gz $(DESTDIR)${MANDIR}
21	+ ${INSTALL_DATA} ephemera.css.sample $(DESTDIR)${ETCDIR}
22	+ ${INSTALL_DATA} ephemera.config.dist $(DESTDIR)${ETCDIR}/ephemera.config.sample
23	+ ${INSTALL_SCRIPT} ephemera.rc $(DESTDIR)${ETCDIR}/rc.d/ephemera
24	+ ${INSTALL_SCRIPT} ephemera-add $(DESTDIR)${DEST}
25	+ ${INSTALL_SCRIPT} ephemera-replace $(DESTDIR)${DEST}
26	+ ${INSTALL_SCRIPT} ephemera-extract $(DESTDIR)${DEST}
27	+ ${INSTALL_SCRIPT} ephemera-delete $(DESTDIR)${DEST}
28	+ ${INSTALL_SCRIPT} ephemera-generate $(DESTDIR)${DEST}
29
30	.PHONY: deinstall
31	deinstall: