From owner-freebsd-questions@FreeBSD.ORG Fri Feb 25 12:53:42 2005 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6955416A4CE for ; Fri, 25 Feb 2005 12:53:42 +0000 (GMT) Received: from mail.iinet.net.au (mail-06.iinet.net.au [203.59.3.38]) by mx1.FreeBSD.org (Postfix) with SMTP id DCFA243D3F for ; Fri, 25 Feb 2005 12:53:40 +0000 (GMT) (envelope-from forums@jefferyfernandez.id.au) Received: (qmail 25833 invoked from network); 25 Feb 2005 12:53:40 -0000 Received: from unknown (HELO ?10.1.1.66?) (203.173.46.98) by mail.iinet.net.au with SMTP; 25 Feb 2005 12:53:39 -0000 Message-ID: <421F1FD3.80606@jefferyfernandez.id.au> Date: Fri, 25 Feb 2005 23:53:39 +1100 From: Jeffery Fernandez User-Agent: Mozilla Thunderbird 0.9 (X11/20041103) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Matthew Seaman References: <421ED648.5060805@jefferyfernandez.id.au> <20050225111007.GA11075@gravitas.thebunker.net> In-Reply-To: <20050225111007.GA11075@gravitas.thebunker.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit cc: freebsd-questions@freebsd.org Subject: Re: Forcing upgrade of port X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2005 12:53:42 -0000 Matthew Seaman wrote: >On Fri, Feb 25, 2005 at 06:39:52PM +1100, Jeffery Fernandez wrote: > > >>I am trying to upgrade phpMyAdmin to the latest release 2.6.1-pl2 which >>has a few bugs fixed (One of them being critical for my usage). >> >>I have updated the ports tree with cvsup but it has not picked up the >>newer release (or maybe its not time to be updated in the ports tree.. >>not sure). So how do I go about updating my phpMyAdmin port to the >>latest release ? Is it just a matter of editing the "MakeFile" under >>"/usr/ports/databases/phpmyadmin" with the proper release number before >>"make install clean" ? Any suggestions welcome. >> >> > >Yikes. Give us a chance please. The pl2 release only happened last >night, and I've just submitted a PR to update the port. I'll attach >the diff from the PR (against the current ports tree) which you can >apply yourself if you're desperate for the new version before it all >gets processed. > > Cheers, > > Matthew > > Sorry mate... I was having problem with logging into phpmyadmin when I was using cookie authentication. Just Found out through a bug reported at sourceforge that the blowfish pass-phrase has to be less than 50 characters or so. All fixed on my end now.. sorry for the confusion. cheers, Jeffery > > >------------------------------------------------------------------------ > >diff -Nur /usr/ports/databases/phpmyadmin/Makefile phpmyadmin/Makefile >--- /usr/ports/databases/phpmyadmin/Makefile Wed Jan 26 14:37:43 2005 >+++ phpmyadmin/Makefile Fri Feb 25 10:50:33 2005 >@@ -6,10 +6,12 @@ > # > > PORTNAME= phpMyAdmin >-DISTVERSION= 2.6.1 >+PORTVERSION= 2.6.1.2 >+#DISTVERSION= 2.6.1-pl2 > CATEGORIES= databases www > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= phpmyadmin >+DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-pl\1/} > > MAINTAINER= m.seaman@infracaninophile.co.uk > COMMENT= A set of PHP-scripts to manage MySQL over the web >diff -Nur /usr/ports/databases/phpmyadmin/Makefile~ phpmyadmin/Makefile~ >--- /usr/ports/databases/phpmyadmin/Makefile~ Thu Jan 1 01:00:00 1970 >+++ phpmyadmin/Makefile~ Fri Feb 25 10:50:05 2005 >@@ -0,0 +1,154 @@ >+# New ports collection makefile for: phpMyAdmin >+# Date created: 19 Jan 2001 >+# Whom: nbm >+# >+# $FreeBSD: ports/databases/phpmyadmin/Makefile,v 1.25 2005/01/25 20:12:33 pav Exp $ >+# >+ >+PORTNAME= phpMyAdmin >+PORTVERSION= 2.6.1.2 >+DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-pl\1/} >+#DISTVERSION= 2.6.1-pl2 >+CATEGORIES= databases www >+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} >+MASTER_SITE_SUBDIR= phpmyadmin >+ >+MAINTAINER= m.seaman@infracaninophile.co.uk >+COMMENT= A set of PHP-scripts to manage MySQL over the web >+ >+USE_BZIP2= yes >+NO_BUILD= yes >+USE_PHP= mysql pcre >+ >+# Unfortunately can't make WITH_SUPHP part of the OPTIONS selection, >+# since it has to be processed before just about anything else. >+ >+.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP) >+ >+PKGNAMESUFFIX= -suphp >+RUN_DEPENDS+= ${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp >+WANT_PHP_CGI= yes >+PKGINST_SKEL= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} >+PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} >+PKGDEINST_SKEL= ${PKGDIR}/pkg-deinstall${PKGNAMESUFFIX} >+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' >+ >+.else >+ >+WANT_PHP_WEB= yes >+ >+.endif >+ >+# 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 >+ >+PORT_DBDIR?= /var/db/ports >+LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} >+OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options >+ >+.if exists(${OPTIONSFILE}) >+.include "${OPTIONSFILE}" >+.endif >+ >+# Options that default to on: >+.for opt in BZ2 GD OPENSSL PDF ZLIB >+. if !defined(WITHOUT_${opt}) || defined(WITH_${opt}) >+USE_PHP+= ${opt:L} >+. endif >+.endfor >+ >+# Options that default to off: >+.for opt in MYSQLI >+. if defined(WITH_${opt}) && !defined(WITHOUT_${opt}) >+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} >+CFGFILE= config.inc.php >+ >+PLIST= ${WRKDIR}/plist >+PLIST_SUB+= MYADMDIR=${MYADMDIR} MYADMGRP=${MYADMGRP} >+ >+.SILENT: >+ >+do-build: >+ @${DO_NADA} >+ >+pre-everything:: >+ ${ECHO_MSG} "" >+ ${ECHO_MSG} "You may use the following additional build option:" >+ ${ECHO_MSG} "" >+ ${ECHO_MSG} " WITH_SUPHP=yes Install appropriately for use with" >+ ${ECHO_MSG} " the www/suphp port [default: no]" >+ ${ECHO_MSG} "" >+ >+post-patch: >+ ${MV} ${WRKSRC}/${CFGFILE} ${WRKSRC}/${CFGFILE}.sample >+ cd ${WRKSRC} ; \ >+ ${FIND} . ! -type d ! -name ${CFGFILE}.sample | ${SORT} | \ >+ ${SED} -e "s,^\.,%%MYADMDIR%%," >${PLIST} ; \ >+ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ >+ ${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) >+ ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL >+.endif >+ >+do-install: install-app install-conf >+ >+install-app: >+ cd ${WRKSRC} ; \ >+ for src in $$( ${FIND} . ! -name .cvsignore ) ; do \ >+ dst=${PREFIX}/${MYADMDIR}$${src#.} ; \ >+ if ${TEST} -d $$src ; then \ >+ ${MKDIR} $$dst ; \ >+ else \ >+ ${INSTALL_DATA} $$src $$dst ; \ >+ fi \ >+ done >+ >+install-conf: install-app >+ cd ${PREFIX}/${MYADMDIR} ; \ >+ ${CHMOD} 0640 ${CFGFILE}.sample ; \ >+ ${CHGRP} ${MYADMGRP} ${CFGFILE}.sample ; \ >+ if ${TEST} ! -f ${CFGFILE} ; then \ >+ ${CP} -p ${CFGFILE}.sample ${CFGFILE} ; \ >+ fi >+ >+post-install: >+.if defined(WITH_SUPHP) >+ ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL >+.endif >+ ${CAT} ${PKGMESSAGE} >+ >+.include >diff -Nur /usr/ports/databases/phpmyadmin/distinfo phpmyadmin/distinfo >--- /usr/ports/databases/phpmyadmin/distinfo Wed Jan 26 14:37:43 2005 >+++ phpmyadmin/distinfo Fri Feb 25 10:27:06 2005 >@@ -1,2 +1,2 @@ >-MD5 (phpMyAdmin-2.6.1.tar.bz2) = eaa23b48760f2b31a8725bf85b0acecd >-SIZE (phpMyAdmin-2.6.1.tar.bz2) = 1544628 >+MD5 (phpMyAdmin-2.6.1-pl2.tar.bz2) = 787feeebe16ef7ab43e75e4046550da2 >+SIZE (phpMyAdmin-2.6.1-pl2.tar.bz2) = 1541665 > >