- update to 1.4.9

- use SUB_FILES for pkg-message and drop pre-patch [1]

PR:		ports/103023
Submitted by:	Babak Farrokhi (maintainer), itetcu (me) [1]

4 files changed, 11 insertions, 28 deletions

diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile
index 3ea3ea33a964..0de1780dcd88 100644
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	coppermine
-PORTVERSION=	1.4.8
+PORTVERSION=	1.4.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -36,6 +36,9 @@ EXCEPTFILES=	${DOCFILES} COPYING docs/COPYING
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB=	CPGDIR=${CPGDIR}
 
+SUB_FILES+=	pkg-message
+SUB_LIST+=	CPGDIR=${CPGDIR}
+
 pre-everything::
 .if ${CPGDIR} == "www/coppermine"
 	@${ECHO_MSG} ""
@@ -49,11 +52,6 @@ pre-everything::
 post-extract:
 	@${CHMOD} -R o-w ${WRKSRC}
 
-pre-patch:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-	    -e 's|%%CPGDIR%%|${CPGDIR}|g' \
-	    ${.CURDIR}/pkg-message > ${PKGMESSAGE}
-
 do-install:
 	@${MKDIR} -m 0755 ${PREFIX}/${CPGDIR}
 	cd ${WRKSRC} && \
@@ -68,7 +66,7 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 
 ########################################################################
-# The following targets are for the port maintainer.  Use are your own #
+# The following targets are for the port maintainer. Use it atyour own #
 # risk, no user-serviceable parts inside.                              #
 ########################################################################
 # Assuming the port is installed cleanly (i.e. it's unconfigured)
diff --git a/www/coppermine/distinfo b/www/coppermine/distinfo
index ffcc83b9f672..4f247298ea76 100644
--- a/www/coppermine/distinfo
+++ b/www/coppermine/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpg1.4.8.zip) = d9b9f341e20ae788b228e6c69abd99ae
-SHA256 (cpg1.4.8.zip) = 90a9dfb84d2678543850fda449e6113c085e07a464c5f4c641cd5c193fdcebb5
-SIZE (cpg1.4.8.zip) = 3102364
+MD5 (cpg1.4.9.zip) = 5c561318e5147a40a545717533c4df8d
+SHA256 (cpg1.4.9.zip) = dbc3f4ad20ec7d6e02c5bb24a65f16c7b1265d5132f50c6dc63f8c14f42bde20
+SIZE (cpg1.4.9.zip) = 3190717
diff --git a/www/coppermine/pkg-message b/www/coppermine/pkg-message
deleted file mode 100644
index 50e5fe65110e..000000000000
--- a/www/coppermine/pkg-message
+++ /dev/null
@@ -1,18 +0,0 @@
-****************************************************************
-The Coppermine Photo Gallery has been installed in the directory
-%%PREFIX%%/%%CPGDIR%%.
-
-You must add appropriate configuration directives to your
-apache configuration file (%%PREFIX%%/etc/apache/httpd.conf).
-A typical configuration would be:
-
-    Alias /coppermine/ "%%PREFIX%%/%%CPGDIR%%/"
-
-    <Directory "%%PREFIX%%/%%CPGDIR%%">
-	Options Indexes FollowSymlinks MultiViews
-	AllowOverride None
-	Order allow,deny
-	Allow from all
-    </Directory>
-
-****************************************************************
diff --git a/www/coppermine/pkg-plist b/www/coppermine/pkg-plist
index 39cb1f2c7927..62dea8ac7d69 100644
--- a/www/coppermine/pkg-plist
+++ b/www/coppermine/pkg-plist
@@ -109,6 +109,7 @@
 %%CPGDIR%%/docs/pics/up.gif
 %%CPGDIR%%/docs/pics/user_folder_link.gif
 %%CPGDIR%%/docs/pics/usermgr.gif
+%%CPGDIR%%/docs/pics/usermgr_edit.gif
 %%CPGDIR%%/docs/pics/util_re-size.gif
 %%CPGDIR%%/docs/pics/valid-css.gif
 %%CPGDIR%%/docs/pics/valid-xhtml10.gif
@@ -379,7 +380,9 @@
 %%CPGDIR%%/keyword_create_dict.php
 %%CPGDIR%%/keyword_select.php
 %%CPGDIR%%/keywordmgr.php
+%%CPGDIR%%/lang/albanian.php
 %%CPGDIR%%/lang/basque.php
+%%CPGDIR%%/lang/brazilian_portuguese.php
 %%CPGDIR%%/lang/bulgarian.php
 %%CPGDIR%%/lang/chinese_big5.php
 %%CPGDIR%%/lang/chinese_gb.php