diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2005-03-06 10:48:47 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2005-03-06 10:48:47 +0000 |
commit | 8603006888f9a294f04d325f649b76512b9d91ee (patch) | |
tree | e9c87440c3a55c597ab200fadf67ed0008d8a6c6 /databases/phpmyadmin211 | |
parent | update to 0.99.6 (diff) |
- 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)
Notes
Notes:
svn path=/head/; revision=130444
Diffstat (limited to 'databases/phpmyadmin211')
-rw-r--r-- | databases/phpmyadmin211/Makefile | 41 | ||||
-rw-r--r-- | databases/phpmyadmin211/distinfo | 4 | ||||
-rw-r--r-- | databases/phpmyadmin211/files/pkg-deinstall.in (renamed from databases/phpmyadmin211/pkg-deinstall-suphp) | 2 | ||||
-rw-r--r-- | databases/phpmyadmin211/files/pkg-install.in (renamed from databases/phpmyadmin211/pkg-install-suphp) | 2 | ||||
-rw-r--r-- | databases/phpmyadmin211/files/pkg-message.in (renamed from databases/phpmyadmin211/pkg-message) | 0 |
5 files changed, 22 insertions, 27 deletions
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile index d33337b6dbb5..5f4091e46bec 100644 --- a/databases/phpmyadmin211/Makefile +++ b/databases/phpmyadmin211/Makefile @@ -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) diff --git a/databases/phpmyadmin211/distinfo b/databases/phpmyadmin211/distinfo index e3f12988684d..260ea4445680 100644 --- a/databases/phpmyadmin211/distinfo +++ b/databases/phpmyadmin211/distinfo @@ -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 diff --git a/databases/phpmyadmin211/pkg-deinstall-suphp b/databases/phpmyadmin211/files/pkg-deinstall.in index f5991ecbab23..4962506b4e26 100644 --- a/databases/phpmyadmin211/pkg-deinstall-suphp +++ b/databases/phpmyadmin211/files/pkg-deinstall.in @@ -23,4 +23,4 @@ esac # # That's All Folks! -#
\ No newline at end of file +# diff --git a/databases/phpmyadmin211/pkg-install-suphp b/databases/phpmyadmin211/files/pkg-install.in index 7bdf484e65ed..bb4180b2660f 100644 --- a/databases/phpmyadmin211/pkg-install-suphp +++ b/databases/phpmyadmin211/files/pkg-install.in @@ -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 diff --git a/databases/phpmyadmin211/pkg-message b/databases/phpmyadmin211/files/pkg-message.in index a9f3636dad94..a9f3636dad94 100644 --- a/databases/phpmyadmin211/pkg-message +++ b/databases/phpmyadmin211/files/pkg-message.in |