[pkgsrc/trunk]: pkgsrc/www/geeklog - Fix bad handling of some cofiguration fi...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/geeklog - Fix bad handling of some cofiguration fi...
From: taca <taca%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:47:37 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/706921e35869
branches:  trunk
changeset: 516565:706921e35869
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Jul 23 13:21:09 2006 +0000

description:
- Fix bad handling of some cofiguration files noted by ghen@ behalf of
  pkgsrc release engineering team.
- Keep current directory with DEINSTALL and INSTALL script.
- remove extra processing with POST-DEINSTALL action from DEINSTALL script.
- Suggest use of additional graphic package.
- Add APACHE_GROUP to BUILD_DEFS.
- install ${GEEKLOG_EXAMPLESDIR}/createdb.php with INSTALL_SCRIPT.

Bump PKGREVISION.

diffstat:

 www/geeklog/DEINSTALL |  18 +++---------------
 www/geeklog/INSTALL   |   5 +++--
 www/geeklog/MESSAGE   |   5 ++++-
 www/geeklog/Makefile  |   7 +++++--
 www/geeklog/PLIST     |   6 +-----
 5 files changed, 16 insertions(+), 25 deletions(-)

diffs (152 lines):

diff -r 3c6d39aa5ec1 -r 706921e35869 www/geeklog/DEINSTALL
--- a/www/geeklog/DEINSTALL     Sun Jul 23 12:47:21 2006 +0000
+++ b/www/geeklog/DEINSTALL     Sun Jul 23 13:21:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.2 2006/06/18 08:34:05 taca Exp $
+# $NetBSD: DEINSTALL,v 1.3 2006/07/23 13:21:09 taca Exp $
 
 GEEKLOG_DIR="@GEEKLOG_DIR@"
 GEEKLOG_EXAMPLESDIR="@GEEKLOG_EXAMPLESDIR@"
@@ -8,7 +8,7 @@
 
 case ${STAGE} in
 DEINSTALL)
-       cd ${GEEKLOG_TMPL_DIR}
+       (cd ${GEEKLOG_TMPL_DIR}
        ${FIND} ${GEEKLOG_TMPL_SUB} -type f -print | \
                while read f; do
                        file="${GEEKLOG_PUBDIR}/$f"
@@ -49,19 +49,7 @@
                ${ECHO} ""
                ${ECHO} "==========================================================================="
        fi
-       ;;
-
-POST-DEINSTALL)
-       ${RMDIR} -p ${GEEKLOG_DIR} 2>/dev/null
-       if ${TEST} -d ${GEEKLOG_DIR}; then
-               ${ECHO} "==========================================================================="
-               ${ECHO} "The following directories are no longer being used by ${PKGNAME},"
-               ${ECHO} "and they can be removed if no other packages are using them:"
-               ${ECHO} ""
-               ${ECHO} "       ${GEEKLOG_DIR}"
-               ${ECHO} ""
-               ${ECHO} "==========================================================================="
-       fi
+       )
        ;;
 
 esac
diff -r 3c6d39aa5ec1 -r 706921e35869 www/geeklog/INSTALL
--- a/www/geeklog/INSTALL       Sun Jul 23 12:47:21 2006 +0000
+++ b/www/geeklog/INSTALL       Sun Jul 23 13:21:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2006/06/15 13:26:42 taca Exp $
+# $NetBSD: INSTALL,v 1.2 2006/07/23 13:21:09 taca Exp $
 
 APACHE_GROUP="@APACHE_GROUP@"
 GEEKLOG_PUBDIR="@GEEKLOG_PUBDIR@"
@@ -7,7 +7,7 @@
 
 case ${STAGE} in
 POST-INSTALL)
-       cd ${GEEKLOG_TMPL_DIR}
+       (cd ${GEEKLOG_TMPL_DIR}
        ${FIND} ${GEEKLOG_TMPL_SUB} -type d -print | \
                while read d; do
                        dir="${GEEKLOG_PUBDIR}/$d"
@@ -25,5 +25,6 @@
                                ${CHGRP} ${APACHE_GROUP} ${file}
                                fi
                        done
+       )
        ;;
 esac
diff -r 3c6d39aa5ec1 -r 706921e35869 www/geeklog/MESSAGE
--- a/www/geeklog/MESSAGE       Sun Jul 23 12:47:21 2006 +0000
+++ b/www/geeklog/MESSAGE       Sun Jul 23 13:21:09 2006 +0000
@@ -1,8 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/06/18 08:34:05 taca Exp $
+$NetBSD: MESSAGE,v 1.3 2006/07/23 13:21:09 taca Exp $
 
 To complete the setup, please read:
 
        ${PREFIX}/share/doc/geeklog/README
 
+And if you want to use image file uploading, please install one of these
+packages; ImageMagick, netpbm or php-gd.
+
 ===========================================================================
