Date: Fri, 14 Apr 2006 04:18:28 +0100 From: Shaun Amott <shaun@inerd.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95721: [MAINTAINER] www/horde + all horde ports - modify way config files are installed when upgrading Message-ID: <1144984708.4503@charon.picobyte.net> Resent-Message-ID: <200604140320.k3E3KE10006206@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95721
>Category: ports
>Synopsis: [MAINTAINER] www/horde + all horde ports - modify way config files are installed when upgrading
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 14 03:20:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Shaun Amott
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
>Description:
After a recent discussion on freebsd-ports, I have modified the Horde ports, so that
they now do not overwrite existing configuration files. Rather than backing up the
old ones and allowing the user to merge the files by hand, config files are left
untouched.
- Update www/horde, deskutils/nag, deskutils/mnemo, deskutils/kronolith,
mail/turba, mail/ingo, mail/imp, devel/chora
- Take maintainership of www/horde-passwd, and bring into line with the
other ports.
- Message for UPDATING
PS: If single "mega-patches" are generally preferred, let me know, and
I can patch against $PORTSDIR in future.
>How-To-Repeat:
>Fix:
-----Start of UPDATING.diff-----
--- UPDATING.orig Fri Apr 14 03:01:04 2006
+++ UPDATING Fri Apr 14 03:17:23 2006
@@ -6,6 +6,21 @@
time you update your ports collection, before attempting any port
upgrades.
+20060414:
+ AFFECTS: users of www/horde, www/horde-php5, www/horde-passwd,
+ deskutils/nag, deskutils/mnemo, deskutils/kronolith,
+ mail/turba, mail/ingo, mail/imp, devel/chora
+ AUTHOR: shaun@inerd.com
+
+ The Horde ports no longer overwrite your existing configuration
+ files during an upgrade: if you have modified any of the files in the
+ config directory of any of these ports, they will be left untouched
+ when you upgrade.
+
+ It is recommended that the new .dist files are examined after an
+ upgrade and any changes merged into your existing config files if
+ necessary.
+
20060408:
AFFECTS: users of www/linux-flashplugin*
AUTHOR: hrs@FreeBSD.org
-----End of UPDATING.diff-----
-----Start of chora.diff-----
diff -urN chora.orig/Makefile chora/Makefile
--- chora.orig/Makefile Mon Apr 10 15:29:32 2006
+++ chora/Makefile Fri Apr 14 03:05:25 2006
@@ -70,7 +70,7 @@
PLIST_SUB= CHORADIR=${LCHORADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-SUB_FILES= pkg-message pkg-deinstall
+SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= CHORADIR=${CHORADIR} CONFDIR=${CONFDIR}
CHORADIR= ${PREFIX}/${LCHORADIR}
@@ -114,11 +114,7 @@
@${CP} -Rp ${WRKSRC}/${REP} ${CHORADIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${CHORADIR}
-.for FILE in ${CONFFILE}
- @if [ ! -f ${CONFDIR}/${FILE} ]; then \
- ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
- fi
-.endfor
+
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${CHORADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-chora.conf ${HORDE_INC}
@@ -131,6 +127,7 @@
.endif
post-install:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff -urN chora.orig/files/pkg-deinstall.in chora/files/pkg-deinstall.in
--- chora.orig/files/pkg-deinstall.in Fri Jan 6 00:38:11 2006
+++ chora/files/pkg-deinstall.in Fri Apr 14 03:06:08 2006
@@ -12,13 +12,10 @@
for cf in `ls %%CHORADIR%%/config/*php %%CHORADIR%%/config/*txt`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
- 0) # original config file, will be deleted by pkg-plist
+ 0) # original config file, delete it
+ rm -f $cf
;;
- 1) # config file has been updated, must be backuped
- cp -p $cf $cf.previous
- echo "===> Backing-up..."
- echo "---> $cf has been saved ***"
- echo "---> as $cf.previous ***"
+ 1) # config file has been updated, leave it alone
;;
*) # not found?
;;
diff -urN chora.orig/files/pkg-install.in chora/files/pkg-install.in
--- chora.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ chora/files/pkg-install.in Fri Apr 14 03:06:37 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+
+ POST-INSTALL)
+ if [ -z "${PACKAGE_BUILDING}" ]; then
+ # Copy over sample config files unless they already exist
+
+ for cf in `ls %%CHORADIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
+ if [ ! -f $cf ]; then
+ cp -p $cf.dist $cf
+ fi
+ done
+ fi
+ ;;
+esac
diff -urN chora.orig/pkg-plist chora/pkg-plist
--- chora.orig/pkg-plist Thu Jan 26 21:11:17 2006
+++ chora/pkg-plist Fri Apr 14 03:05:36 2006
@@ -12,15 +12,10 @@
%%CHORADIR%%/co.php
%%CHORADIR%%/config/.htaccess
%%CHORADIR%%/config/conf.xml
-%%CHORADIR%%/config/cvsgraph.conf
%%CHORADIR%%/config/cvsgraph.conf.dist
-%%CHORADIR%%/config/longIntro.txt
%%CHORADIR%%/config/longIntro.txt.dist
-%%CHORADIR%%/config/mime_drivers.php
%%CHORADIR%%/config/mime_drivers.php.dist
-%%CHORADIR%%/config/prefs.php
%%CHORADIR%%/config/prefs.php.dist
-%%CHORADIR%%/config/sourceroots.php
%%CHORADIR%%/config/sourceroots.php.dist
%%CHORADIR%%/cvs.php
%%CHORADIR%%/cvsgraph.php
-----End of chora.diff-----
-----Start of horde-passwd.diff-----
diff -urN horde-passwd.orig/Makefile horde-passwd/Makefile
--- horde-passwd.orig/Makefile Wed Jan 18 23:54:05 2006
+++ horde-passwd/Makefile Fri Apr 14 03:19:30 2006
@@ -20,7 +20,7 @@
DISTNAME= passwd-h3-${PORTVERSION}
DIST_SUBDIR= horde
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= shaun@inerd.com
COMMENT= A password changing module for Horde
RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
@@ -32,7 +32,7 @@
HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-SUB_FILES= pkg-message pkg-deinstall
+SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= PWDDIR=${PWDDIR} CONFDIR=${CONFDIR} HORDEDIR=${HORDEDIR}
DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \
@@ -65,11 +65,7 @@
@${CP} -Rp ${WRKSRC}/${REP} ${PWDDIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${PWDDIR}
-.for FILE in ${CONFFILE}
- @if [ ! -f ${CONFDIR}/${FILE} ]; then \
- ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
- fi
-.endfor
+
@${CHOWN} -R www:www ${PWDDIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-pwd.conf ${HORDE_INC}
@@ -82,6 +78,7 @@
.endif
post-install:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff -urN horde-passwd.orig/files/pkg-deinstall.in horde-passwd/files/pkg-deinstall.in
--- horde-passwd.orig/files/pkg-deinstall.in Fri Jan 6 00:38:13 2006
+++ horde-passwd/files/pkg-deinstall.in Fri Apr 14 03:20:31 2006
@@ -2,7 +2,6 @@
#
# $FreeBSD: ports/www/horde-passwd/files/pkg-deinstall.in,v 1.1 2006/01/06 00:38:13 thierry Exp $
#
-# Backup horde-passwd config files, if needed.
if [ x$2 != xDEINSTALL ]; then
exit
@@ -12,13 +11,10 @@
for cf in `ls %%PWDDIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
- 0) # original config file, will be deleted by pkg-plist
+ 0) # original config file, delete it
+ rm -f $cf
;;
- 1) # config file has been updated, must be backuped
- cp -p $cf $cf.previous
- echo "===> Backing-up..."
- echo "---> $cf has been saved ***"
- echo "---> as $cf.previous ***"
+ 1) # config file has been updated, leave it alone
;;
*) # not found?
;;
diff -urN horde-passwd.orig/files/pkg-install.in horde-passwd/files/pkg-install.in
--- horde-passwd.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ horde-passwd/files/pkg-install.in Fri Apr 14 03:21:00 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+
+ POST-INSTALL)
+ if [ -z "${PACKAGE_BUILDING}" ]; then
+ # Copy over sample config files unless they already exist
+
+ for cf in `ls %%PWDDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
+ if [ ! -f $cf ]; then
+ cp -p $cf.dist $cf
+ fi
+ done
+ fi
+ ;;
+esac
-----End of horde-passwd.diff-----
-----Start of horde.diff-----
diff -urN horde.orig/Makefile horde/Makefile
--- horde.orig/Makefile Mon Apr 10 06:39:51 2006
+++ horde/Makefile Fri Apr 14 02:23:12 2006
@@ -137,7 +137,7 @@
. if !defined(WITHOUT_MYSQL)
USE_PHP+= mysql
. endif
-. if defined(WITH_POSTGRESQL)
+. if defined(WITH_POSTGRESQL) || defined(WITH_PGSQL)
USE_PHP+= pgsql
. endif
. if defined(WITH_SQLITE)
@@ -339,11 +339,7 @@
@${CP} -Rp ${WRKSRC}/${REP} ${HORDEDIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${HORDEDIR}
-.for FILE in ${CONFFILE}
- @if [ ! -f ${CONFDIR}/${FILE} ]; then \
- ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
- fi
-.endfor
+
@${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh
@${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh
.if ${APACHE_VERSION} >= 20
@@ -373,7 +369,7 @@
.endif
post-install:
- ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff -urN horde.orig/files/pkg-deinstall.in horde/files/pkg-deinstall.in
--- horde.orig/files/pkg-deinstall.in Sun Aug 28 10:29:56 2005
+++ horde/files/pkg-deinstall.in Thu Apr 13 19:35:38 2006
@@ -22,13 +22,10 @@
for cf in `ls %%HORDEDIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
- 0) # original config file, will be deleted by pkg-plist
+ 0) # original config file, delete
+ rm -f $cf
;;
- 1) # config file has been updated, must be backuped
- cp -p $cf $cf.previous
- echo "===> Backing-up..."
- echo "---> $cf has been saved ***"
- echo "---> as $cf.previous ***"
+ 1) # config file has been updated, leave it
;;
*) # not found?
;;
diff -urN horde.orig/files/pkg-install.in horde/files/pkg-install.in
--- horde.orig/files/pkg-install.in Sun Nov 13 20:30:47 2005
+++ horde/files/pkg-install.in Thu Apr 13 19:37:36 2006
@@ -102,14 +102,11 @@
fi
if [ -z "${PACKAGE_BUILDING}" ]; then
- # Don't reset the config to default (PR ports/88621)
+ # Copy over sample config files unless they already exist
- for cf in `ls %%HORDEDIR%%/config/*php`; do
- if [ -f $cf.previous ]; then
- mv $cf $cf.new
- echo "---> $cf not installed ***"
- echo "---> please copy from $cf.previous ***"
- echo "---> or from $cf.new ***"
+ for cf in `ls %%HORDEDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
+ if [ ! -f $cf ]; then
+ cp -p $cf.dist $cf
fi
done
fi
diff -urN horde.orig/files/pkg-message.in horde/files/pkg-message.in
--- horde.orig/files/pkg-message.in Tue Mar 28 19:15:22 2006
+++ horde/files/pkg-message.in Thu Apr 13 19:37:45 2006
@@ -1,9 +1,6 @@
************************************************************************
Horde has been installed in %%HORDEDIR%% with your blank
-configuration files. After a reinstallation, you have to explicitely
-merge your files %%HORDEDIR%%/config/conf.php.new
-and %%HORDEDIR%%/config/conf.php.previous
-into %%HORDEDIR%%/config/conf.php .
+configuration files.
WARNING! the first user will get logged in as an administrator!
********
diff -urN horde.orig/pkg-plist horde/pkg-plist
--- horde.orig/pkg-plist Tue Mar 28 19:15:22 2006
+++ horde/pkg-plist Thu Apr 13 19:38:13 2006
@@ -35,20 +35,13 @@
%%HORDEDIR%%/admin/templates.php
%%HORDEDIR%%/admin/user.php
%%HORDEDIR%%/config/.htaccess
-%%HORDEDIR%%/config/conf.php
%%HORDEDIR%%/config/conf.php.dist
%%HORDEDIR%%/config/conf.xml
-%%HORDEDIR%%/config/hooks.php
%%HORDEDIR%%/config/hooks.php.dist
-%%HORDEDIR%%/config/mime_drivers.php
%%HORDEDIR%%/config/mime_drivers.php.dist
-%%HORDEDIR%%/config/motd.php
%%HORDEDIR%%/config/motd.php.dist
-%%HORDEDIR%%/config/nls.php
%%HORDEDIR%%/config/nls.php.dist
-%%HORDEDIR%%/config/prefs.php
%%HORDEDIR%%/config/prefs.php.dist
-%%HORDEDIR%%/config/registry.php
%%HORDEDIR%%/config/registry.php.dist
%%HORDEDIR%%/index.php
%%HORDEDIR%%/js/addEvent.php
-----End of horde.diff-----
-----Start of imp.diff-----
diff -urN imp.orig/Makefile imp/Makefile
--- imp.orig/Makefile Mon Apr 10 15:31:13 2006
+++ imp/Makefile Fri Apr 14 02:22:45 2006
@@ -120,7 +120,7 @@
PLIST_SUB= IMPDIR=${LIMPDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-SUB_FILES= pkg-message pkg-deinstall
+SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
IMPDIR= ${PREFIX}/${LIMPDIR}
@@ -226,11 +226,7 @@
@${CP} -Rp ${WRKSRC}/${REP} ${IMPDIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${IMPDIR}
-.for FILE in ${CONFFILE}
- @if [ ! -f ${CONFDIR}/${FILE} ]; then \
- ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
- fi
-.endfor
+
@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}
@@ -244,6 +240,7 @@
.endif
post-install:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff -urN imp.orig/files/pkg-deinstall.in imp/files/pkg-deinstall.in
--- imp.orig/files/pkg-deinstall.in Fri Jan 6 00:38:13 2006
+++ imp/files/pkg-deinstall.in Thu Apr 13 21:55:09 2006
@@ -2,7 +2,6 @@
#
# $FreeBSD: ports/mail/imp/files/pkg-deinstall.in,v 1.1 2006/01/06 00:38:13 thierry Exp $
#
-# Backup IMP config files, if needed.
if [ x$2 != xDEINSTALL ]; then
exit
@@ -12,13 +11,10 @@
for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
- 0) # original config file, will be deleted by pkg-plist
+ 0) # original config file, delete it
+ rm -f $cf
;;
- 1) # config file has been updated, must be backuped
- cp -p $cf $cf.previous
- echo "===> Backing-up..."
- echo "---> $cf has been saved ***"
- echo "---> as $cf.previous ***"
+ 1) # config file has been updated, leave it alone
;;
*) # not found?
;;
diff -urN imp.orig/files/pkg-install.in imp/files/pkg-install.in
--- imp.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ imp/files/pkg-install.in Thu Apr 13 21:59:06 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+
+ POST-INSTALL)
+ if [ -z "${PACKAGE_BUILDING}" ]; then
+ # Copy over sample config files unless they already exist
+
+ for cf in `ls %%IMPDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
+ if [ ! -f $cf ]; then
+ cp -p $cf.dist $cf
+ fi
+ done
+ fi
+ ;;
+esac
diff -urN imp.orig/pkg-plist imp/pkg-plist
--- imp.orig/pkg-plist Sat Mar 18 15:49:52 2006
+++ imp/pkg-plist Thu Apr 13 21:53:46 2006
@@ -11,21 +11,13 @@
%%IMPDIR%%/compose.php
%%IMPDIR%%/config/.htaccess
%%IMPDIR%%/config/conf.xml
-%%IMPDIR%%/config/filter.txt
%%IMPDIR%%/config/filter.txt.dist
-%%IMPDIR%%/config/header.php
%%IMPDIR%%/config/header.php.dist
-%%IMPDIR%%/config/menu.php
%%IMPDIR%%/config/menu.php.dist
-%%IMPDIR%%/config/mime_drivers.php
%%IMPDIR%%/config/mime_drivers.php.dist
-%%IMPDIR%%/config/motd.php
%%IMPDIR%%/config/motd.php.dist
-%%IMPDIR%%/config/prefs.php
%%IMPDIR%%/config/prefs.php.dist
-%%IMPDIR%%/config/servers.php
%%IMPDIR%%/config/servers.php.dist
-%%IMPDIR%%/config/trailer.txt
%%IMPDIR%%/config/trailer.txt.dist
%%IMPDIR%%/contacts.php
%%IMPDIR%%/expand.php
-----End of imp.diff-----
-----Start of ingo.diff-----
diff -urN ingo.orig/Makefile ingo/Makefile
--- ingo.orig/Makefile Mon Apr 10 15:31:13 2006
+++ ingo/Makefile Fri Apr 14 02:42:45 2006
@@ -20,7 +20,7 @@
DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= shaun@inerd.com
-COMMENT= Horde's email-filter management application
+COMMENT= Horde\'s email-filter management application
#-----------------------------------------------------------------------
# You may define this option:
@@ -39,7 +39,7 @@
PLIST_SUB= INGODIR=${LINGODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-SUB_FILES= pkg-message pkg-deinstall
+SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= INGODIR=${INGODIR}
DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \
@@ -76,11 +76,7 @@
@${CP} -Rp ${WRKSRC}/${REP} ${INGODIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${INGODIR}
-.for FILE in ${CONFFILE}
- @if [ ! -f ${CONFDIR}/${FILE} ]; then \
- ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
- fi
-.endfor
+
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
@@ -93,6 +89,7 @@
.endif
post-install:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff -urN ingo.orig/files/pkg-deinstall.in ingo/files/pkg-deinstall.in
--- ingo.orig/files/pkg-deinstall.in Fri Jan 6 00:38:12 2006
+++ ingo/files/pkg-deinstall.in Fri Apr 14 02:43:36 2006
@@ -12,13 +12,10 @@
for cf in `ls %%INGODIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
- 0) # original config file, will be deleted by pkg-plist
+ 0) # original config file, delete it
+ rm -f $cf
;;
- 1) # config file has been updated, must be backuped
- cp -p $cf $cf.previous
- echo "===> Backing-up..."
- echo "---> $cf has been saved ***"
- echo "---> as $cf.previous ***"
+ 1) # config file has been updated, leave it alone
;;
*) # not found?
;;
diff -urN ingo.orig/files/pkg-install.in ingo/files/pkg-install.in
--- ingo.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ ingo/files/pkg-install.in Fri Apr 14 02:44:11 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+
+ POST-INSTALL)
+ if [ -z "${PACKAGE_BUILDING}" ]; then
+ # Copy over sample config files unless they already exist
+
+ for cf in `ls %%INGODIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
+ if [ ! -f $cf ]; then
+ cp -p $cf.dist $cf
+ fi
+ done
+ fi
+ ;;
+esac
diff -urN ingo.orig/pkg-plist ingo/pkg-plist
--- ingo.orig/pkg-plist Mon Apr 3 19:26:21 2006
+++ ingo/pkg-plist Fri Apr 14 02:42:58 2006
@@ -8,12 +8,9 @@
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%INGODIR%%/blacklist.php
%%INGODIR%%/config/.htaccess
-%%INGODIR%%/config/backends.php
%%INGODIR%%/config/backends.php.dist
%%INGODIR%%/config/conf.xml
-%%INGODIR%%/config/fields.php
%%INGODIR%%/config/fields.php.dist
-%%INGODIR%%/config/prefs.php
%%INGODIR%%/config/prefs.php.dist
%%INGODIR%%/filters.php
%%INGODIR%%/forward.php
-----End of ingo.diff-----
-----Start of kronolith.diff-----
diff -urN kronolith.orig/Makefile kronolith/Makefile
--- kronolith.orig/Makefile Mon Apr 10 15:29:27 2006
+++ kronolith/Makefile Fri Apr 14 02:22:23 2006
@@ -40,7 +40,7 @@
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-SUB_FILES= pkg-message pkg-deinstall
+SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= KRONOLITHDIR=${KRONOLITHDIR}
PLIST_SUB= KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
@@ -68,11 +68,7 @@
@${CP} -Rp ${WRKSRC}/${REP} ${KRONOLITHDIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR}
-.for FILE in ${CONFFILE}
- @if [ ! -f ${CONFDIR}/${FILE} ]; then \
- ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
- fi
-.endfor
+
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC}
@@ -85,6 +81,7 @@
.endif
post-install:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff -urN kronolith.orig/files/pkg-deinstall.in kronolith/files/pkg-deinstall.in
--- kronolith.orig/files/pkg-deinstall.in Fri Jan 6 00:38:10 2006
+++ kronolith/files/pkg-deinstall.in Fri Apr 14 02:37:17 2006
@@ -12,13 +12,10 @@
for cf in `ls %%KRONOLITHDIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
- 0) # original config file, will be deleted by pkg-plist
+ 0) # original config file, delete it
+ rm -f $cf
;;
- 1) # config file has been updated, must be backuped
- cp -p $cf $cf.previous
- echo "===> Backing-up..."
- echo "---> $cf has been saved ***"
- echo "---> as $cf.previous ***"
+ 1) # config file has been updated, leave it alone
;;
*) # not found?
;;
diff -urN kronolith.orig/files/pkg-install.in kronolith/files/pkg-install.in
--- kronolith.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ kronolith/files/pkg-install.in Fri Apr 14 02:21:20 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+
+ POST-INSTALL)
+ if [ -z "${PACKAGE_BUILDING}" ]; then
+ # Copy over sample config files unless they already exist
+
+ for cf in `ls %%KRONOLITHDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
+ if [ ! -f $cf ]; then
+ cp -p $cf.dist $cf
+ fi
+ done
+ fi
+ ;;
+esac
diff -urN kronolith.orig/pkg-plist kronolith/pkg-plist
--- kronolith.orig/pkg-plist Sat Mar 18 15:40:15 2006
+++ kronolith/pkg-plist Fri Apr 14 02:20:35 2006
@@ -13,11 +13,8 @@
%%KRONOLITHDIR%%/calendars.php
%%KRONOLITHDIR%%/config/.htaccess
%%KRONOLITHDIR%%/config/conf.xml
-%%KRONOLITHDIR%%/config/keywords.php
%%KRONOLITHDIR%%/config/keywords.php.dist
-%%KRONOLITHDIR%%/config/menu.php
%%KRONOLITHDIR%%/config/menu.php.dist
-%%KRONOLITHDIR%%/config/prefs.php
%%KRONOLITHDIR%%/config/prefs.php.dist
%%KRONOLITHDIR%%/contacts.php
%%KRONOLITHDIR%%/data.php
-----End of kronolith.diff-----
-----Start of mnemo.diff-----
diff -urN mnemo.orig/Makefile mnemo/Makefile
--- mnemo.orig/Makefile Mon Apr 10 15:29:27 2006
+++ mnemo/Makefile Fri Apr 14 02:45:33 2006
@@ -30,7 +30,7 @@
PLIST_SUB= MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-SUB_FILES= pkg-message pkg-deinstall
+SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= MNEMODIR=${MNEMODIR}
REINPLACE_ARGS= -i ""
@@ -66,11 +66,7 @@
@${CP} -Rp ${WRKSRC}/${REP} ${MNEMODIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${MNEMODIR}
-.for FILE in ${CONFFILE}
- @if [ ! -f ${CONFDIR}/${FILE} ]; then \
- ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
- fi
-.endfor
+
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC}
@@ -83,6 +79,7 @@
.endif
post-install:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff -urN mnemo.orig/files/pkg-deinstall.in mnemo/files/pkg-deinstall.in
--- mnemo.orig/files/pkg-deinstall.in Fri Jan 6 00:38:10 2006
+++ mnemo/files/pkg-deinstall.in Fri Apr 14 02:46:55 2006
@@ -12,13 +12,10 @@
for cf in `ls %%MNEMODIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
- 0) # original config file, will be deleted by pkg-plist
+ 0) # original config file, delete it
+ rm -f $cf
;;
- 1) # config file has been updated, must be backuped
- cp -p $cf $cf.previous
- echo "===> Backing-up..."
- echo "---> $cf has been saved ***"
- echo "---> as $cf.previous ***"
+ 1) # config file has been updated, leave it alone
;;
*) # not found?
;;
diff -urN mnemo.orig/files/pkg-install.in mnemo/files/pkg-install.in
--- mnemo.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ mnemo/files/pkg-install.in Fri Apr 14 02:47:20 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+
+ POST-INSTALL)
+ if [ -z "${PACKAGE_BUILDING}" ]; then
+ # Copy over sample config files unless they already exist
+
+ for cf in `ls %%MNEMODIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
+ if [ ! -f $cf ]; then
+ cp -p $cf.dist $cf
+ fi
+ done
+ fi
+ ;;
+esac
diff -urN mnemo.orig/pkg-plist mnemo/pkg-plist
--- mnemo.orig/pkg-plist Sat Mar 18 15:40:17 2006
+++ mnemo/pkg-plist Fri Apr 14 02:45:48 2006
@@ -9,7 +9,6 @@
%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%MNEMODIR%%/config/.htaccess
%%MNEMODIR%%/config/conf.xml
-%%MNEMODIR%%/config/prefs.php
%%MNEMODIR%%/config/prefs.php.dist
%%MNEMODIR%%/data.php
%%MNEMODIR%%/index.php
-----End of mnemo.diff-----
-----Start of nag.diff-----
diff -urN nag.orig/Makefile nag/Makefile
--- nag.orig/Makefile Mon Apr 10 15:29:27 2006
+++ nag/Makefile Fri Apr 14 02:34:51 2006
@@ -31,7 +31,7 @@
PLIST_SUB= NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-SUB_FILES= pkg-message pkg-deinstall
+SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= NAGDIR=${NAGDIR}
REINPLACE_ARGS= -i ""
@@ -67,11 +67,7 @@
@${CP} -Rp ${WRKSRC}/${REP} ${NAGDIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${NAGDIR}
-.for FILE in ${CONFFILE}
- @if [ ! -f ${CONFDIR}/${FILE} ]; then \
- ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
- fi
-.endfor
+
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}
@@ -84,6 +80,7 @@
.endif
post-install:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff -urN nag.orig/files/pkg-deinstall.in nag/files/pkg-deinstall.in
--- nag.orig/files/pkg-deinstall.in Fri Jan 6 00:38:11 2006
+++ nag/files/pkg-deinstall.in Fri Apr 14 02:38:27 2006
@@ -12,13 +12,10 @@
for cf in `ls %%NAGDIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
- 0) # original config file, will be deleted by pkg-plist
+ 0) # original config file, delete it
+ rm -f $cf
;;
- 1) # config file has been updated, must be backuped
- cp -p $cf $cf.previous
- echo "===> Backing-up..."
- echo "---> $cf has been saved ***"
- echo "---> as $cf.previous ***"
+ 1) # config file has been updated, leave it alone
;;
*) # not found?
;;
diff -urN nag.orig/files/pkg-install.in nag/files/pkg-install.in
--- nag.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ nag/files/pkg-install.in Fri Apr 14 02:39:28 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+
+ POST-INSTALL)
+ if [ -z "${PACKAGE_BUILDING}" ]; then
+ # Copy over sample config files unless they already exist
+
+ for cf in `ls %%NAGDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
+ if [ ! -f $cf ]; then
+ cp -p $cf.dist $cf
+ fi
+ done
+ fi
+ ;;
+esac
diff -urN nag.orig/pkg-plist nag/pkg-plist
--- nag.orig/pkg-plist Sat Mar 18 15:40:26 2006
+++ nag/pkg-plist Fri Apr 14 02:35:05 2006
@@ -8,9 +8,7 @@
%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%NAGDIR%%/config/.htaccess
%%NAGDIR%%/config/conf.xml
-%%NAGDIR%%/config/menu.php
%%NAGDIR%%/config/menu.php.dist
-%%NAGDIR%%/config/prefs.php
%%NAGDIR%%/config/prefs.php.dist
%%NAGDIR%%/data.php
%%NAGDIR%%/ics.php
-----End of nag.diff-----
-----Start of turba.diff-----
diff -urN turba.orig/Makefile turba/Makefile
--- turba.orig/Makefile Mon Apr 10 15:31:21 2006
+++ turba/Makefile Fri Apr 14 02:23:05 2006
@@ -53,7 +53,7 @@
PLIST_SUB= TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-SUB_FILES= pkg-message pkg-deinstall
+SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= TURBADIR=${TURBADIR} CONFDIR=${CONFDIR}
TURBADIR= ${PREFIX}/${LTURBADIR}
@@ -90,11 +90,7 @@
@${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${TURBADIR}
-.for FILE in ${CONFFILE}
- @if [ ! -f ${CONFDIR}/${FILE} ]; then \
- ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
- fi
-.endfor
+
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
@@ -107,6 +103,7 @@
.endif
post-install:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff -urN turba.orig/files/pkg-deinstall.in turba/files/pkg-deinstall.in
--- turba.orig/files/pkg-deinstall.in Fri Jan 6 00:38:12 2006
+++ turba/files/pkg-deinstall.in Fri Apr 14 02:09:41 2006
@@ -12,13 +12,10 @@
for cf in `ls %%TURBADIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
- 0) # original config file, will be deleted by pkg-plist
+ 0) # original config file, delete it
+ rm -f $cf
;;
- 1) # config file has been updated, must be backuped
- cp -p $cf $cf.previous
- echo "===> Backing-up..."
- echo "---> $cf has been saved ***"
- echo "---> as $cf.previous ***"
+ 1) # config file has been updated, leave it alone
;;
*) # not found?
;;
diff -urN turba.orig/files/pkg-install.in turba/files/pkg-install.in
--- turba.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ turba/files/pkg-install.in Fri Apr 14 02:13:21 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+
+ POST-INSTALL)
+ if [ -z "${PACKAGE_BUILDING}" ]; then
+ # Copy over sample config files unless they already exist
+
+ for cf in `ls %%TURBADIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
+ if [ ! -f $cf ]; then
+ cp -p $cf.dist $cf
+ fi
+ done
+ fi
+ ;;
+esac
diff -urN turba.orig/pkg-plist turba/pkg-plist
--- turba.orig/pkg-plist Sat Mar 18 15:50:30 2006
+++ turba/pkg-plist Fri Apr 14 02:09:02 2006
@@ -10,16 +10,11 @@
%%TURBADIR%%/addressbooks.php
%%TURBADIR%%/browse.php
%%TURBADIR%%/config/.htaccess
-%%TURBADIR%%/config/attributes.php
%%TURBADIR%%/config/attributes.php.dist
%%TURBADIR%%/config/conf.xml
-%%TURBADIR%%/config/menu.php
%%TURBADIR%%/config/menu.php.dist
-%%TURBADIR%%/config/mime_drivers.php
%%TURBADIR%%/config/mime_drivers.php.dist
-%%TURBADIR%%/config/prefs.php
%%TURBADIR%%/config/prefs.php.dist
-%%TURBADIR%%/config/sources.php
%%TURBADIR%%/config/sources.php.dist
%%TURBADIR%%/data.php
%%TURBADIR%%/delete.php
-----End of turba.diff-----
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1144984708.4503>