- Update to 1.4.4.6

  - This fixes a few potential cross-site scripting bugs which was intended
    to be fixed in 1.4.4.5
- Apply PORTDOCS
- Add some minor fixes about COMMENT and DISTNAME

PR:		77247
Submitted by:	Alex Varju <freebsd-ports at varju.ca>

9 files changed, 24 insertions, 36 deletions

diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index 6556999ad89f..5685dd51688b 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.4.4.5
+PORTVERSION=	1.4.4.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.5$/-pl5/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-pl${PORTVERSION:E}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANGPACKS}
 DIST_SUBDIR=	gallery
 
 MAINTAINER=	freebsd-ports@varju.ca
-COMMENT=	Gallery is a slick web based photo album written using PHP
+COMMENT=	A slick web based photo album written using PHP
 
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 		jhead:${PORTSDIR}/graphics/jhead \
@@ -73,8 +73,8 @@ PLIST_SUB=		NLS="@comment "
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-DOCFILES=	AUTHORS ChangeLog README
-EXCEPTFILES=	${DOCFILES} LICENSE.txt
+PORTDOCS=	AUTHORS ChangeLog README
+EXCEPTFILES=	${PORTDOCS} LICENSE.txt
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB+=	GALLERYDIR=${GALLERYDIR}
 
@@ -111,7 +111,7 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
-	@ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
+	@ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 .if !defined(BATCH)
 	@ ${CAT} ${PKGMESSAGE}
diff --git a/www/gallery/distinfo b/www/gallery/distinfo
index 115c56c678f5..8cf8e63e0b58 100644
--- a/www/gallery/distinfo
+++ b/www/gallery/distinfo
@@ -1,5 +1,5 @@
-MD5 (gallery/gallery-1.4.4-pl5.tar.gz) = a590b494115f2c5ffa23417839311614
-SIZE (gallery/gallery-1.4.4-pl5.tar.gz) = 1759534
+MD5 (gallery/gallery-1.4.4-pl6.tar.gz) = 0e9ba8dedd57fe10d06b39ad047f14bd
+SIZE (gallery/gallery-1.4.4-pl6.tar.gz) = 1759019
 MD5 (gallery/af_ZA-1.4.4-pl4.tar.gz) = 1c1f984406ed6477bf930b75ecfb719b
 SIZE (gallery/af_ZA-1.4.4-pl4.tar.gz) = 120693
 MD5 (gallery/bg_BG-1.4.4-pl4.tar.gz) = 276bb336fd1697cb2b4cbd8a0886ba1c
diff --git a/www/gallery/pkg-plist b/www/gallery/pkg-plist
index d635ac2128fa..7603bb5cbcc8 100644
--- a/www/gallery/pkg-plist
+++ b/www/gallery/pkg-plist
@@ -1,6 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%GALLERYDIR%%/ChangeLog.archive.gz
 %%GALLERYDIR%%/Version.php
 %%GALLERYDIR%%/add_comment.php
@@ -1038,5 +1035,4 @@
 @dirrm %%GALLERYDIR%%/classes/database/mysql
 @dirrm %%GALLERYDIR%%/classes/database
 @dirrm %%GALLERYDIR%%/classes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index 6556999ad89f..5685dd51688b 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.4.4.5
+PORTVERSION=	1.4.4.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.5$/-pl5/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-pl${PORTVERSION:E}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANGPACKS}
 DIST_SUBDIR=	gallery
 
 MAINTAINER=	freebsd-ports@varju.ca
-COMMENT=	Gallery is a slick web based photo album written using PHP
+COMMENT=	A slick web based photo album written using PHP
 
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 		jhead:${PORTSDIR}/graphics/jhead \
@@ -73,8 +73,8 @@ PLIST_SUB=		NLS="@comment "
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-DOCFILES=	AUTHORS ChangeLog README
-EXCEPTFILES=	${DOCFILES} LICENSE.txt
+PORTDOCS=	AUTHORS ChangeLog README
+EXCEPTFILES=	${PORTDOCS} LICENSE.txt
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB+=	GALLERYDIR=${GALLERYDIR}
 
@@ -111,7 +111,7 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
-	@ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
+	@ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 .if !defined(BATCH)
 	@ ${CAT} ${PKGMESSAGE}
