ports/80021: [PATCH] www/plog: update to 1.0

[Yen-Ming Lee]

>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 at 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 at 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 <bsd.port.post.mk>
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 @@
- at 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 <strong>$tableId</strong> executed successfully.<br/>";
+                 else {
--- plog-1.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: