Index: head/www/gallery2/Makefile =================================================================== --- head/www/gallery2/Makefile (revision 490735) +++ head/www/gallery2/Makefile (revision 490736) @@ -1,47 +1,47 @@ # Created by: Alex Varju # $FreeBSD$ PORTNAME= gallery2 PORTVERSION= 2.3.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= www MASTER_SITES= SF/gallery/${PORTNAME}/${PORTVERSION} DISTNAME= gallery-${PORTVERSION}-full DIST_SUBDIR= gallery2 MAINTAINER= sunpoet@FreeBSD.org COMMENT= Web based photo album organizer written in PHP LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= DCRAW FFMPEG GD GRAPHMAGICK IMAGEMAGICK JHEAD NETPBM NLS OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= MYSQL PGSQL OPTIONS_DEFAULT=IMAGEMAGICK JHEAD MYSQL NO_ARCH= yes NO_BUILD= yes USES= php:web USE_PHP= pcre session WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= pkg-message DCRAW_RUN_DEPENDS= dcraw:graphics/dcraw FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg GD_RUN_DEPENDS= pngtogd:graphics/gd GD_USE= PHP=gd GRAPHMAGICK_RUN_DEPENDS=gm:graphics/GraphicsMagick IMAGEMAGICK_RUN_DEPENDS=convert:graphics/ImageMagick6 JHEAD_RUN_DEPENDS= jhead:graphics/jhead MYSQL_USE= PHP=mysqli NETPBM_RUN_DEPENDS= giftopnm:graphics/netpbm NLS_USE= PHP=gettext NLS_USES= gettext PGSQL_USE= PHP=pgsql do-install: cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/ .include Index: head/www/gallery2/files/patch-lib-adodb-adodb-time.inc.php =================================================================== --- head/www/gallery2/files/patch-lib-adodb-adodb-time.inc.php (nonexistent) +++ head/www/gallery2/files/patch-lib-adodb-adodb-time.inc.php (revision 490736) @@ -0,0 +1,12 @@ +Obtained from: https://github.com/bobosch/gallery2/commit/4ddfafa416ffe5babd95f2a6532742c3ec903275 + +--- lib/adodb/adodb-time.inc.php.orig ++++ lib/adodb/adodb-time.inc.php +@@ -1006,7 +1006,6 @@ function adodb_tz_offset($gmt,$isphp5) + return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); + else + return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); +- break; + } + + Property changes on: head/www/gallery2/files/patch-lib-adodb-adodb-time.inc.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/gallery2/files/patch-modules-core-classes-GalleryStorage-GalleryStorageExtras.class =================================================================== --- head/www/gallery2/files/patch-modules-core-classes-GalleryStorage-GalleryStorageExtras.class (nonexistent) +++ head/www/gallery2/files/patch-modules-core-classes-GalleryStorage-GalleryStorageExtras.class (revision 490736) @@ -0,0 +1,13 @@ +Obtained from: https://github.com/bobosch/gallery2/commit/4fc50203a12b78217999df00759d70d283efce2f + +--- modules/core/classes/GalleryStorage/GalleryStorageExtras.class.orig ++++ modules/core/classes/GalleryStorage/GalleryStorageExtras.class +@@ -190,7 +190,7 @@ class GalleryStorageExtras /* the other half of GalleryStorage */ { + $value = $this->_gs->_normalizeValue($row[$i], $memberData[$i], true); + + /* Store the value in the object */ +- $entity->$callbacks[$i] = $value; ++ $entity->{$callbacks[$i]} = $value; + $entity->_persistentStatus['originalValue'][$callbacks[$i]] = $value; + } + Property changes on: head/www/gallery2/files/patch-modules-core-classes-GalleryStorage-GalleryStorageExtras.class ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property