- Update to version 1.3

- Add additional dependencies
- Install documentation to $DOCSDIR
- Place installation path under build-time user control
- Various style improvements

Approved by:	MAINTAINER

12 files changed, 636 insertions, 528 deletions

diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index fb081595fbe4..c105f9cdf4d3 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -6,42 +6,53 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.2.5
+PORTVERSION=	1.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jamie@hermans.ca
 
-RUN_DEPENDS=	${LOCALBASE}/share/netpbm:${PORTSDIR}/graphics/netpbm \
-		${LOCALBASE}/bin/jhead:${PORTSDIR}/graphics/jhead
+RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
+		jhead:${PORTSDIR}/graphics/jhead \
+		unzip:${PORTSDIR}/archivers/unzip \
+		${LOCALBASE}/lib/php/System.php:${PORTSDIR}/www/mod_php4
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
+DOCFILES=	AUTHORS ChangeLog README UPGRADING
+EXCEPTFILES=	${DOCFILES} LICENSE.txt
+CPIO=		cpio --quiet -pdum -R
+PLIST_SUB=	GALLERYDIR=${GALLERYDIR}
+
+GALLERYDIR?=	www/data/gallery
+WWWOWN?=	www
+WWWGRP?=	www
+
+pre-fetch:
+.if !defined(GALLERYDIR)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Define GALLERYDIR to override default of 'www/data/gallery'."
+	@${ECHO_MSG} ""
+.endif
+
+post-configure:
+	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \
+	  -e 's#%%GALLERYDIR%%#${GALLERYDIR}#g' pkg-message > ${PKGMESSAGE}
 
 do-install:
