3 files changed, 9 insertions, 12 deletions

diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index 4438fbf0a655..ccd5565a42df 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,20 +14,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	jamie@hermans.ca
 
 RUN_DEPENDS=	${LOCALBASE}/share/netpbm:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	${LOCALBASE}/bin/jhead:${PORTSDIR}/graphics/jhead
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
-post-extract:
-	cd ${WRKDIR}; \
-		${FETCH_CMD} http://www.sentex.net/~mwandel/jhead/jhead
-
 do-install:
-	${MKDIR} -v ${PREFIX}/www/data
-	cd ${WRKDIR}; \
-		${INSTALL_PROGRAM} jhead ${PREFIX}/bin
+	${MKDIR} -v ${LOCALBASE}/www/data
 	cd ${WRKDIR}; \
-		${CP} -R gallery ${PREFIX}/www/data
+		${CP} -R gallery ${LOCALBASE}/www/data
 
 post-install:
 	@${ECHO} ""
diff --git a/www/gallery/distinfo b/www/gallery/distinfo
index 5c8d00863385..4ed591713c74 100644
--- a/www/gallery/distinfo
+++ b/www/gallery/distinfo
@@ -1 +1 @@
-MD5 (gallery-1.2.3.tar.gz) = 662a6d4c338cca1629d4f190dfaf8509
+MD5 (gallery-1.2.5.tar.gz) = 1a32e57b36ca06d22475938e1e1b19f9
diff --git a/www/gallery/pkg-plist b/www/gallery/pkg-plist
index 23f351580d11..bd5e505bbbfb 100644
--- a/www/gallery/pkg-plist
+++ b/www/gallery/pkg-plist
@@ -1,4 +1,3 @@
-bin/jhead
 www/data/gallery/add_comment.php
 www/data/gallery/add_photos.php
 www/data/gallery/album_permissions.php
@@ -18,6 +17,8 @@ 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
@@ -124,7 +125,7 @@ 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/Version.php
 www/data/gallery/view_album.php
 www/data/gallery/view_photo.php
 www/data/gallery/view_photo_properties.php
@@ -132,6 +133,7 @@ www/data/gallery/view_photo_properties.php
 @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