- Update to phpmyadmin-2.6.1.pl3 which corrects some pugs introduced

with the security patches in pl2.  Announcement is at:

    http://sourceforge.net/mailarchive/forum.php?thread_id=6732974&forum_id=2141

Release Notes:

    http://www.phpmyadmin.net/home_page/downloads.php?relnotes=0

- add OPTIONS support for the PHP MCRYPT and MBSTRING modules,
      both of which are can be used by recent versions of phpMyAdmin.

PR:		ports/78445
Submitted by:	Matthew Seaman (maintainer)
This commit is contained in:
Thierry Thomas 2005-03-06 10:48:47 +00:00
parent 4d40dc828d
commit 8603006888
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=130444
10 changed files with 44 additions and 54 deletions

View file

@ -6,8 +6,8 @@
#
PORTNAME= phpMyAdmin
PORTVERSION= 2.6.1.2
#DISTVERSION= 2.6.1-pl2
PORTVERSION= 2.6.1.3
#DISTVERSION= 2.6.1-pl3
CATEGORIES= databases www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= phpmyadmin
@ -20,6 +20,10 @@ USE_BZIP2= yes
NO_BUILD= yes
USE_PHP= mysql pcre
SUB_LIST+= "MYADMDIR=${MYADMDIR}" \
"PKGNAME=${PKGNAME}"
SUB_FILES= pkg-message
# Unfortunately can't make WITH_SUPHP part of the OPTIONS selection,
# since it has to be processed before just about anything else.
@ -35,10 +39,9 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall${PKGNAMESUFFIX}
MYADMUSR?= phpmyadm
SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \
-e 's,%%MYADMDIR%%,${MYADMDIR},g' \
-e 's,%%MYADMUSR%%,${MYADMUSR},g' \
-e 's,%%MYADMGRP%%,${MYADMGRP},g'
SUB_LIST+= "MYADMUSR=${MYADMUSR}" \
"MYADMGRP=${MYADMGRP}"
SUB_FILES+= pkg-install pkg-deinstall
.else
@ -49,12 +52,14 @@ WANT_PHP_WEB= yes
# Copy the way lang/php{4,5}-extensions deals with its OPTIONS -- avoids
# problems with include of bsd.port.pre.mk
OPTIONS= BZ2 "bzip2 library support" on \
GD "GD library support" on \
MYSQLI "Improved MySQL support (PHP5, MySQL 4.1 only)" off \
OPENSSL "OpenSSL support" on \
PDF "PDFlib support (implies GD)" on \
ZLIB "ZLIB support" on
OPTIONS= BZ2 "bzip2 library support" on \
GD "GD library support" on \
MYSQLI "Improved MySQL support (PHP5, MySQL 4.1 only)" off \
OPENSSL "OpenSSL support" on \
PDF "PDFlib support (implies GD)" on \
ZLIB "ZLIB support" on \
MCRYPT "MCrypt library support" on \
MBSTRING "Multi-byte character-set string support" on
PORT_DBDIR?= /var/db/ports
LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
@ -65,7 +70,7 @@ OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options
.endif
# Options that default to on:
.for opt in BZ2 GD OPENSSL PDF ZLIB
.for opt in BZ2 GD OPENSSL PDF ZLIB MCRYPT MBSTRING
. if !defined(WITHOUT_${opt}) || defined(WITH_${opt})
USE_PHP+= ${opt:L}
. endif
@ -78,9 +83,6 @@ USE_PHP+= ${opt:L}
. endif
.endfor
MSG_SKEL= ${PKGDIR}/pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
# MYADMUSR is only used WITH_SUPHP
MYADMDIR?= www/phpMyAdmin
MYADMGRP?= ${WWWGRP}
@ -111,13 +113,6 @@ post-patch:
${FIND} . -type d | ${SORT} -r | ${SED} \
-e "s,^\.$$,@unexec rmdir %D/%%MYADMDIR%% 2>/dev/null || true," \
-e "s,^\.,@dirrm %%MYADMDIR%%," >>${PLIST}
${SED} -e 's,%%MYADMDIR%%,${MYADMDIR},g' \
-e 's,%%PREFIX%%,${PREFIX},g' \
-e 's,%%PKGNAME%%,${PKGNAME},g' ${MSG_SKEL} > ${PKGMESSAGE}
.if defined(WITH_SUPHP)
${SED} ${SED_SCRIPT} ${PKGINST_SKEL} > ${PKGINSTALL}
${SED} ${SED_SCRIPT} ${PKGDEINST_SKEL} > ${PKGDEINSTALL}
.endif
pre-install:
.if defined(WITH_SUPHP)

View file

@ -1,2 +1,2 @@
MD5 (phpMyAdmin-2.6.1-pl2.tar.bz2) = 787feeebe16ef7ab43e75e4046550da2
SIZE (phpMyAdmin-2.6.1-pl2.tar.bz2) = 1541665
MD5 (phpMyAdmin-2.6.1-pl3.tar.bz2) = 77b97c6212ee9322db0aea6ba00e305c
SIZE (phpMyAdmin-2.6.1-pl3.tar.bz2) = 1543219