-	${MKDIR} -v ${LOCALBASE}/www/data
-	cd ${WRKDIR}; \
-		${CP} -R gallery ${LOCALBASE}/www/data
+	@ ${MKDIR} -m 0755 ${PREFIX}/${GALLERYDIR}
+	@ cd ${WRKSRC} && find * -name \*.bat ${EXCEPTFILES:S/^/-o -name /} \
+	  -o -print | ${CPIO} ${WWWOWN}:${WWWGRP} ${PREFIX}/${GALLERYDIR}
 
 post-install:
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
-	@${ECHO} " Please consider adding the following 3 lines to your httpd.conf"
-	@${ECHO} ""
-	@${ECHO} "	<Directory ${LOCALBASE}/www/data/gallery>"
-	@${ECHO} "		AllowOverride Options FileInfo"
-	@${ECHO} "	</Directory>"
-	@${ECHO} ""
-	@${ECHO} " Then restart apache: 'apachectl restart'"
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
-	@${ECHO} " Please visit 'http://{host.domain}/gallery/' in a"
-	@${ECHO} " web-browser and follow the configuration instructions."
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCSDIR}
+	@ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
+.endif
+.if !defined(BATCH)
+	@ ${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/gallery/distinfo b/www/gallery/distinfo
index 4ed591713c74..9a1f4befb142 100644
--- a/www/gallery/distinfo
+++ b/www/gallery/distinfo
@@ -1 +1 @@
-MD5 (gallery-1.2.5.tar.gz) = 1a32e57b36ca06d22475938e1e1b19f9
+MD5 (gallery-1.3.tar.gz) = 9922b47cf734cb55065a502a2c1324f9
diff --git a/www/gallery/pkg-message b/www/gallery/pkg-message
index c4d1087090c9..7b0efc8225b7 100644
--- a/www/gallery/pkg-message
+++ b/www/gallery/pkg-message
@@ -2,11 +2,11 @@
 
  Please consider adding the following 3 lines to your httpd.conf
 	
-	<Directory /usr/local/www/data/gallery>
+	<Directory %%PREFIX%%/%%GALLERYDIR%%>
 		AllowOverride Options FileInfo
 	</Directory>
 
- Then restart apache: 'apachectl restart'
+ Then restart apache: 'apachectl graceful'
 
 *****************************************************************
 
diff --git a/www/gallery/pkg-plist b/www/gallery/pkg-plist
index bd5e505bbbfb..ac2665ac97f2 100644
--- a/www/gallery/pkg-plist
+++ b/www/gallery/pkg-plist
@@ -1,149 +1,174 @@
-www/data/gallery/add_comment.php
-www/data/gallery/add_photos.php
-www/data/gallery/album_permissions.php
-www/data/gallery/albums.php
-www/data/gallery/ChangeLog
-www/data/gallery/classes/Album.php
-www/data/gallery/classes/AlbumDB.php
-www/data/gallery/classes/AlbumItem.php
-www/data/gallery/classes/Comment.php
-www/data/gallery/classes/Database.php
-www/data/gallery/classes/database/mysql/Database.php
-www/data/gallery/classes/EverybodyUser.php
-www/data/gallery/classes/gallery/User.php
-www/data/gallery/classes/gallery/UserDB.php
-www/data/gallery/classes/Image.php
-www/data/gallery/classes/NobodyUser.php
-www/data/gallery/classes/nuke5/AdminUser.php
-www/data/gallery/classes/nuke5/User.php
-www/data/gallery/classes/nuke5/UserDB.php
-www/data/gallery/classes/postnuke/User.php
-www/data/gallery/classes/postnuke/UserDB.php
-www/data/gallery/classes/User.php
-www/data/gallery/classes/UserDB.php
-www/data/gallery/configure.bat
-www/data/gallery/configure.sh
-www/data/gallery/create_user.php
-www/data/gallery/css/embedded_style.css.default
-www/data/gallery/css/standalone_style.css.default
-www/data/gallery/delete_album.php
-www/data/gallery/delete_photo.php
-www/data/gallery/delete_user.php
-www/data/gallery/do_command.php
-www/data/gallery/edit_appearance.php
-www/data/gallery/edit_caption.php
-www/data/gallery/edit_field.php
-www/data/gallery/edit_thumb.php
-www/data/gallery/errors/configmode.php
-www/data/gallery/errors/configure_help.php
-www/data/gallery/errors/configure_instructions.php
-www/data/gallery/errors/needinit.php
-www/data/gallery/errors/reconfigure.php
-www/data/gallery/errors/unconfigured.php
-www/data/gallery/gallery_remote.php
-www/data/gallery/highlight_photo.php
-www/data/gallery/html/errorRow.inc
-www/data/gallery/html/userData.inc
-www/data/gallery/html_wrap/album.footer.default
-www/data/gallery/html_wrap/album.header.default
-www/data/gallery/html_wrap/gallery.footer.default
-www/data/gallery/html_wrap/gallery.header.default
-www/data/gallery/html_wrap/inline_albumthumb.footer.default
-www/data/gallery/html_wrap/inline_albumthumb.header.default
-www/data/gallery/html_wrap/inline_photo.footer.default
-www/data/gallery/html_wrap/inline_photo.header.default
-www/data/gallery/html_wrap/photo.footer.default
-www/data/gallery/html_wrap/photo.header.default
-www/data/gallery/html_wrap/search.footer.default
-www/data/gallery/html_wrap/search.header.default
-www/data/gallery/html_wrap/wrapper.footer.default
-www/data/gallery/html_wrap/wrapper.header.default
-www/data/gallery/images/admin_delete.gif
-www/data/gallery/images/admin_hide.gif
-www/data/gallery/images/admin_highlight.gif
-www/data/gallery/images/admin_move.gif
-www/data/gallery/images/admin_rotate.gif
-www/data/gallery/images/admin_unhide.gif
-www/data/gallery/images/computer.gif
-www/data/gallery/images/gallery-tag.png
-www/data/gallery/images/movie.thumb.jpg
-www/data/gallery/images/nav_dot.gif
-www/data/gallery/images/nav_dot_left.gif
-www/data/gallery/images/nav_dot_right.gif
-www/data/gallery/images/nav_first.gif
-www/data/gallery/images/nav_home.gif
-www/data/gallery/images/nav_last.gif
-www/data/gallery/images/nav_next.gif
-www/data/gallery/images/nav_page.gif
-www/data/gallery/images/nav_prev.gif
-www/data/gallery/images/pixel_trans.gif
-www/data/gallery/index.php
-www/data/gallery/init.php
-www/data/gallery/java/ImageTools.jar
-www/data/gallery/layout/adminbox.inc
-www/data/gallery/layout/breadcrumb.inc
-www/data/gallery/layout/commentdraw.inc
-www/data/gallery/layout/navigator.inc
-www/data/gallery/layout/navphoto.inc
-www/data/gallery/layout/searchdraw.inc
-www/data/gallery/LICENSE.txt
-www/data/gallery/login.php
-www/data/gallery/manage_users.php
-www/data/gallery/modify_user.php
-www/data/gallery/move_album.php
-www/data/gallery/move_photo.php
-www/data/gallery/platform/fs_unix.php
-www/data/gallery/platform/fs_win32.php
-www/data/gallery/progress_uploading.php
-www/data/gallery/README
-www/data/gallery/rename_album.php
-www/data/gallery/resize_photo.php
-www/data/gallery/rotate_photo.php
-www/data/gallery/save_photos.php
-www/data/gallery/search.php
-www/data/gallery/secure.bat
-www/data/gallery/secure.sh
-www/data/gallery/session.php
-www/data/gallery/setup/.htaccess
-www/data/gallery/setup/check.inc
-www/data/gallery/setup/config_data.inc
-www/data/gallery/setup/confirm.inc
-www/data/gallery/setup/constants.inc
-www/data/gallery/setup/defaults.inc
-www/data/gallery/setup/functions.inc
-www/data/gallery/setup/gpl.txt
-www/data/gallery/setup/index.php
-www/data/gallery/setup/init.php
-www/data/gallery/setup/mod_rewrite.template
-www/data/gallery/setup/php_value.template
-www/data/gallery/setup/php_value_ok.php
-www/data/gallery/setup/phpinfo.php
-www/data/gallery/setup/write.inc
-www/data/gallery/sort_album.php
-www/data/gallery/todo
-www/data/gallery/upgrade_album.php
-www/data/gallery/UPGRADING
-www/data/gallery/user_preferences.php
-www/data/gallery/util.php
-www/data/gallery/Version.php
-www/data/gallery/view_album.php
-www/data/gallery/view_photo.php
-www/data/gallery/view_photo_properties.php
-@dirrm www/data/gallery/classes/database/mysql
-@dirrm www/data/gallery/classes/database
-@dirrm www/data/gallery/classes/gallery
-@dirrm www/data/gallery/classes/nuke5
-@dirrm www/data/gallery/classes/postnuke
-@dirrm www/data/gallery/classes
-@dirrm www/data/gallery/css
-@dirrm www/data/gallery/errors
-@dirrm www/data/gallery/html
-@dirrm www/data/gallery/html_wrap
-@dirrm www/data/gallery/images
-@dirrm www/data/gallery/java
-@dirrm www/data/gallery/layout
-@dirrm www/data/gallery/platform
-@dirrm www/data/gallery/setup
-@dirrm www/data/gallery
-@dirrm www/data
-@dirrm www
+%%PORTDOCS%%share/doc/gallery/AUTHORS
+%%PORTDOCS%%share/doc/gallery/ChangeLog
+%%PORTDOCS%%share/doc/gallery/README
+%%PORTDOCS%%share/doc/gallery/UPGRADING
+%%GALLERYDIR%%/Version.php
+%%GALLERYDIR%%/add_comment.php
+%%GALLERYDIR%%/add_photos.php
+%%GALLERYDIR%%/album_permissions.php
+%%GALLERYDIR%%/albums.php
+%%GALLERYDIR%%/captionator.php
+%%GALLERYDIR%%/classes/Album.php
+%%GALLERYDIR%%/classes/AlbumDB.php
+%%GALLERYDIR%%/classes/AlbumItem.php
+%%GALLERYDIR%%/classes/Comment.php
+%%GALLERYDIR%%/classes/Database.php
+%%GALLERYDIR%%/classes/EverybodyUser.php
+%%GALLERYDIR%%/classes/Image.php
+%%GALLERYDIR%%/classes/LoggedInUser.php
+%%GALLERYDIR%%/classes/NobodyUser.php
+%%GALLERYDIR%%/classes/User.php
+%%GALLERYDIR%%/classes/UserDB.php
+%%GALLERYDIR%%/classes/database/mysql/Database.php
+%%GALLERYDIR%%/classes/gallery/User.php
+%%GALLERYDIR%%/classes/gallery/UserDB.php
+%%GALLERYDIR%%/classes/nuke5/AdminUser.php
+%%GALLERYDIR%%/classes/nuke5/User.php
+%%GALLERYDIR%%/classes/nuke5/UserDB.php
+%%GALLERYDIR%%/classes/postnuke/User.php
+%%GALLERYDIR%%/classes/postnuke/UserDB.php
+%%GALLERYDIR%%/classes/postnuke0.7.1/User.php
+%%GALLERYDIR%%/classes/postnuke0.7.1/UserDB.php
+%%GALLERYDIR%%/configure.sh
+%%GALLERYDIR%%/create_user.php
+%%GALLERYDIR%%/css/embedded_style.css.default
+%%GALLERYDIR%%/css/standalone_style.css.default
+%%GALLERYDIR%%/delete_album.php
+%%GALLERYDIR%%/delete_photo.php
+%%GALLERYDIR%%/delete_user.php
+%%GALLERYDIR%%/do_command.php
+%%GALLERYDIR%%/edit_appearance.php
+%%GALLERYDIR%%/edit_caption.php
+%%GALLERYDIR%%/edit_field.php
+%%GALLERYDIR%%/edit_thumb.php
+%%GALLERYDIR%%/errors/configmode.php
+%%GALLERYDIR%%/errors/configure_help.php
+%%GALLERYDIR%%/errors/configure_instructions.php
+%%GALLERYDIR%%/errors/needinit.php
+%%GALLERYDIR%%/errors/reconfigure.php
+%%GALLERYDIR%%/errors/unconfigured.php
+%%GALLERYDIR%%/gallery_remote.php
+%%GALLERYDIR%%/highlight_photo.php
+%%GALLERYDIR%%/html/errorRow.inc
+%%GALLERYDIR%%/html/userData.inc
+%%GALLERYDIR%%/html_wrap/album.footer.default
+%%GALLERYDIR%%/html_wrap/album.header.default
+%%GALLERYDIR%%/html_wrap/gallery.footer.default
+%%GALLERYDIR%%/html_wrap/gallery.header.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.footer.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.header.default
+%%GALLERYDIR%%/html_wrap/inline_gallerythumb.frame.default
+%%GALLERYDIR%%/html_wrap/inline_moviethumb.frame.default
+%%GALLERYDIR%%/html_wrap/inline_photo.footer.default
+%%GALLERYDIR%%/html_wrap/inline_photo.header.default
+%%GALLERYDIR%%/html_wrap/inline_photothumb.frame.default
+%%GALLERYDIR%%/html_wrap/photo.footer.default
+%%GALLERYDIR%%/html_wrap/photo.header.default
+%%GALLERYDIR%%/html_wrap/search.footer.default
+%%GALLERYDIR%%/html_wrap/search.header.default
+%%GALLERYDIR%%/html_wrap/slideshow.footer.default
+%%GALLERYDIR%%/html_wrap/slideshow.header.default
+%%GALLERYDIR%%/html_wrap/wrapper.footer.default
+%%GALLERYDIR%%/html_wrap/wrapper.header.default
+%%GALLERYDIR%%/images/admin_delete.gif
+%%GALLERYDIR%%/images/admin_hide.gif
+%%GALLERYDIR%%/images/admin_highlight.gif
+%%GALLERYDIR%%/images/admin_move.gif
+%%GALLERYDIR%%/images/admin_rotate.gif
+%%GALLERYDIR%%/images/admin_unhide.gif
+%%GALLERYDIR%%/images/albumthumb_BB.gif
+%%GALLERYDIR%%/images/albumthumb_BL.gif
+%%GALLERYDIR%%/images/albumthumb_BR.gif
+%%GALLERYDIR%%/images/albumthumb_RR.gif
+%%GALLERYDIR%%/images/albumthumb_TR.gif
+%%GALLERYDIR%%/images/computer.gif
+%%GALLERYDIR%%/images/donate.jpg
+%%GALLERYDIR%%/images/gallery-tag.png
+%%GALLERYDIR%%/images/movie.thumb.jpg
+%%GALLERYDIR%%/images/nav_dot.gif
+%%GALLERYDIR%%/images/nav_dot_left.gif
+%%GALLERYDIR%%/images/nav_dot_right.gif
+%%GALLERYDIR%%/images/nav_first.gif
+%%GALLERYDIR%%/images/nav_home.gif
+%%GALLERYDIR%%/images/nav_last.gif
+%%GALLERYDIR%%/images/nav_next.gif
+%%GALLERYDIR%%/images/nav_page.gif
+%%GALLERYDIR%%/images/nav_prev.gif
+%%GALLERYDIR%%/images/pixel_trans.gif
+%%GALLERYDIR%%/images/uploading.gif
+%%GALLERYDIR%%/index.php
+%%GALLERYDIR%%/init.php
+%%GALLERYDIR%%/java/ImageTools.jar
+%%GALLERYDIR%%/js/client_sniff.js
+%%GALLERYDIR%%/layout/adminbox.inc
+%%GALLERYDIR%%/layout/breadcrumb.inc
+%%GALLERYDIR%%/layout/commentbox.inc
+%%GALLERYDIR%%/layout/commentboxbottom.inc
+%%GALLERYDIR%%/layout/commentboxtop.inc
+%%GALLERYDIR%%/layout/commentdraw.inc
+%%GALLERYDIR%%/layout/navigator.inc
+%%GALLERYDIR%%/layout/navphoto.inc
+%%GALLERYDIR%%/layout/searchdraw.inc
+%%GALLERYDIR%%/login.php
+%%GALLERYDIR%%/manage_users.php
+%%GALLERYDIR%%/modify_user.php
+%%GALLERYDIR%%/move_album.php
+%%GALLERYDIR%%/move_photo.php
+%%GALLERYDIR%%/platform/fs_unix.php
+%%GALLERYDIR%%/platform/fs_win32.php
+%%GALLERYDIR%%/progress_uploading.php
+%%GALLERYDIR%%/rename_album.php
+%%GALLERYDIR%%/resize_photo.php
+%%GALLERYDIR%%/rotate_photo.php
+%%GALLERYDIR%%/save_photos.php
+%%GALLERYDIR%%/search.php
+%%GALLERYDIR%%/secure.sh
+%%GALLERYDIR%%/session.php
+%%GALLERYDIR%%/setup/.htaccess
+%%GALLERYDIR%%/setup/check.inc
+%%GALLERYDIR%%/setup/check_netpbm.php
+%%GALLERYDIR%%/setup/config_data.inc
+%%GALLERYDIR%%/setup/confirm.inc
+%%GALLERYDIR%%/setup/constants.inc
+%%GALLERYDIR%%/setup/defaults.inc
+%%GALLERYDIR%%/setup/functions.inc
+%%GALLERYDIR%%/setup/gpl.txt
+%%GALLERYDIR%%/setup/index.php
+%%GALLERYDIR%%/setup/init.php
+%%GALLERYDIR%%/setup/mod_rewrite.template
+%%GALLERYDIR%%/setup/php_value.template
+%%GALLERYDIR%%/setup/php_value_ok.php
+%%GALLERYDIR%%/setup/phpinfo.php
+%%GALLERYDIR%%/setup/session_test.php
+%%GALLERYDIR%%/setup/write.inc
+%%GALLERYDIR%%/slideshow.php
+%%GALLERYDIR%%/slideshow_low.php
+%%GALLERYDIR%%/sort_album.php
+%%GALLERYDIR%%/todo
+%%GALLERYDIR%%/upgrade_album.php
+%%GALLERYDIR%%/user_preferences.php
+%%GALLERYDIR%%/util.php
+%%GALLERYDIR%%/view_album.php
+%%GALLERYDIR%%/view_comments.php
+%%GALLERYDIR%%/view_photo.php
+%%GALLERYDIR%%/view_photo_properties.php
+@dirrm %%GALLERYDIR%%/setup
+@dirrm %%GALLERYDIR%%/platform
+@dirrm %%GALLERYDIR%%/layout
+@dirrm %%GALLERYDIR%%/js
+@dirrm %%GALLERYDIR%%/java
+@dirrm %%GALLERYDIR%%/images
+@dirrm %%GALLERYDIR%%/html
+@dirrm %%GALLERYDIR%%/errors
+@dirrm %%GALLERYDIR%%/classes/postnuke0.7.1
+@dirrm %%GALLERYDIR%%/classes/postnuke
+@dirrm %%GALLERYDIR%%/classes/nuke5
+@dirrm %%GALLERYDIR%%/classes/gallery
+@dirrm %%GALLERYDIR%%/classes/database/mysql
+@dirrm %%GALLERYDIR%%/classes/database
+@dirrm %%GALLERYDIR%%/classes
+%%PORTDOCS%%@dirrm share/doc/gallery
+@unexec rmdir %D/%%GALLERYDIR%%/html_wrap 2>/dev/null || true
+@unexec rmdir %D/%%GALLERYDIR%%/css 2>/dev/null || true
+@unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index fb081595fbe4..c105f9cdf4d3 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -6,42 +6,53 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.2.5
+PORTVERSION=	1.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jamie@hermans.ca
 
-RUN_DEPENDS=	${LOCALBASE}/share/netpbm:${PORTSDIR}/graphics/netpbm \
-		${LOCALBASE}/bin/jhead:${PORTSDIR}/graphics/jhead
+RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
+		jhead:${PORTSDIR}/graphics/jhead \
+		unzip:${PORTSDIR}/archivers/unzip \
+		${LOCALBASE}/lib/php/System.php:${PORTSDIR}/www/mod_php4
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
+DOCFILES=	AUTHORS ChangeLog README UPGRADING
+EXCEPTFILES=	${DOCFILES} LICENSE.txt
+CPIO=		cpio --quiet -pdum -R
+PLIST_SUB=	GALLERYDIR=${GALLERYDIR}
+
+GALLERYDIR?=	www/data/gallery
+WWWOWN?=	www
+WWWGRP?=	www
+
+pre-fetch:
+.if !defined(GALLERYDIR)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Define GALLERYDIR to override default of 'www/data/gallery'."
+	@${ECHO_MSG} ""
+.endif
+
+post-configure:
+	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \
+	  -e 's#%%GALLERYDIR%%#${GALLERYDIR}#g' pkg-message > ${PKGMESSAGE}
 
 do-install:
-	${MKDIR} -v ${LOCALBASE}/www/data
-	cd ${WRKDIR}; \
-		${CP} -R gallery ${LOCALBASE}/www/data
+	@ ${MKDIR} -m 0755 ${PREFIX}/${GALLERYDIR}
+	@ cd ${WRKSRC} && find * -name \*.bat ${EXCEPTFILES:S/^/-o -name /} \
+	  -o -print | ${CPIO} ${WWWOWN}:${WWWGRP} ${PREFIX}/${GALLERYDIR}
 
 post-install:
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
-	@${ECHO} " Please consider adding the following 3 lines to your httpd.conf"
-	@${ECHO} ""
-	@${ECHO} "	<Directory ${LOCALBASE}/www/data/gallery>"
-	@${ECHO} "		AllowOverride Options FileInfo"
-	@${ECHO} "	</Directory>"
-	@${ECHO} ""
-	@${ECHO} " Then restart apache: 'apachectl restart'"
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
-	@${ECHO} " Please visit 'http://{host.domain}/gallery/' in a"
-	@${ECHO} " web-browser and follow the configuration instructions."
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCSDIR}
+	@ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
+.endif
+.if !defined(BATCH)
+	@ ${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/gallery2/distinfo b/www/gallery2/distinfo
index 4ed591713c74..9a1f4befb142 100644
--- a/www/gallery2/distinfo
+++ b/www/gallery2/distinfo
@@ -1 +1 @@
-MD5 (gallery-1.2.5.tar.gz) = 1a32e57b36ca06d22475938e1e1b19f9
+MD5 (gallery-1.3.tar.gz) = 9922b47cf734cb55065a502a2c1324f9
diff --git a/www/gallery2/pkg-message b/www/gallery2/pkg-message
index c4d1087090c9..7b0efc8225b7 100644
--- a/www/gallery2/pkg-message
+++ b/www/gallery2/pkg-message
@@ -2,11 +2,11 @@
 
  Please consider adding the following 3 lines to your httpd.conf
 	
-	<Directory /usr/local/www/data/gallery>
+	<Directory %%PREFIX%%/%%GALLERYDIR%%>
 		AllowOverride Options FileInfo
 	</Directory>
 
- Then restart apache: 'apachectl restart'
+ Then restart apache: 'apachectl graceful'
 
 *****************************************************************
 
diff --git a/www/gallery2/pkg-plist b/www/gallery2/pkg-plist
index bd5e505bbbfb..ac2665ac97f2 100644
--- a/www/gallery2/pkg-plist
+++ b/www/gallery2/pkg-plist
@@ -1,149 +1,174 @@
-www/data/gallery/add_comment.php
-www/data/gallery/add_photos.php
-www/data/gallery/album_permissions.php
-www/data/gallery/albums.php
-www/data/gallery/ChangeLog
-www/data/gallery/classes/Album.php
-www/data/gallery/classes/AlbumDB.php
-www/data/gallery/classes/AlbumItem.php
-www/data/gallery/classes/Comment.php
-www/data/gallery/classes/Database.php
-www/data/gallery/classes/database/mysql/Database.php
-www/data/gallery/classes/EverybodyUser.php
-www/data/gallery/classes/gallery/User.php
-www/data/gallery/classes/gallery/UserDB.php
-www/data/gallery/classes/Image.php
-www/data/gallery/classes/NobodyUser.php
-www/data/gallery/classes/nuke5/AdminUser.php
-www/data/gallery/classes/nuke5/User.php
-www/data/gallery/classes/nuke5/UserDB.php
-www/data/gallery/classes/postnuke/User.php
-www/data/gallery/classes/postnuke/UserDB.php
-www/data/gallery/classes/User.php
-www/data/gallery/classes/UserDB.php
-www/data/gallery/configure.bat
-www/data/gallery/configure.sh
-www/data/gallery/create_user.php
-www/data/gallery/css/embedded_style.css.default
-www/data/gallery/css/standalone_style.css.default
-www/data/gallery/delete_album.php
-www/data/gallery/delete_photo.php
-www/data/gallery/delete_user.php
-www/data/gallery/do_command.php
-www/data/gallery/edit_appearance.php
-www/data/gallery/edit_caption.php
-www/data/gallery/edit_field.php
-www/data/gallery/edit_thumb.php
-www/data/gallery/errors/configmode.php
-www/data/gallery/errors/configure_help.php
-www/data/gallery/errors/configure_instructions.php
-www/data/gallery/errors/needinit.php
-www/data/gallery/errors/reconfigure.php
-www/data/gallery/errors/unconfigured.php
-www/data/gallery/gallery_remote.php
-www/data/gallery/highlight_photo.php
-www/data/gallery/html/errorRow.inc
-www/data/gallery/html/userData.inc
-www/data/gallery/html_wrap/album.footer.default
-www/data/gallery/html_wrap/album.header.default
-www/data/gallery/html_wrap/gallery.footer.default
-www/data/gallery/html_wrap/gallery.header.default
-www/data/gallery/html_wrap/inline_albumthumb.footer.default
-www/data/gallery/html_wrap/inline_albumthumb.header.default
-www/data/gallery/html_wrap/inline_photo.footer.default
-www/data/gallery/html_wrap/inline_photo.header.default
-www/data/gallery/html_wrap/photo.footer.default
-www/data/gallery/html_wrap/photo.header.default
-www/data/gallery/html_wrap/search.footer.default
-www/data/gallery/html_wrap/search.header.default
-www/data/gallery/html_wrap/wrapper.footer.default
-www/data/gallery/html_wrap/wrapper.header.default
-www/data/gallery/images/admin_delete.gif
-www/data/gallery/images/admin_hide.gif
-www/data/gallery/images/admin_highlight.gif
-www/data/gallery/images/admin_move.gif
-www/data/gallery/images/admin_rotate.gif
-www/data/gallery/images/admin_unhide.gif
-www/data/gallery/images/computer.gif
-www/data/gallery/images/gallery-tag.png
-www/data/gallery/images/movie.thumb.jpg
-www/data/gallery/images/nav_dot.gif
-www/data/gallery/images/nav_dot_left.gif
-www/data/gallery/images/nav_dot_right.gif
-www/data/gallery/images/nav_first.gif
-www/data/gallery/images/nav_home.gif
-www/data/gallery/images/nav_last.gif
-www/data/gallery/images/nav_next.gif
-www/data/gallery/images/nav_page.gif
-www/data/gallery/images/nav_prev.gif
-www/data/gallery/images/pixel_trans.gif
-www/data/gallery/index.php
-www/data/gallery/init.php
-www/data/gallery/java/ImageTools.jar
-www/data/gallery/layout/adminbox.inc
-www/data/gallery/layout/breadcrumb.inc
-www/data/gallery/layout/commentdraw.inc
-www/data/gallery/layout/navigator.inc
-www/data/gallery/layout/navphoto.inc
-www/data/gallery/layout/searchdraw.inc
-www/data/gallery/LICENSE.txt
-www/data/gallery/login.php
-www/data/gallery/manage_users.php
-www/data/gallery/modify_user.php
-www/data/gallery/move_album.php
-www/data/gallery/move_photo.php
-www/data/gallery/platform/fs_unix.php
-www/data/gallery/platform/fs_win32.php
-www/data/gallery/progress_uploading.php
-www/data/gallery/README
-www/data/gallery/rename_album.php
-www/data/gallery/resize_photo.php
-www/data/gallery/rotate_photo.php
-www/data/gallery/save_photos.php
-www/data/gallery/search.php
-www/data/gallery/secure.bat
-www/data/gallery/secure.sh
-www/data/gallery/session.php
-www/data/gallery/setup/.htaccess
-www/data/gallery/setup/check.inc
-www/data/gallery/setup/config_data.inc
-www/data/gallery/setup/confirm.inc
-www/data/gallery/setup/constants.inc
-www/data/gallery/setup/defaults.inc
-www/data/gallery/setup/functions.inc
-www/data/gallery/setup/gpl.txt
-www/data/gallery/setup/index.php
-www/data/gallery/setup/init.php
-www/data/gallery/setup/mod_rewrite.template
-www/data/gallery/setup/php_value.template
-www/data/gallery/setup/php_value_ok.php
-www/data/gallery/setup/phpinfo.php
-www/data/gallery/setup/write.inc
-www/data/gallery/sort_album.php
-www/data/gallery/todo
-www/data/gallery/upgrade_album.php
-www/data/gallery/UPGRADING
-www/data/gallery/user_preferences.php
-www/data/gallery/util.php
-www/data/gallery/Version.php
-www/data/gallery/view_album.php
-www/data/gallery/view_photo.php
-www/data/gallery/view_photo_properties.php
-@dirrm www/data/gallery/classes/database/mysql
-@dirrm www/data/gallery/classes/database
-@dirrm www/data/gallery/classes/gallery
-@dirrm www/data/gallery/classes/nuke5
-@dirrm www/data/gallery/classes/postnuke
-@dirrm www/data/gallery/classes
-@dirrm www/data/gallery/css
-@dirrm www/data/gallery/errors
-@dirrm www/data/gallery/html
-@dirrm www/data/gallery/html_wrap
-@dirrm www/data/gallery/images
-@dirrm www/data/gallery/java
-@dirrm www/data/gallery/layout
-@dirrm www/data/gallery/platform
-@dirrm www/data/gallery/setup
-@dirrm www/data/gallery
-@dirrm www/data
-@dirrm www
+%%PORTDOCS%%share/doc/gallery/AUTHORS
+%%PORTDOCS%%share/doc/gallery/ChangeLog
+%%PORTDOCS%%share/doc/gallery/README
+%%PORTDOCS%%share/doc/gallery/UPGRADING
+%%GALLERYDIR%%/Version.php
+%%GALLERYDIR%%/add_comment.php
+%%GALLERYDIR%%/add_photos.php
+%%GALLERYDIR%%/album_permissions.php
+%%GALLERYDIR%%/albums.php
+%%GALLERYDIR%%/captionator.php
+%%GALLERYDIR%%/classes/Album.php
+%%GALLERYDIR%%/classes/AlbumDB.php
+%%GALLERYDIR%%/classes/AlbumItem.php
+%%GALLERYDIR%%/classes/Comment.php
+%%GALLERYDIR%%/classes/Database.php
+%%GALLERYDIR%%/classes/EverybodyUser.php
+%%GALLERYDIR%%/classes/Image.php
+%%GALLERYDIR%%/classes/LoggedInUser.php
+%%GALLERYDIR%%/classes/NobodyUser.php
+%%GALLERYDIR%%/classes/User.php
+%%GALLERYDIR%%/classes/UserDB.php
+%%GALLERYDIR%%/classes/database/mysql/Database.php
+%%GALLERYDIR%%/classes/gallery/User.php
+%%GALLERYDIR%%/classes/gallery/UserDB.php
+%%GALLERYDIR%%/classes/nuke5/AdminUser.php
+%%GALLERYDIR%%/classes/nuke5/User.php
+%%GALLERYDIR%%/classes/nuke5/UserDB.php
+%%GALLERYDIR%%/classes/postnuke/User.php
+%%GALLERYDIR%%/classes/postnuke/UserDB.php
+%%GALLERYDIR%%/classes/postnuke0.7.1/User.php
+%%GALLERYDIR%%/classes/postnuke0.7.1/UserDB.php
+%%GALLERYDIR%%/configure.sh
+%%GALLERYDIR%%/create_user.php
+%%GALLERYDIR%%/css/embedded_style.css.default
+%%GALLERYDIR%%/css/standalone_style.css.default
+%%GALLERYDIR%%/delete_album.php
+%%GALLERYDIR%%/delete_photo.php
+%%GALLERYDIR%%/delete_user.php
+%%GALLERYDIR%%/do_command.php
+%%GALLERYDIR%%/edit_appearance.php
+%%GALLERYDIR%%/edit_caption.php
+%%GALLERYDIR%%/edit_field.php
+%%GALLERYDIR%%/edit_thumb.php
+%%GALLERYDIR%%/errors/configmode.php
+%%GALLERYDIR%%/errors/configure_help.php
+%%GALLERYDIR%%/errors/configure_instructions.php
+%%GALLERYDIR%%/errors/needinit.php
+%%GALLERYDIR%%/errors/reconfigure.php
+%%GALLERYDIR%%/errors/unconfigured.php
+%%GALLERYDIR%%/gallery_remote.php
+%%GALLERYDIR%%/highlight_photo.php
+%%GALLERYDIR%%/html/errorRow.inc
+%%GALLERYDIR%%/html/userData.inc
+%%GALLERYDIR%%/html_wrap/album.footer.default
+%%GALLERYDIR%%/html_wrap/album.header.default
+%%GALLERYDIR%%/html_wrap/gallery.footer.default
+%%GALLERYDIR%%/html_wrap/gallery.header.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.footer.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.header.default
+%%GALLERYDIR%%/html_wrap/inline_gallerythumb.frame.default
+%%GALLERYDIR%%/html_wrap/inline_moviethumb.frame.default
+%%GALLERYDIR%%/html_wrap/inline_photo.footer.default
+%%GALLERYDIR%%/html_wrap/inline_photo.header.default
+%%GALLERYDIR%%/html_wrap/inline_photothumb.frame.default
+%%GALLERYDIR%%/html_wrap/photo.footer.default
+%%GALLERYDIR%%/html_wrap/photo.header.default
+%%GALLERYDIR%%/html_wrap/search.footer.default
+%%GALLERYDIR%%/html_wrap/search.header.default
+%%GALLERYDIR%%/html_wrap/slideshow.footer.default
+%%GALLERYDIR%%/html_wrap/slideshow.header.default
+%%GALLERYDIR%%/html_wrap/wrapper.footer.default
+%%GALLERYDIR%%/html_wrap/wrapper.header.default
+%%GALLERYDIR%%/images/admin_delete.gif
+%%GALLERYDIR%%/images/admin_hide.gif
+%%GALLERYDIR%%/images/admin_highlight.gif
+%%GALLERYDIR%%/images/admin_move.gif
+%%GALLERYDIR%%/images/admin_rotate.gif
+%%GALLERYDIR%%/images/admin_unhide.gif
+%%GALLERYDIR%%/images/albumthumb_BB.gif
+%%GALLERYDIR%%/images/albumthumb_BL.gif
+%%GALLERYDIR%%/images/albumthumb_BR.gif
+%%GALLERYDIR%%/images/albumthumb_RR.gif
+%%GALLERYDIR%%/images/albumthumb_TR.gif
+%%GALLERYDIR%%/images/computer.gif
+%%GALLERYDIR%%/images/donate.jpg
+%%GALLERYDIR%%/images/gallery-tag.png
+%%GALLERYDIR%%/images/movie.thumb.jpg
+%%GALLERYDIR%%/images/nav_dot.gif
+%%GALLERYDIR%%/images/nav_dot_left.gif
+%%GALLERYDIR%%/images/nav_dot_right.gif
+%%GALLERYDIR%%/images/nav_first.gif
+%%GALLERYDIR%%/images/nav_home.gif
+%%GALLERYDIR%%/images/nav_last.gif
+%%GALLERYDIR%%/images/nav_next.gif
+%%GALLERYDIR%%/images/nav_page.gif
+%%GALLERYDIR%%/images/nav_prev.gif
+%%GALLERYDIR%%/images/pixel_trans.gif
+%%GALLERYDIR%%/images/uploading.gif
+%%GALLERYDIR%%/index.php
+%%GALLERYDIR%%/init.php
+%%GALLERYDIR%%/java/ImageTools.jar
+%%GALLERYDIR%%/js/client_sniff.js
+%%GALLERYDIR%%/layout/adminbox.inc
+%%GALLERYDIR%%/layout/breadcrumb.inc
+%%GALLERYDIR%%/layout/commentbox.inc
+%%GALLERYDIR%%/layout/commentboxbottom.inc
+%%GALLERYDIR%%/layout/commentboxtop.inc
+%%GALLERYDIR%%/layout/commentdraw.inc
+%%GALLERYDIR%%/layout/navigator.inc
+%%GALLERYDIR%%/layout/navphoto.inc
+%%GALLERYDIR%%/layout/searchdraw.inc
+%%GALLERYDIR%%/login.php
+%%GALLERYDIR%%/manage_users.php
+%%GALLERYDIR%%/modify_user.php
+%%GALLERYDIR%%/move_album.php
+%%GALLERYDIR%%/move_photo.php
+%%GALLERYDIR%%/platform/fs_unix.php
+%%GALLERYDIR%%/platform/fs_win32.php
+%%GALLERYDIR%%/progress_uploading.php
+%%GALLERYDIR%%/rename_album.php
+%%GALLERYDIR%%/resize_photo.php
+%%GALLERYDIR%%/rotate_photo.php
+%%GALLERYDIR%%/save_photos.php
+%%GALLERYDIR%%/search.php
+%%GALLERYDIR%%/secure.sh
+%%GALLERYDIR%%/session.php
+%%GALLERYDIR%%/setup/.htaccess
+%%GALLERYDIR%%/setup/check.inc
+%%GALLERYDIR%%/setup/check_netpbm.php
+%%GALLERYDIR%%/setup/config_data.inc
+%%GALLERYDIR%%/setup/confirm.inc
+%%GALLERYDIR%%/setup/constants.inc
+%%GALLERYDIR%%/setup/defaults.inc
+%%GALLERYDIR%%/setup/functions.inc
+%%GALLERYDIR%%/setup/gpl.txt
+%%GALLERYDIR%%/setup/index.php
+%%GALLERYDIR%%/setup/init.php
+%%GALLERYDIR%%/setup/mod_rewrite.template
+%%GALLERYDIR%%/setup/php_value.template
+%%GALLERYDIR%%/setup/php_value_ok.php
+%%GALLERYDIR%%/setup/phpinfo.php
+%%GALLERYDIR%%/setup/session_test.php
+%%GALLERYDIR%%/setup/write.inc
+%%GALLERYDIR%%/slideshow.php
+%%GALLERYDIR%%/slideshow_low.php
+%%GALLERYDIR%%/sort_album.php
+%%GALLERYDIR%%/todo
+%%GALLERYDIR%%/upgrade_album.php
+%%GALLERYDIR%%/user_preferences.php
+%%GALLERYDIR%%/util.php
+%%GALLERYDIR%%/view_album.php
+%%GALLERYDIR%%/view_comments.php
+%%GALLERYDIR%%/view_photo.php
+%%GALLERYDIR%%/view_photo_properties.php
+@dirrm %%GALLERYDIR%%/setup
+@dirrm %%GALLERYDIR%%/platform
+@dirrm %%GALLERYDIR%%/layout
+@dirrm %%GALLERYDIR%%/js
+@dirrm %%GALLERYDIR%%/java
+@dirrm %%GALLERYDIR%%/images
+@dirrm %%GALLERYDIR%%/html
+@dirrm %%GALLERYDIR%%/errors
+@dirrm %%GALLERYDIR%%/classes/postnuke0.7.1
+@dirrm %%GALLERYDIR%%/classes/postnuke
+@dirrm %%GALLERYDIR%%/classes/nuke5
+@dirrm %%GALLERYDIR%%/classes/gallery
+@dirrm %%GALLERYDIR%%/classes/database/mysql
+@dirrm %%GALLERYDIR%%/classes/database
+@dirrm %%GALLERYDIR%%/classes
+%%PORTDOCS%%@dirrm share/doc/gallery
+@unexec rmdir %D/%%GALLERYDIR%%/html_wrap 2>/dev/null || true
+@unexec rmdir %D/%%GALLERYDIR%%/css 2>/dev/null || true
+@unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index fb081595fbe4..c105f9cdf4d3 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -6,42 +6,53 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.2.5
+PORTVERSION=	1.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jamie@hermans.ca
 
-RUN_DEPENDS=	${LOCALBASE}/share/netpbm:${PORTSDIR}/graphics/netpbm \
-		${LOCALBASE}/bin/jhead:${PORTSDIR}/graphics/jhead
+RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
+		jhead:${PORTSDIR}/graphics/jhead \
+		unzip:${PORTSDIR}/archivers/unzip \
+		${LOCALBASE}/lib/php/System.php:${PORTSDIR}/www/mod_php4
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
+DOCFILES=	AUTHORS ChangeLog README UPGRADING
+EXCEPTFILES=	${DOCFILES} LICENSE.txt
+CPIO=		cpio --quiet -pdum -R
+PLIST_SUB=	GALLERYDIR=${GALLERYDIR}
+
+GALLERYDIR?=	www/data/gallery
+WWWOWN?=	www
+WWWGRP?=	www
+
+pre-fetch:
+.if !defined(GALLERYDIR)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Define GALLERYDIR to override default of 'www/data/gallery'."
+	@${ECHO_MSG} ""
+.endif
+
+post-configure:
+	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \
+	  -e 's#%%GALLERYDIR%%#${GALLERYDIR}#g' pkg-message > ${PKGMESSAGE}
 
 do-install:
-	${MKDIR} -v ${LOCALBASE}/www/data
-	cd ${WRKDIR}; \
-		${CP} -R gallery ${LOCALBASE}/www/data
+	@ ${MKDIR} -m 0755 ${PREFIX}/${GALLERYDIR}
+	@ cd ${WRKSRC} && find * -name \*.bat ${EXCEPTFILES:S/^/-o -name /} \
+	  -o -print | ${CPIO} ${WWWOWN}:${WWWGRP} ${PREFIX}/${GALLERYDIR}
 
 post-install:
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
-	@${ECHO} " Please consider adding the following 3 lines to your httpd.conf"
-	@${ECHO} ""
-	@${ECHO} "	<Directory ${LOCALBASE}/www/data/gallery>"
-	@${ECHO} "		AllowOverride Options FileInfo"
-	@${ECHO} "	</Directory>"
-	@${ECHO} ""
-	@${ECHO} " Then restart apache: 'apachectl restart'"
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
-	@${ECHO} " Please visit 'http://{host.domain}/gallery/' in a"
-	@${ECHO} " web-browser and follow the configuration instructions."
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCSDIR}
+	@ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
+.endif
+.if !defined(BATCH)
+	@ ${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/gallery3/distinfo b/www/gallery3/distinfo
index 4ed591713c74..9a1f4befb142 100644
--- a/www/gallery3/distinfo
+++ b/www/gallery3/distinfo
@@ -1 +1 @@
-MD5 (gallery-1.2.5.tar.gz) = 1a32e57b36ca06d22475938e1e1b19f9
+MD5 (gallery-1.3.tar.gz) = 9922b47cf734cb55065a502a2c1324f9
diff --git a/www/gallery3/pkg-message b/www/gallery3/pkg-message
index c4d1087090c9..7b0efc8225b7 100644
--- a/www/gallery3/pkg-message
+++ b/www/gallery3/pkg-message
@@ -2,11 +2,11 @@
 
  Please consider adding the following 3 lines to your httpd.conf
 	
-	<Directory /usr/local/www/data/gallery>
+	<Directory %%PREFIX%%/%%GALLERYDIR%%>
 		AllowOverride Options FileInfo
 	</Directory>
 
- Then restart apache: 'apachectl restart'
+ Then restart apache: 'apachectl graceful'
 
 *****************************************************************
 
diff --git a/www/gallery3/pkg-plist b/www/gallery3/pkg-plist
index bd5e505bbbfb..ac2665ac97f2 100644
--- a/www/gallery3/pkg-plist
+++ b/www/gallery3/pkg-plist
@@ -1,149 +1,174 @@
-www/data/gallery/add_comment.php
-www/data/gallery/add_photos.php
-www/data/gallery/album_permissions.php
-www/data/gallery/albums.php
-www/data/gallery/ChangeLog
-www/data/gallery/classes/Album.php
-www/data/gallery/classes/AlbumDB.php
-www/data/gallery/classes/AlbumItem.php
-www/data/gallery/classes/Comment.php
-www/data/gallery/classes/Database.php
-www/data/gallery/classes/database/mysql/Database.php
-www/data/gallery/classes/EverybodyUser.php
-www/data/gallery/classes/gallery/User.php
-www/data/gallery/classes/gallery/UserDB.php
-www/data/gallery/classes/Image.php
-www/data/gallery/classes/NobodyUser.php
-www/data/gallery/classes/nuke5/AdminUser.php
-www/data/gallery/classes/nuke5/User.php
-www/data/gallery/classes/nuke5/UserDB.php
-www/data/gallery/classes/postnuke/User.php
-www/data/gallery/classes/postnuke/UserDB.php
-www/data/gallery/classes/User.php
-www/data/gallery/classes/UserDB.php
-www/data/gallery/configure.bat
-www/data/gallery/configure.sh
-www/data/gallery/create_user.php
-www/data/gallery/css/embedded_style.css.default
-www/data/gallery/css/standalone_style.css.default
-www/data/gallery/delete_album.php
-www/data/gallery/delete_photo.php
-www/data/gallery/delete_user.php
-www/data/gallery/do_command.php
-www/data/gallery/edit_appearance.php
-www/data/gallery/edit_caption.php
-www/data/gallery/edit_field.php
-www/data/gallery/edit_thumb.php
-www/data/gallery/errors/configmode.php
-www/data/gallery/errors/configure_help.php
-www/data/gallery/errors/configure_instructions.php
-www/data/gallery/errors/needinit.php
-www/data/gallery/errors/reconfigure.php
-www/data/gallery/errors/unconfigured.php
-www/data/gallery/gallery_remote.php
-www/data/gallery/highlight_photo.php
-www/data/gallery/html/errorRow.inc
-www/data/gallery/html/userData.inc
-www/data/gallery/html_wrap/album.footer.default
-www/data/gallery/html_wrap/album.header.default
-www/data/gallery/html_wrap/gallery.footer.default
-www/data/gallery/html_wrap/gallery.header.default
-www/data/gallery/html_wrap/inline_albumthumb.footer.default
-www/data/gallery/html_wrap/inline_albumthumb.header.default
-www/data/gallery/html_wrap/inline_photo.footer.default
-www/data/gallery/html_wrap/inline_photo.header.default
-www/data/gallery/html_wrap/photo.footer.default
-www/data/gallery/html_wrap/photo.header.default
-www/data/gallery/html_wrap/search.footer.default
-www/data/gallery/html_wrap/search.header.default
-www/data/gallery/html_wrap/wrapper.footer.default
-www/data/gallery/html_wrap/wrapper.header.default
-www/data/gallery/images/admin_delete.gif
-www/data/gallery/images/admin_hide.gif
-www/data/gallery/images/admin_highlight.gif
-www/data/gallery/images/admin_move.gif
-www/data/gallery/images/admin_rotate.gif
-www/data/gallery/images/admin_unhide.gif
-www/data/gallery/images/computer.gif
-www/data/gallery/images/gallery-tag.png
-www/data/gallery/images/movie.thumb.jpg
-www/data/gallery/images/nav_dot.gif
-www/data/gallery/images/nav_dot_left.gif
-www/data/gallery/images/nav_dot_right.gif
-www/data/gallery/images/nav_first.gif
-www/data/gallery/images/nav_home.gif
-www/data/gallery/images/nav_last.gif
-www/data/gallery/images/nav_next.gif
-www/data/gallery/images/nav_page.gif
-www/data/gallery/images/nav_prev.gif
-www/data/gallery/images/pixel_trans.gif
-www/data/gallery/index.php
-www/data/gallery/init.php
-www/data/gallery/java/ImageTools.jar
-www/data/gallery/layout/adminbox.inc
-www/data/gallery/layout/breadcrumb.inc
-www/data/gallery/layout/commentdraw.inc
-www/data/gallery/layout/navigator.inc
-www/data/gallery/layout/navphoto.inc
-www/data/gallery/layout/searchdraw.inc
-www/data/gallery/LICENSE.txt
-www/data/gallery/login.php
-www/data/gallery/manage_users.php
-www/data/gallery/modify_user.php
-www/data/gallery/move_album.php
-www/data/gallery/move_photo.php
-www/data/gallery/platform/fs_unix.php
-www/data/gallery/platform/fs_win32.php
-www/data/gallery/progress_uploading.php
-www/data/gallery/README
-www/data/gallery/rename_album.php
-www/data/gallery/resize_photo.php
-www/data/gallery/rotate_photo.php
-www/data/gallery/save_photos.php
-www/data/gallery/search.php
-www/data/gallery/secure.bat
-www/data/gallery/secure.sh
-www/data/gallery/session.php
-www/data/gallery/setup/.htaccess
-www/data/gallery/setup/check.inc
-www/data/gallery/setup/config_data.inc
-www/data/gallery/setup/confirm.inc
-www/data/gallery/setup/constants.inc
-www/data/gallery/setup/defaults.inc
-www/data/gallery/setup/functions.inc
-www/data/gallery/setup/gpl.txt
-www/data/gallery/setup/index.php
-www/data/gallery/setup/init.php
-www/data/gallery/setup/mod_rewrite.template
-www/data/gallery/setup/php_value.template
-www/data/gallery/setup/php_value_ok.php
-www/data/gallery/setup/phpinfo.php
-www/data/gallery/setup/write.inc
-www/data/gallery/sort_album.php
-www/data/gallery/todo
-www/data/gallery/upgrade_album.php
-www/data/gallery/UPGRADING
-www/data/gallery/user_preferences.php
-www/data/gallery/util.php
-www/data/gallery/Version.php
-www/data/gallery/view_album.php
-www/data/gallery/view_photo.php
-www/data/gallery/view_photo_properties.php
-@dirrm www/data/gallery/classes/database/mysql
-@dirrm www/data/gallery/classes/database
-@dirrm www/data/gallery/classes/gallery
-@dirrm www/data/gallery/classes/nuke5
-@dirrm www/data/gallery/classes/postnuke
-@dirrm www/data/gallery/classes
-@dirrm www/data/gallery/css
-@dirrm www/data/gallery/errors
-@dirrm www/data/gallery/html
-@dirrm www/data/gallery/html_wrap
-@dirrm www/data/gallery/images
-@dirrm www/data/gallery/java
-@dirrm www/data/gallery/layout
-@dirrm www/data/gallery/platform
-@dirrm www/data/gallery/setup
-@dirrm www/data/gallery
-@dirrm www/data
-@dirrm www
+%%PORTDOCS%%share/doc/gallery/AUTHORS
+%%PORTDOCS%%share/doc/gallery/ChangeLog
+%%PORTDOCS%%share/doc/gallery/README
+%%PORTDOCS%%share/doc/gallery/UPGRADING
+%%GALLERYDIR%%/Version.php
+%%GALLERYDIR%%/add_comment.php
+%%GALLERYDIR%%/add_photos.php
+%%GALLERYDIR%%/album_permissions.php
+%%GALLERYDIR%%/albums.php
+%%GALLERYDIR%%/captionator.php
+%%GALLERYDIR%%/classes/Album.php
+%%GALLERYDIR%%/classes/AlbumDB.php
+%%GALLERYDIR%%/classes/AlbumItem.php
+%%GALLERYDIR%%/classes/Comment.php
+%%GALLERYDIR%%/classes/Database.php
+%%GALLERYDIR%%/classes/EverybodyUser.php
+%%GALLERYDIR%%/classes/Image.php
+%%GALLERYDIR%%/classes/LoggedInUser.php
+%%GALLERYDIR%%/classes/NobodyUser.php
+%%GALLERYDIR%%/classes/User.php
+%%GALLERYDIR%%/classes/UserDB.php
+%%GALLERYDIR%%/classes/database/mysql/Database.php
+%%GALLERYDIR%%/classes/gallery/User.php
+%%GALLERYDIR%%/classes/gallery/UserDB.php
+%%GALLERYDIR%%/classes/nuke5/AdminUser.php
+%%GALLERYDIR%%/classes/nuke5/User.php
+%%GALLERYDIR%%/classes/nuke5/UserDB.php
+%%GALLERYDIR%%/classes/postnuke/User.php
+%%GALLERYDIR%%/classes/postnuke/UserDB.php
+%%GALLERYDIR%%/classes/postnuke0.7.1/User.php
+%%GALLERYDIR%%/classes/postnuke0.7.1/UserDB.php
+%%GALLERYDIR%%/configure.sh
+%%GALLERYDIR%%/create_user.php
+%%GALLERYDIR%%/css/embedded_style.css.default
+%%GALLERYDIR%%/css/standalone_style.css.default
+%%GALLERYDIR%%/delete_album.php
+%%GALLERYDIR%%/delete_photo.php
+%%GALLERYDIR%%/delete_user.php
+%%GALLERYDIR%%/do_command.php
+%%GALLERYDIR%%/edit_appearance.php
+%%GALLERYDIR%%/edit_caption.php
+%%GALLERYDIR%%/edit_field.php
+%%GALLERYDIR%%/edit_thumb.php
+%%GALLERYDIR%%/errors/configmode.php
+%%GALLERYDIR%%/errors/configure_help.php
+%%GALLERYDIR%%/errors/configure_instructions.php
+%%GALLERYDIR%%/errors/needinit.php
+%%GALLERYDIR%%/errors/reconfigure.php
+%%GALLERYDIR%%/errors/unconfigured.php
+%%GALLERYDIR%%/gallery_remote.php
+%%GALLERYDIR%%/highlight_photo.php
+%%GALLERYDIR%%/html/errorRow.inc
+%%GALLERYDIR%%/html/userData.inc
+%%GALLERYDIR%%/html_wrap/album.footer.default
+%%GALLERYDIR%%/html_wrap/album.header.default
+%%GALLERYDIR%%/html_wrap/gallery.footer.default
+%%GALLERYDIR%%/html_wrap/gallery.header.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.footer.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.header.default
+%%GALLERYDIR%%/html_wrap/inline_gallerythumb.frame.default
+%%GALLERYDIR%%/html_wrap/inline_moviethumb.frame.default
+%%GALLERYDIR%%/html_wrap/inline_photo.footer.default
+%%GALLERYDIR%%/html_wrap/inline_photo.header.default
+%%GALLERYDIR%%/html_wrap/inline_photothumb.frame.default
+%%GALLERYDIR%%/html_wrap/photo.footer.default
+%%GALLERYDIR%%/html_wrap/photo.header.default
+%%GALLERYDIR%%/html_wrap/search.footer.default
+%%GALLERYDIR%%/html_wrap/search.header.default
+%%GALLERYDIR%%/html_wrap/slideshow.footer.default
+%%GALLERYDIR%%/html_wrap/slideshow.header.default
+%%GALLERYDIR%%/html_wrap/wrapper.footer.default
+%%GALLERYDIR%%/html_wrap/wrapper.header.default
+%%GALLERYDIR%%/images/admin_delete.gif
+%%GALLERYDIR%%/images/admin_hide.gif
+%%GALLERYDIR%%/images/admin_highlight.gif
+%%GALLERYDIR%%/images/admin_move.gif
+%%GALLERYDIR%%/images/admin_rotate.gif
+%%GALLERYDIR%%/images/admin_unhide.gif
+%%GALLERYDIR%%/images/albumthumb_BB.gif
+%%GALLERYDIR%%/images/albumthumb_BL.gif
+%%GALLERYDIR%%/images/albumthumb_BR.gif
+%%GALLERYDIR%%/images/albumthumb_RR.gif
+%%GALLERYDIR%%/images/albumthumb_TR.gif
+%%GALLERYDIR%%/images/computer.gif
+%%GALLERYDIR%%/images/donate.jpg
+%%GALLERYDIR%%/images/gallery-tag.png
+%%GALLERYDIR%%/images/movie.thumb.jpg
+%%GALLERYDIR%%/images/nav_dot.gif
+%%GALLERYDIR%%/images/nav_dot_left.gif
+%%GALLERYDIR%%/images/nav_dot_right.gif
+%%GALLERYDIR%%/images/nav_first.gif
+%%GALLERYDIR%%/images/nav_home.gif
+%%GALLERYDIR%%/images/nav_last.gif
+%%GALLERYDIR%%/images/nav_next.gif
+%%GALLERYDIR%%/images/nav_page.gif
+%%GALLERYDIR%%/images/nav_prev.gif
+%%GALLERYDIR%%/images/pixel_trans.gif
+%%GALLERYDIR%%/images/uploading.gif
+%%GALLERYDIR%%/index.php
+%%GALLERYDIR%%/init.php
+%%GALLERYDIR%%/java/ImageTools.jar
+%%GALLERYDIR%%/js/client_sniff.js
+%%GALLERYDIR%%/layout/adminbox.inc
+%%GALLERYDIR%%/layout/breadcrumb.inc
+%%GALLERYDIR%%/layout/commentbox.inc
+%%GALLERYDIR%%/layout/commentboxbottom.inc
+%%GALLERYDIR%%/layout/commentboxtop.inc
+%%GALLERYDIR%%/layout/commentdraw.inc
+%%GALLERYDIR%%/layout/navigator.inc
+%%GALLERYDIR%%/layout/navphoto.inc
+%%GALLERYDIR%%/layout/searchdraw.inc
+%%GALLERYDIR%%/login.php
+%%GALLERYDIR%%/manage_users.php
+%%GALLERYDIR%%/modify_user.php
+%%GALLERYDIR%%/move_album.php
+%%GALLERYDIR%%/move_photo.php
+%%GALLERYDIR%%/platform/fs_unix.php
+%%GALLERYDIR%%/platform/fs_win32.php
+%%GALLERYDIR%%/progress_uploading.php
+%%GALLERYDIR%%/rename_album.php
+%%GALLERYDIR%%/resize_photo.php
+%%GALLERYDIR%%/rotate_photo.php
+%%GALLERYDIR%%/save_photos.php
+%%GALLERYDIR%%/search.php
+%%GALLERYDIR%%/secure.sh
+%%GALLERYDIR%%/session.php
+%%GALLERYDIR%%/setup/.htaccess
+%%GALLERYDIR%%/setup/check.inc
+%%GALLERYDIR%%/setup/check_netpbm.php
+%%GALLERYDIR%%/setup/config_data.inc
+%%GALLERYDIR%%/setup/confirm.inc
+%%GALLERYDIR%%/setup/constants.inc
+%%GALLERYDIR%%/setup/defaults.inc
+%%GALLERYDIR%%/setup/functions.inc
+%%GALLERYDIR%%/setup/gpl.txt
+%%GALLERYDIR%%/setup/index.php
+%%GALLERYDIR%%/setup/init.php
+%%GALLERYDIR%%/setup/mod_rewrite.template
+%%GALLERYDIR%%/setup/php_value.template
+%%GALLERYDIR%%/setup/php_value_ok.php
+%%GALLERYDIR%%/setup/phpinfo.php
+%%GALLERYDIR%%/setup/session_test.php
+%%GALLERYDIR%%/setup/write.inc
+%%GALLERYDIR%%/slideshow.php
+%%GALLERYDIR%%/slideshow_low.php
+%%GALLERYDIR%%/sort_album.php
+%%GALLERYDIR%%/todo
+%%GALLERYDIR%%/upgrade_album.php
+%%GALLERYDIR%%/user_preferences.php
+%%GALLERYDIR%%/util.php
+%%GALLERYDIR%%/view_album.php
+%%GALLERYDIR%%/view_comments.php
+%%GALLERYDIR%%/view_photo.php
+%%GALLERYDIR%%/view_photo_properties.php
+@dirrm %%GALLERYDIR%%/setup
+@dirrm %%GALLERYDIR%%/platform
+@dirrm %%GALLERYDIR%%/layout
+@dirrm %%GALLERYDIR%%/js
+@dirrm %%GALLERYDIR%%/java
+@dirrm %%GALLERYDIR%%/images
+@dirrm %%GALLERYDIR%%/html
+@dirrm %%GALLERYDIR%%/errors
+@dirrm %%GALLERYDIR%%/classes/postnuke0.7.1
+@dirrm %%GALLERYDIR%%/classes/postnuke
+@dirrm %%GALLERYDIR%%/classes/nuke5
+@dirrm %%GALLERYDIR%%/classes/gallery
+@dirrm %%GALLERYDIR%%/classes/database/mysql
+@dirrm %%GALLERYDIR%%/classes/database
+@dirrm %%GALLERYDIR%%/classes
+%%PORTDOCS%%@dirrm share/doc/gallery
+@unexec rmdir %D/%%GALLERYDIR%%/html_wrap 2>/dev/null || true
+@unexec rmdir %D/%%GALLERYDIR%%/css 2>/dev/null || true
+@unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true