From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 17 06:00:41 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57FFF16A4CF for ; Sun, 17 Apr 2005 06:00:41 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F259143D45 for ; Sun, 17 Apr 2005 06:00:40 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3H60e59014555 for ; Sun, 17 Apr 2005 06:00:40 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3H60eq9014554; Sun, 17 Apr 2005 06:00:40 GMT (envelope-from gnats) Resent-Date: Sun, 17 Apr 2005 06:00:40 GMT Resent-Message-Id: <200504170600.j3H60eq9014554@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yen-Ming Lee Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C297716A4CE; Sun, 17 Apr 2005 06:00:27 +0000 (GMT) Received: from msr35.hinet.net (msr35.hinet.net [168.95.4.135]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEF2743D31; Sun, 17 Apr 2005 06:00:26 +0000 (GMT) (envelope-from root@utopia.leeym.com) Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52]) by msr35.hinet.net (8.9.3/8.9.3) with ESMTP id OAA13678; Sun, 17 Apr 2005 14:00:24 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by utopia.leeym.com (Postfix) with ESMTP id 6E8253EA124; Sun, 17 Apr 2005 14:00:24 +0800 (CST) Received: from utopia.leeym.com ([127.0.0.1]) by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21863-01; Sun, 17 Apr 2005 14:00:20 +0800 (CST) Received: by utopia.leeym.com (Postfix, from userid 0) id E75BA3EA11E; Sun, 17 Apr 2005 14:00:19 +0800 (CST) Message-Id: <20050417060019.E75BA3EA11E@utopia.leeym.com> Date: Sun, 17 Apr 2005 14:00:19 +0800 (CST) From: Yen-Ming Lee To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: clsung@FreeBSD.org Subject: ports/80021: [PATCH] www/plog: update to 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 06:00:41 -0000 >Number: 80021 >Category: ports >Synopsis: [PATCH] www/plog: update to 1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Apr 17 06:00:40 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD utopia.leeym.com 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Tue Mar 15 10:20:57 CST 2005 >Description: - Update to 1.0 - add _all_plugins and _all_templates Sorry to submit PR again. After discussing with chinsan, this PR obsoletes PR 79994 and 79999. BTW, the 'dirty hack patch' is not required, just in case somebody might need it when upgrading from 0.3.2. Added file(s): - files/patch-wizard.php Removed file(s): - pkg-plist Port maintainer (clsung@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- plog-1.0.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/plog/Makefile,v retrieving revision 1.4 diff -u -u -r1.4 Makefile --- Makefile 30 Dec 2004 05:05:45 -0000 1.4 +++ Makefile 17 Apr 2005 05:54:14 -0000 @@ -6,22 +6,31 @@ # PORTNAME= plog -PORTVERSION= 0.3.2 +PORTVERSION= 1.0 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= plog +DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ + _all_plugins${EXTRACT_SUFX} \ + _all_templates${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= clsung@FreeBSD.org COMMENT= A PHP and MySQL based blogging platform -USE_BZIP2= YES +USE_ZIP= YES -USE_PHP= mysql pcre session +USE_PHP= ctype mysql pcre session PHP4_PORT?= www/mod_php4 NO_BUILD= YES WANT_PHP_WEB= YES -PLOGDIR?= www/data-dist/plog +WWWDOCROOT?= www/data +PLOGURL?= plog +WWWOWN?= www +WWWGRP?= www +PLOGDIR?= ${WWWDOCROOT}/${PLOGURL} PLIST= ${WRKDIR}/pkg-plist +PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS= GD "With GD Support" on \ IMAGICK "With ImageMagick Support" off @@ -41,22 +50,27 @@ @${ECHO_CMD} "Without GD or ImageMagick support. No thumbnails will be generated at all." .endif +post-extract: +.for x in plugins templates + cd ${WRKSRC}/${x} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/_all_${x}${EXTRACT_SUFX} +.endfor + pre-install: - @${RM} ${WRKSRC}/.cvsignore - cd ${WRKSRC} && ${FIND} -s . -type f | \ + @${RM} -f ${PLIST} + @cd ${WRKSRC} && ${FIND} -s . -type f | \ ${SED} -e 's|^./||;s|^|${PLOGDIR}/|' > ${PLIST} \ + && ${ECHO_CMD} "@unexec ${RM} -fr %D/${PLOGDIR}/tmp/* 2>/dev/null || ${TRUE}" >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm ${PLOGDIR}/|' >> ${PLIST} \ && ${ECHO_CMD} @dirrm ${PLOGDIR} >> ${PLIST} do-install: - -${MKDIR} ${PREFIX}/${PLOGDIR} - @${CHOWN} www:www ${PREFIX}/${PLOGDIR} - @${CHMOD} 755 ${PREFIX}/${PLOGDIR} + @${MKDIR} ${PREFIX}/${PLOGDIR} @${CP} -R ${WRKSRC}/ ${PREFIX}/${PLOGDIR} - @${CHOWN} www:www ${PREFIX}/${PLOGDIR}/tmp + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PLOGDIR} post-install: - @${SED} -e 's|%%PLOGDIR%%|${PREFIX}/${PLOGDIR}|' ${PKGMESSAGE} + @${SED} -e 's|%%PLOGURL%%|${PLOGURL}|' pkg-message > ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/www/plog/distinfo,v retrieving revision 1.1 diff -u -u -r1.1 distinfo --- distinfo 28 Oct 2004 02:32:09 -0000 1.1 +++ distinfo 17 Apr 2005 05:54:14 -0000 @@ -1,2 +1,6 @@ -MD5 (plog-0.3.2.tar.bz2) = 1c6bb120930306646af92ddc0f0b557f -SIZE (plog-0.3.2.tar.bz2) = 1003647 +MD5 (plog-1.0.zip) = 4d48680437c8be9a6427ba78964b0e9f +SIZE (plog-1.0.zip) = 2420990 +MD5 (_all_plugins.zip) = df73f9600da364e83ff17aa5c5b55654 +SIZE (_all_plugins.zip) = 1712625 +MD5 (_all_templates.zip) = bf4d7013b74236b3e5e10643e5a586cb +SIZE (_all_templates.zip) = 5182891 Index: pkg-message =================================================================== RCS file: /home/pcvs/ports/www/plog/pkg-message,v retrieving revision 1.1 diff -u -u -r1.1 pkg-message --- pkg-message 28 Oct 2004 02:32:09 -0000 1.1 +++ pkg-message 17 Apr 2005 05:54:14 -0000 @@ -1,7 +1,12 @@ - - **** NOTE **** +====================================================================== + **** NOTE **** For first use of pLog, remember to point your browser to -http://your.plog.host/wizard.php +http://your.plog.host/%%PLOGURL%%/wizard.php + +and, remember to load your templates at + +http://your.plog.host/%%PLOGURL%%/admin.php?op=adminSettings -Maybe you should prepare a empty database first. +and then click 'scanTemplates' +====================================================================== Index: pkg-plist =================================================================== RCS file: pkg-plist diff -N pkg-plist --- pkg-plist 28 Oct 2004 02:32:09 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1 +0,0 @@ -@comment real PLIST will be generated in pre-install phase Index: files/patch-wizard.php =================================================================== RCS file: files/patch-wizard.php diff -N files/patch-wizard.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-wizard.php 17 Apr 2005 05:54:14 -0000 @@ -0,0 +1,12 @@ +--- wizard.php.orig Sun Apr 17 08:56:58 2005 ++++ wizard.php Sun Apr 17 08:58:10 2005 +@@ -1414,6 +1414,9 @@ + } + } + ++ // dirty hack, ignore duplicate table/key/column and upgrade anyway ++ $errors = false; ++ + if( !$errors ) + $message .= "Changes to table $tableId executed successfully.
"; + else { --- plog-1.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: