- Split MESSAGE's content to separate document file.

- Handle system/lib-custom.php as one of modifiable files.

Bump PKGREVISION.

6 files changed, 72 insertions, 45 deletions

diff --git a/www/geeklog/DEINSTALL b/www/geeklog/DEINSTALL
index 42e2acd5bb7..2f579cd6b77 100644
--- a/www/geeklog/DEINSTALL
+++ b/www/geeklog/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2006/06/15 13:26:42 taca Exp $
+# $NetBSD: DEINSTALL,v 1.2 2006/06/18 08:34:05 taca Exp $
 
 GEEKLOG_DIR="@GEEKLOG_DIR@"
 GEEKLOG_EXAMPLESDIR="@GEEKLOG_EXAMPLESDIR@"
@@ -22,17 +22,30 @@ DEINSTALL)
 		while read d; do
 			${RMDIR} ${d} 2>/dev/null
 		done
-	# XXX: work around for remaining config.php
-	conf="${GEEKLOG_DIR}/config.php"
-	example="${GEEKLOG_EXAMPLESDIR}/config.php"
-	if ${TEST} -f ${conf} -a -f ${example} && ${CMP} -s ${conf} ${example}; then
-		${RM} ${conf}
-	else
+	# XXX: work around for remaining config.php and system/lib-custom.php
+	conf_files="${GEEKLOG_EXAMPLESDIR}/config.php \
+			${GEEKLOG_DIR}/config.php \
+			${GEEKLOG_EXAMPLESDIR}/system/lib-custom.php \
+			${GEEKLOG_DIR}/system/lib-custom.php"
+	file_list=
+	set ${conf_files}
+	while ${TEST} $# -gt 0; do
+		eg=$1; shift
+		cf=$1; shift
+		if ${TEST} -f ${cf} -a -f ${eg} && ${CMP} -s ${cf} ${eg}; then
+			${RM} ${cf}
+		else
+			file_list="${file_list} ${cf}"
+		fi
+	done
+	if ${TEST} -n "${file_list}"; then
 		${ECHO} "==========================================================================="
 		${ECHO} "The following files are no longer being used by ${PKGNAME},"
 		${ECHO} "and they can be removed if no other packages are using them:"
 		${ECHO} ""
-		${ECHO} "	${conf}"
+		for f in ${file_list}; do
+		${ECHO} "	${f}"
+		done
 		${ECHO} ""
 		${ECHO} "==========================================================================="
 	fi
diff --git a/www/geeklog/MESSAGE b/www/geeklog/MESSAGE
index 9fd8d83191b..b57beb55441 100644
--- a/www/geeklog/MESSAGE
+++ b/www/geeklog/MESSAGE
@@ -1,29 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/06/15 13:26:44 taca Exp $
+$NetBSD: MESSAGE,v 1.2 2006/06/18 08:34:05 taca Exp $
 
-To complete the setup, check and edit ${GEEKLOG_DIR}/config.php.
+To complete the setup, please read:
 
-Then you will need to create a MySQL database for geeklog if you install
-Geeklog for the first time:
-
-	# ${PREFIX}/php ${GEEKLOG_EXAMPLESDIR}
-
-You will need to make Geeklog accessible through your HTTP server.
-If you are running Apache then you may add the following lines to
-httpd.conf:
-
-	Include ${PKG_SYSCONFDIR}/geeklog.conf
-
-This geeklog.conf assumes that Geeklog would be accessed with "/geeklog"
-sub directory.  Since you had better limit the access until complete
-Geeklog setup, geeklog.conf limit access to "localhost".
-
-And complete install with:
-
-	http://localhost/geeklog/admin/install/install.php
-
-You can read documentation for install Geeklog:
-
-	http://localhost/geeklog/docs/install.html
+	${PREFIX}/share/doc/geeklog/README
 
 ===========================================================================
diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index bbffc2478fe..2fe3d72a8d9 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/06/17 01:48:23 taca Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/18 08:34:05 taca Exp $
 #
 
 DISTNAME=	geeklog-${VER}
 PKGNAME=	geeklog-${VER:S/sr/./}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.geeklog.net/filemgmt/upload_dir/
 
@@ -22,7 +23,8 @@ GEEKLOG_TMPL_SUB=	backend images/articles images/library \
 
 GEEKLOG_CONF_FILES=	config.php plugins/links/config.php \
 			plugins/polls/config.php plugins/spamx/config.php \
-			plugins/staticpages/config.php
+			plugins/staticpages/config.php \
+			system/lib-custom.php
 
 CONF_FILES+=		${GEEKLOG_EXAMPLESDIR}/geeklog.conf \
 			${PKG_SYSCONFDIR}/geeklog.conf
@@ -44,20 +46,19 @@ FILES_SUBST+=		APACHE_GROUP=${APACHE_GROUP:Q} \
 			GEEKLOG_TMPL_SUB=${GEEKLOG_TMPL_SUB:Q} \
 			GEEKLOG_TMPL_DIR=${GEEKLOG_TMPL_DIR:Q}
 
-MESSAGE_SUBST+=		GEEKLOG_DIR=${GEEKLOG_DIR:Q} \
-			GEEKLOG_EXAMPLESDIR=${GEEKLOG_EXAMPLESDIR:Q}
-
 PLIST_SUBST+=		GEEKLOG_BASE=${GEEKLOG_BASE:Q} \
 			GEEKLOG_PUB=${GEEKLOG_PUB:Q} \
 			GEEKLOG_TMPL=${GEEKLOG_TMPL:Q}
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths+=	${WRKDIR}/createdb.php
+SUBST_FILES.paths+=	${WRKDIR}/README ${WRKDIR}/createdb.php
 SUBST_FILES.paths+=	${WRKSRC}/config.php ${WRKSRC}/emailgeeklogstories
 SUBST_FILES.paths+=	${WRKSRC}/public_html/lib-common.php
 SUBST_SED.paths+=       -e 's,@GEEKLOG_DIR@,${GEEKLOG_DIR:Q},g'
+SUBST_SED.paths+=       -e 's,@GEEKLOG_EXAMPLESDIR@,${GEEKLOG_EXAMPLESDIR:Q},g'
 SUBST_SED.paths+=       -e 's,@GEEKLOG_PUBDIR@,${GEEKLOG_PUBDIR:Q},g'
 SUBST_SED.paths+=       -e 's,@GEEKLOG_SITESUBDIR@,${GEEKLOG_SITESUBDIR:Q},g'
+SUBST_SED.paths+=       -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g'
 SUBST_SED.paths+=       -e 's,@PREFIX@,${PREFIX:Q},g'
 SUBST_STAGE.paths=      post-configure
 
@@ -79,7 +80,8 @@ SUBST_SED.conf+=	-e '/^Alias/s,^,\#,'
 .endif
 
 post-extract:
-	${CP} ${FILESDIR}/createdb.php ${FILESDIR}/geeklog.conf ${WRKDIR}
+	${CP} ${FILESDIR}/README ${FILESDIR}/createdb.php \
+		${FILESDIR}/geeklog.conf ${WRKDIR}
 
 pre-install:
 	${FIND} ${WRKSRC:Q} -name "*.orig*" -exec ${RM} -f {} \;
@@ -87,13 +89,15 @@ pre-install:
 		${FIND} ${GEEKLOG_TMPL_SUB} -type f -exec ${CHMOD} -x {} \;
 
 do-install:
+	${INSTALL_DATA_DIR} ${GEEKLOG_DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/README ${GEEKLOG_DOCDIR}
 .for f in ${GEEKLOG_CONF_FILES}
 	${INSTALL_DATA_DIR} ${GEEKLOG_EXAMPLESDIR}/${f:H}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${GEEKLOG_EXAMPLESDIR}/${f}
-	${INSTALL_DATA} ${WRKDIR}/createdb.php ${GEEKLOG_EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKDIR}/geeklog.conf ${GEEKLOG_EXAMPLESDIR}
 	${RM} ${WRKSRC}/${f}
 .endfor
+	${INSTALL_DATA} ${WRKDIR}/createdb.php ${GEEKLOG_EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR}/geeklog.conf ${GEEKLOG_EXAMPLESDIR}
 	cd ${WRKSRC}; ${CP} -R ${GEEKLOG_SYS} ${GEEKLOG_DIR}
 .for d in ${GEEKLOG_TMPL_SUB}
 	cd ${WRKSRC}/public_html; \
diff --git a/www/geeklog/Makefile.common b/www/geeklog/Makefile.common
index 907ec9b3393..0cdd94a8339 100644
--- a/www/geeklog/Makefile.common
+++ b/www/geeklog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2006/06/15 13:26:44 taca Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/06/18 08:34:05 taca Exp $
 #
 
 GEEKLOG_BASE=		share/geeklog
@@ -11,7 +11,7 @@ GEEKLOG_DIR=		${PREFIX}/${GEEKLOG_BASE}
 # Geeklog public area
 GEEKLOG_PUBDIR=		${PREFIX}/${GEEKLOG_PUB}
 
-#GEEKLOG_DOCDIR= 	${PREFIX}/share/doc/geeklog
+GEEKLOG_DOCDIR= 	${PREFIX}/share/doc/geeklog
 GEEKLOG_EXAMPLESDIR=	${PREFIX}/share/examples/geeklog
 GEEKLOG_TMPL_DIR=	${PREFIX}/${GEEKLOG_TMPL}
 
diff --git a/www/geeklog/PLIST b/www/geeklog/PLIST
index 7f9a85c226c..d2af31a0d45 100644
--- a/www/geeklog/PLIST
+++ b/www/geeklog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/06/15 13:26:44 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/06/18 08:34:05 taca Exp $
 ${GEEKLOG_BASE}/emailgeeklogstories
 ${GEEKLOG_BASE}/language/bosnian.php
 ${GEEKLOG_BASE}/language/bosnian_utf-8.php
@@ -1362,7 +1362,6 @@ ${GEEKLOG_BASE}/system/databases/mysql.class.php
 ${GEEKLOG_BASE}/system/install_templates/databasesettings.tpl
 ${GEEKLOG_BASE}/system/lib-admin.php
 ${GEEKLOG_BASE}/system/lib-comment.php
-${GEEKLOG_BASE}/system/lib-custom.php
 ${GEEKLOG_BASE}/system/lib-database.php
 ${GEEKLOG_BASE}/system/lib-pingback.php
 ${GEEKLOG_BASE}/system/lib-plugins.php
@@ -1571,6 +1570,7 @@ ${GEEKLOG_BASE}/system/pear/scripts/pecl.bat
 ${GEEKLOG_BASE}/system/pear/scripts/pecl.sh
 ${GEEKLOG_BASE}/system/pear/scripts/peclcmd.php
 ${GEEKLOG_BASE}/system/pear/template.spec
+share/doc/geeklog/README
 share/examples/geeklog/config.php
 share/examples/geeklog/createdb.php
 share/examples/geeklog/geeklog.conf
@@ -1578,6 +1578,9 @@ share/examples/geeklog/plugins/links/config.php
 share/examples/geeklog/plugins/polls/config.php
 share/examples/geeklog/plugins/spamx/config.php
 share/examples/geeklog/plugins/staticpages/config.php
+share/examples/geeklog/system/lib-custom.php
+@dirrm share/doc/geeklog
+@dirrm share/examples/geeklog/system
 @dirrm share/examples/geeklog/plugins/links
 @dirrm share/examples/geeklog/plugins/polls
 @dirrm share/examples/geeklog/plugins/spamx
diff --git a/www/geeklog/files/README b/www/geeklog/files/README
new file mode 100644
index 00000000000..7edf09292f6
--- /dev/null
+++ b/www/geeklog/files/README
@@ -0,0 +1,28 @@
+$NetBSD: README,v 1.1 2006/06/18 08:34:05 taca Exp $
+
+To complete the setup, check and edit @GEEKLOG_DIR@/config.php.
+
+Then you will need to create a MySQL database for geeklog if you install
+Geeklog for the first time:
+
+	# @PREFIX@/php @GEEKLOG_EXAMPLESDIR@
+
+You will need to make Geeklog accessible through your HTTP server.
+If you are running Apache then you may add the following lines to
+httpd.conf:
+
+	Include @PKG_SYSCONFDIR@/geeklog.conf
+
+This geeklog.conf assumes that Geeklog would be accessed with "/geeklog"
+sub directory.  Since you had better limit the access until complete
+Geeklog setup, geeklog.conf limit access to "localhost".  After complete
+your setup, please relax this access restriction.
+
+And complete install with:
+
+	http://localhost/geeklog/admin/install/install.php
+
+You can read documentation for install Geeklog:
+
+	http://localhost/geeklog/docs/install.html
+