- Update to 1.0

- add _all_plugins and _all_templates

PR:		80021

10 files changed, 104 insertions, 36 deletions

diff --git a/www/lifetype/Makefile b/www/lifetype/Makefile
index 973ba4559a54..56c556a3b42f 100644
--- a/www/lifetype/Makefile
+++ b/www/lifetype/Makefile
@@ -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 xml
 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 @@ pre-patch:
 	@${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>
diff --git a/www/lifetype/distinfo b/www/lifetype/distinfo
index 486b907aa1c9..37b84a724470 100644
--- a/www/lifetype/distinfo
+++ b/www/lifetype/distinfo
@@ -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) = 325cb9033ea10ffcc30895621f848222
+SIZE (_all_templates.zip) = 5182891
diff --git a/www/lifetype/files/patch-wizard.php b/www/lifetype/files/patch-wizard.php
new file mode 100644
index 000000000000..4fef6c937a3a
--- /dev/null
+++ b/www/lifetype/files/patch-wizard.php
@@ -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 {
diff --git a/www/lifetype/pkg-message b/www/lifetype/pkg-message
index 7adf1a1a9bce..1ca11e9cd3e6 100644
--- a/www/lifetype/pkg-message
+++ b/www/lifetype/pkg-message
@@ -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'
+======================================================================
diff --git a/www/lifetype/pkg-plist b/www/lifetype/pkg-plist
index d0ac09258d04..e69de29bb2d1 100644
--- a/www/lifetype/pkg-plist
+++ b/www/lifetype/pkg-plist
@@ -1 +0,0 @@
-@comment real PLIST will be generated in pre-install phase
diff --git a/www/plog/Makefile b/www/plog/Makefile
index 973ba4559a54..56c556a3b42f 100644
--- a/www/plog/Makefile
+++ b/www/plog/Makefile
@@ -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 xml
 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 @@ pre-patch:
 	@${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>
diff --git a/www/plog/distinfo b/www/plog/distinfo
index 486b907aa1c9..37b84a724470 100644
--- a/www/plog/distinfo
+++ b/www/plog/distinfo
@@ -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) = 325cb9033ea10ffcc30895621f848222
+SIZE (_all_templates.zip) = 5182891
diff --git a/www/plog/files/patch-wizard.php b/www/plog/files/patch-wizard.php
new file mode 100644
index 000000000000..4fef6c937a3a
--- /dev/null
+++ b/www/plog/files/patch-wizard.php
@@ -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 {
diff --git a/www/plog/pkg-message b/www/plog/pkg-message
index 7adf1a1a9bce..1ca11e9cd3e6 100644
--- a/www/plog/pkg-message
+++ b/www/plog/pkg-message
@@ -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'
+======================================================================
diff --git a/www/plog/pkg-plist b/www/plog/pkg-plist
index d0ac09258d04..e69de29bb2d1 100644
--- a/www/plog/pkg-plist
+++ b/www/plog/pkg-plist
@@ -1 +0,0 @@
-@comment real PLIST will be generated in pre-install phase