View file

@ -23,4 +23,4 @@ esac
#
# That's All Folks!
#
#

View file

@ -34,7 +34,7 @@ create_group() {
pw groupadd -n $group
pw useradd -n $user -g $group -c "$gcos" \\
-d $home -s $shell -h -
and retry installing this package.
EOERRORMSG
exit 1

View file

@ -6,8 +6,8 @@
#
PORTNAME= phpMyAdmin
PORTVERSION= 2.6.1.2
#DISTVERSION= 2.6.1-pl2
PORTVERSION= 2.6.1.3
#DISTVERSION= 2.6.1-pl3
CATEGORIES= databases www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= phpmyadmin
@ -20,6 +20,10 @@ USE_BZIP2= yes
NO_BUILD= yes
USE_PHP= mysql pcre
SUB_LIST+= "MYADMDIR=${MYADMDIR}" \
"PKGNAME=${PKGNAME}"
SUB_FILES= pkg-message
# Unfortunately can't make WITH_SUPHP part of the OPTIONS selection,
# since it has to be processed before just about anything else.
@ -35,10 +39,9 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall${PKGNAMESUFFIX}
MYADMUSR?= phpmyadm
SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \
-e 's,%%MYADMDIR%%,${MYADMDIR},g' \
-e 's,%%MYADMUSR%%,${MYADMUSR},g' \
-e 's,%%MYADMGRP%%,${MYADMGRP},g'
SUB_LIST+= "MYADMUSR=${MYADMUSR}" \
"MYADMGRP=${MYADMGRP}"
SUB_FILES+= pkg-install pkg-deinstall
.else
@ -49,12 +52,14 @@ WANT_PHP_WEB= yes
# Copy the way lang/php{4,5}-extensions deals with its OPTIONS -- avoids
# problems with include of bsd.port.pre.mk
OPTIONS= BZ2 "bzip2 library support" on \
GD "GD library support" on \
MYSQLI "Improved MySQL support (PHP5, MySQL 4.1 only)" off \
OPENSSL "OpenSSL support" on \
PDF "PDFlib support (implies GD)" on \
ZLIB "ZLIB support" on
OPTIONS= BZ2 "bzip2 library support" on \
GD "GD library support" on \
MYSQLI "Improved MySQL support (PHP5, MySQL 4.1 only)" off \
OPENSSL "OpenSSL support" on \
PDF "PDFlib support (implies GD)" on \
ZLIB "ZLIB support" on \
MCRYPT "MCrypt library support" on \
MBSTRING "Multi-byte character-set string support" on
PORT_DBDIR?= /var/db/ports
LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
@ -65,7 +70,7 @@ OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options
.endif
# Options that default to on:
.for opt in BZ2 GD OPENSSL PDF ZLIB
.for opt in BZ2 GD OPENSSL PDF ZLIB MCRYPT MBSTRING
. if !defined(WITHOUT_${opt}) || defined(WITH_${opt})
USE_PHP+= ${opt:L}
. endif
@ -78,9 +83,6 @@ USE_PHP+= ${opt:L}
. endif
.endfor
MSG_SKEL= ${PKGDIR}/pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
# MYADMUSR is only used WITH_SUPHP
MYADMDIR?= www/phpMyAdmin
MYADMGRP?= ${WWWGRP}
@ -111,13 +113,6 @@ post-patch:
${FIND} . -type d | ${SORT} -r | ${SED} \
-e "s,^\.$$,@unexec rmdir %D/%%MYADMDIR%% 2>/dev/null || true," \
-e "s,^\.,@dirrm %%MYADMDIR%%," >>${PLIST}
${SED} -e 's,%%MYADMDIR%%,${MYADMDIR},g' \
-e 's,%%PREFIX%%,${PREFIX},g' \
-e 's,%%PKGNAME%%,${PKGNAME},g' ${MSG_SKEL} > ${PKGMESSAGE}
.if defined(WITH_SUPHP)
${SED} ${SED_SCRIPT} ${PKGINST_SKEL} > ${PKGINSTALL}
${SED} ${SED_SCRIPT} ${PKGDEINST_SKEL} > ${PKGDEINSTALL}
.endif
pre-install:
.if defined(WITH_SUPHP)

View file

@ -1,2 +1,2 @@
MD5 (phpMyAdmin-2.6.1-pl2.tar.bz2) = 787feeebe16ef7ab43e75e4046550da2
SIZE (phpMyAdmin-2.6.1-pl2.tar.bz2) = 1541665
MD5 (phpMyAdmin-2.6.1-pl3.tar.bz2) = 77b97c6212ee9322db0aea6ba00e305c
SIZE (phpMyAdmin-2.6.1-pl3.tar.bz2) = 1543219

View file

@ -23,4 +23,4 @@ esac
#
# That's All Folks!
#
#

View file

@ -34,7 +34,7 @@ create_group() {
pw groupadd -n $group
pw useradd -n $user -g $group -c "$gcos" \\
-d $home -s $shell -h -
and retry installing this package.
EOERRORMSG
exit 1