diff -r 3c6d39aa5ec1 -r 706921e35869 www/geeklog/Makefile
--- a/www/geeklog/Makefile      Sun Jul 23 12:47:21 2006 +0000
+++ b/www/geeklog/Makefile      Sun Jul 23 13:21:09 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/07/17 02:03:30 taca Exp $
+# $NetBSD: Makefile,v 1.10 2006/07/23 13:21:09 taca Exp $
 #
 
 DISTNAME=      geeklog-${VER}
+PKGREVISION=   1
 PKGNAME=       geeklog-${VER:S/sr/./}
 CATEGORIES=    www
 MASTER_SITES=  http://www.geeklog.net/filemgmt/upload_dir/
@@ -16,6 +17,8 @@
 VER=           1.4.0sr5
 NO_BUILD=      YES
 
+BUILD_DEFS+=   APACHE_GROUP
+
 GEEKLOG_SYS=           emailgeeklogstories language plugins readme sql system
 GEEKLOG_TMPL_SUB=      backend images/articles images/library \
                        images/topics images/userphotos
@@ -97,7 +100,7 @@
        ${INSTALL_DATA} ${WRKSRC}/${f} ${GEEKLOG_EXAMPLESDIR}/${f}
        ${RM} ${WRKSRC}/${f}
 .endfor
-       ${INSTALL_DATA} ${WRKDIR}/createdb.php ${GEEKLOG_EXAMPLESDIR}
+       ${INSTALL_SCRIPT} ${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}
diff -r 3c6d39aa5ec1 -r 706921e35869 www/geeklog/PLIST
--- a/www/geeklog/PLIST Sun Jul 23 12:47:21 2006 +0000
+++ b/www/geeklog/PLIST Sun Jul 23 13:21:09 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/07/09 13:29:24 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/07/23 13:21:09 taca Exp $
 ${GEEKLOG_BASE}/emailgeeklogstories
 ${GEEKLOG_BASE}/language/bosnian.php
 ${GEEKLOG_BASE}/language/bosnian_utf-8.php
@@ -68,7 +68,6 @@
 ${GEEKLOG_BASE}/language/ukrainian_koi8-u.php
 ${GEEKLOG_BASE}/language/ukrainian_utf-8.php
 ${GEEKLOG_BASE}/plugins/developer.README
-${GEEKLOG_BASE}/plugins/links/config.php
 ${GEEKLOG_BASE}/plugins/links/functions.inc
 ${GEEKLOG_BASE}/plugins/links/language/README
 ${GEEKLOG_BASE}/plugins/links/language/chinese_simplified_utf-8.php
@@ -97,7 +96,6 @@
 ${GEEKLOG_BASE}/plugins/links/templates/pagenavigation.thtml
 ${GEEKLOG_BASE}/plugins/links/templates/submitlink.thtml
 ${GEEKLOG_BASE}/plugins/plugin.INSTALL
-${GEEKLOG_BASE}/plugins/polls/config.php
 ${GEEKLOG_BASE}/plugins/polls/functions.inc
 ${GEEKLOG_BASE}/plugins/polls/language/README
 ${GEEKLOG_BASE}/plugins/polls/language/chinese_simplified_utf-8.php
@@ -141,7 +139,6 @@
 ${GEEKLOG_BASE}/plugins/spamx/MailAdmin.Action.class.php
 ${GEEKLOG_BASE}/plugins/spamx/MassDelTrackback.Admin.class.php
 ${GEEKLOG_BASE}/plugins/spamx/MassDelete.Admin.class.php
-${GEEKLOG_BASE}/plugins/spamx/config.php
 ${GEEKLOG_BASE}/plugins/spamx/functions.inc
 ${GEEKLOG_BASE}/plugins/spamx/language/english.php
 ${GEEKLOG_BASE}/plugins/spamx/language/english_utf-8.php
@@ -161,7 +158,6 @@
 ${GEEKLOG_BASE}/plugins/spamx/rss.inc.php
 ${GEEKLOG_BASE}/plugins/spamx/templates/admin.thtml
 ${GEEKLOG_BASE}/plugins/spamx/templates/install.thtml
-${GEEKLOG_BASE}/plugins/staticpages/config.php
 ${GEEKLOG_BASE}/plugins/staticpages/functions.inc
 ${GEEKLOG_BASE}/plugins/staticpages/language/README
 ${GEEKLOG_BASE}/plugins/staticpages/language/chinese_simplified_utf-8.php

Prev by Date: [pkgsrc/trunk]: pkgsrc/www/drupal Add in an AllowOverride directive so that d...
Next by Date: [pkgsrc/trunk]: pkgsrc/archivers/lha Honour PKGMANDIR.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/drupal Add in an AllowOverride directive so that d...
Next by Thread: [pkgsrc/trunk]: pkgsrc/archivers/lha Honour PKGMANDIR.
Indexes:

Home | Main Index | Thread Index | Old Index