Date: Sun, 30 Jun 2002 00:17:08 +0200 (CEST) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/40018: net/nic: fix deinstallation + message about a missing PEAR module Message-ID: <20020629221708.5A38E7522@graf.pompo.net>
next in thread | raw e-mail | index | archive | help
>Number: 40018
>Category: ports
>Synopsis: net/nic: fix deinstallation + message about a missing PEAR module
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 29 15:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 4.6-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jun 16 15:14:29 CEST 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386
>Description:
1) This port has been committed with REINPLACE_CMD, but that
produces and installs an extra .bak file.
2) Fix deinstallation problem (like the other Horde's apps).
3) Since the initial submission, Net/Socket has been removed
from PEAR, and nic is broken (See PR ports/37649).
=> adding a post-install message about that before PR ports/37649's commit.
>How-To-Repeat:
1 & 2) make install / deinstall;
3) install and try "finger" => you'll get a message about Net/Socket missing.
>Fix:
Apply the following patch:
diff -urN /usr/ports/net/nic.orig/Makefile /usr/ports/net/nic/Makefile
--- /usr/ports/net/nic.orig/Makefile Sun Jun 23 14:01:24 2002
+++ /usr/ports/net/nic/Makefile Sat Jun 29 21:08:20 2002
@@ -18,8 +18,10 @@
USE_REINPLACE= yes
+REINPLACE_ARGS= -i.beforeNic
DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL
CONFFILE= conf.php html.php menu.php
+SUB_DIRS= config graphics lib templates
LHORDEDIR?= www/horde
LNICDIR?= ${LHORDEDIR}/nic
@@ -34,8 +36,9 @@
do-install:
@${MKDIR} ${NICDIR}
- @${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${NICDIR}
- @${CP} -Rp ${WRKSRC}/templates ${NICDIR}
+.for REP in ${SUB_DIRS}
+ @${CP} -Rp ${WRKSRC}/${REP} ${NICDIR}
+.endfor
@${CP} -p ${WRKSRC}/*.php ${NICDIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
@@ -47,8 +50,11 @@
@${CP} -p ${FILESDIR}/httpd.conf.nic ${HORDE_INC}
@${REINPLACE_CMD} -e "s:/home/httpd/html/horde/nic:${NICDIR}:g" \
${HORDE_INC}/httpd.conf.nic
+ @${RM} ${HORDE_INC}/httpd.conf.nic.beforeNic
@${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTNIC::" \
${HORDEDIR}/config/registry.php
+ @${CP} -p ${HORDEDIR}/config/registry.php \
+ ${HORDEDIR}/config/registry.php.afterNic
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff -urN /usr/ports/net/nic.orig/pkg-message /usr/ports/net/nic/pkg-message
--- /usr/ports/net/nic.orig/pkg-message Sun Dec 30 22:12:21 2001
+++ /usr/ports/net/nic/pkg-message Sat Jun 29 23:40:02 2002
@@ -7,4 +7,8 @@
%%CONFDIR%%/, specially the files conf.php.
To protect your configuration files, you have to restart Apache.
+
+N.B.: if you don't have a file /usr/local/lib/php/Net/Socket.php, you
+===== have to install it from
+ <URL:http://pear.php.net/get/Net_Socket-1.0.1.tgz>.
************************************************************************
diff -urN /usr/ports/net/nic.orig/pkg-plist /usr/ports/net/nic/pkg-plist
--- /usr/ports/net/nic.orig/pkg-plist Mon Dec 31 00:50:33 2001
+++ /usr/ports/net/nic/pkg-plist Sat Jun 29 21:04:03 2002
@@ -71,3 +71,4 @@
@dirrm %%NICDIR%%/templates
@dirrm %%NICDIR%%
%%PORTDOCS%%@dirrm share/doc/nic
+@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterNic; then rm -f %D/www/horde/config/registry.php.afterNic; mv %D/www/horde/config/registry.php.beforeNic %D/www/horde/config/registry.php; fi
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020629221708.5A38E7522>