diff --git a/www/gallery2/distinfo b/www/gallery2/distinfo
index 115c56c678f5..8cf8e63e0b58 100644
--- a/www/gallery2/distinfo
+++ b/www/gallery2/distinfo
@@ -1,5 +1,5 @@
-MD5 (gallery/gallery-1.4.4-pl5.tar.gz) = a590b494115f2c5ffa23417839311614
-SIZE (gallery/gallery-1.4.4-pl5.tar.gz) = 1759534
+MD5 (gallery/gallery-1.4.4-pl6.tar.gz) = 0e9ba8dedd57fe10d06b39ad047f14bd
+SIZE (gallery/gallery-1.4.4-pl6.tar.gz) = 1759019
 MD5 (gallery/af_ZA-1.4.4-pl4.tar.gz) = 1c1f984406ed6477bf930b75ecfb719b
 SIZE (gallery/af_ZA-1.4.4-pl4.tar.gz) = 120693
 MD5 (gallery/bg_BG-1.4.4-pl4.tar.gz) = 276bb336fd1697cb2b4cbd8a0886ba1c
diff --git a/www/gallery2/pkg-plist b/www/gallery2/pkg-plist
index d635ac2128fa..7603bb5cbcc8 100644
--- a/www/gallery2/pkg-plist
+++ b/www/gallery2/pkg-plist
@@ -1,6 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%GALLERYDIR%%/ChangeLog.archive.gz
 %%GALLERYDIR%%/Version.php
 %%GALLERYDIR%%/add_comment.php
@@ -1038,5 +1035,4 @@
 @dirrm %%GALLERYDIR%%/classes/database/mysql
 @dirrm %%GALLERYDIR%%/classes/database
 @dirrm %%GALLERYDIR%%/classes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index 6556999ad89f..5685dd51688b 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.4.4.5
+PORTVERSION=	1.4.4.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.5$/-pl5/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-pl${PORTVERSION:E}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANGPACKS}
 DIST_SUBDIR=	gallery
 
 MAINTAINER=	freebsd-ports@varju.ca
-COMMENT=	Gallery is a slick web based photo album written using PHP
+COMMENT=	A slick web based photo album written using PHP
 
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 		jhead:${PORTSDIR}/graphics/jhead \
@@ -73,8 +73,8 @@ PLIST_SUB=		NLS="@comment "
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-DOCFILES=	AUTHORS ChangeLog README
-EXCEPTFILES=	${DOCFILES} LICENSE.txt
+PORTDOCS=	AUTHORS ChangeLog README
+EXCEPTFILES=	${PORTDOCS} LICENSE.txt
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB+=	GALLERYDIR=${GALLERYDIR}
 
@@ -111,7 +111,7 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
-	@ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
+	@ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 .if !defined(BATCH)
 	@ ${CAT} ${PKGMESSAGE}
diff --git a/www/gallery3/distinfo b/www/gallery3/distinfo
index 115c56c678f5..8cf8e63e0b58 100644
--- a/www/gallery3/distinfo
+++ b/www/gallery3/distinfo
@@ -1,5 +1,5 @@
-MD5 (gallery/gallery-1.4.4-pl5.tar.gz) = a590b494115f2c5ffa23417839311614
-SIZE (gallery/gallery-1.4.4-pl5.tar.gz) = 1759534
+MD5 (gallery/gallery-1.4.4-pl6.tar.gz) = 0e9ba8dedd57fe10d06b39ad047f14bd
+SIZE (gallery/gallery-1.4.4-pl6.tar.gz) = 1759019
 MD5 (gallery/af_ZA-1.4.4-pl4.tar.gz) = 1c1f984406ed6477bf930b75ecfb719b
 SIZE (gallery/af_ZA-1.4.4-pl4.tar.gz) = 120693
 MD5 (gallery/bg_BG-1.4.4-pl4.tar.gz) = 276bb336fd1697cb2b4cbd8a0886ba1c
diff --git a/www/gallery3/pkg-plist b/www/gallery3/pkg-plist
index d635ac2128fa..7603bb5cbcc8 100644
--- a/www/gallery3/pkg-plist
+++ b/www/gallery3/pkg-plist
@@ -1,6 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%GALLERYDIR%%/ChangeLog.archive.gz
 %%GALLERYDIR%%/Version.php
 %%GALLERYDIR%%/add_comment.php
@@ -1038,5 +1035,4 @@
 @dirrm %%GALLERYDIR%%/classes/database/mysql
 @dirrm %%GALLERYDIR%%/classes/database
 @dirrm %%GALLERYDIR%%/classes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true