www/ephemera: Upgrade version 2.9 => 4.0

Also fix incorrect use of @sample keyword

PR:		192532
Submitted by:	maintainer (James Bailie)

5 files changed, 14 insertions, 44 deletions

diff --git a/www/ephemera/Makefile b/www/ephemera/Makefile
index eaf4a0df0ee6..79bffcaa53b2 100644
--- a/www/ephemera/Makefile
+++ b/www/ephemera/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ephemera
-PORTVERSION=	2.9
-PORTREVISION=	1
+PORTVERSION=	4.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.mammothcheese.ca/
 
@@ -12,4 +11,6 @@ COMMENT=	Blog server
 
 RUN_DEPENDS=	munger:${PORTSDIR}/lang/munger
 
+USE_SQLITE=	3
+
 .include <bsd.port.mk>
diff --git a/www/ephemera/distinfo b/www/ephemera/distinfo
index 3e6b90c8de2e..7ac3f3188ce7 100644
--- a/www/ephemera/distinfo
+++ b/www/ephemera/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ephemera-2.9.tar.gz) = 6fc71c9628f66dcd34a3c46f4d96246d1862b62c5f73289a0139d6b1c81b6223
-SIZE (ephemera-2.9.tar.gz) = 27160
+SHA256 (ephemera-4.0.tar.gz) = 628ccdb8e49f813670d91d1150a858a0c355c4d694ba907d2325614b3ae4f319
+SIZE (ephemera-4.0.tar.gz) = 20298
diff --git a/www/ephemera/files/patch-Makefile b/www/ephemera/files/patch-Makefile
deleted file mode 100644
index 7e0508bd506c..000000000000
--- a/www/ephemera/files/patch-Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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:
diff --git a/www/ephemera/pkg-descr b/www/ephemera/pkg-descr
index 6da2d46fdb43..60d734363eb6 100644
--- a/www/ephemera/pkg-descr
+++ b/www/ephemera/pkg-descr
@@ -1,5 +1,5 @@
 Ephemera is an SCGI application server dedicated to serving-up a single
-blog, implemented in 1000 lines of Munger(1).  Ephemera creates the
-simplest blog that is still useful, in its author's estimation.
+blog.  Ephemera creates the simplest blog that is still useful in its
+author's estimation.
 
 WWW: http://www.mammothcheese.ca/
diff --git a/www/ephemera/pkg-plist b/www/ephemera/pkg-plist
index 09352e0a17ad..540ece06c7ff 100644
--- a/www/ephemera/pkg-plist
+++ b/www/ephemera/pkg-plist
@@ -1,10 +1,10 @@
 bin/ephemera
-bin/ephemera-add
-bin/ephemera-delete
-bin/ephemera-extract
-bin/ephemera-replace
-bin/ephemera-generate
-etc/ephemera.css.sample
+bin/add.munger
+bin/delete.munger
+bin/extract.munger
+bin/replace.munger
+etc/ephemera.css
+etc/ephemera.config
 etc/rc.d/ephemera
-@sample etc/ephemera.config.sample
 man/man8/ephemera.8.gz
+@unexec if cmp -s %D/etc/ephemera.config %D/etc/ephemera.config.dist; then rm -f %D/etc/ephemera.config; fi