Date: Sun, 8 Jan 2006 15:21:38 +0200 From: Ion-Mihai IOnut Tetcu <itetcu@gmail.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/91505: [PATCH] net/dictd: convert to USE_RC_SUBR=dictd.sh and small fixes Message-ID: <1136726498.36062@it.buh.cameradicommercio.ro> Resent-Message-ID: <200601081330.k08DU5XW071445@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 91505
>Category: ports
>Synopsis: [PATCH] net/dictd: convert to USE_RC_SUBR=dictd.sh and small fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 08 13:30:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 6.0-STABLE i386
>Organization:
Tecnik'93
>Environment:
System: FreeBSD 6.0-STABLE #10: Wed Jan 4 23:48:26 EET 200
>Description:
- USE_RC_SUBR= yes --> USE_RC_SUBR= ${PORTNAME}.sh
- move files/dictd.sh --> files/dictd.sh.in
- default to NO for dictd_enable
- Move pkg-message to files/pkg-message.in and print local path to net/dictd-database
>How-To-Repeat:
>Fix:
--- dictd.diff begins here ---
diff -urN dictd.cvs/Makefile dictd/Makefile
--- dictd.cvs/Makefile Sun Jan 8 01:49:38 2006
+++ dictd/Makefile Sun Jan 8 14:11:38 2006
@@ -19,7 +19,7 @@
MAN1= dictzip.1
MAN8= dictd.8
-USE_RC_SUBR= yes
+USE_RC_SUBR= ${PORTNAME}.sh
USE_REINPLACE= yes
USE_BISON= yes
USE_AUTOTOOLS= libtool:15
@@ -28,7 +28,8 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+SUB_FILES+= pkg-message
+SUB_LIST+= PORTSDIR=${PORTSDIR}
USE_GMAKE= yes
@@ -44,8 +45,7 @@
post-install:
@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/${PORTNAME}.conf > ${PREFIX}/etc/${PORTNAME}.conf.sample
@[ -f ${PREFIX}/etc/${PORTNAME}.conf ] || ${CP} ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf
- @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/${PORTNAME}.sh > ${PREFIX}/etc/rc.d/${PORTNAME}.sh
- @${CHMOD} +x ${PREFIX}/etc/rc.d/${PORTNAME}.sh
- @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${PKGMESSAGE}
+ #@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -urN dictd.cvs/distinfo dictd/distinfo
--- dictd.cvs/distinfo Mon Jan 2 19:31:35 2006
+++ dictd/distinfo Sun Jan 8 13:18:55 2006
@@ -1,2 +1,3 @@
MD5 (dictd-1.10.4.tar.gz) = 1c0b7583e6fa25fd27fca5fca9ddb91f
+SHA256 (dictd-1.10.4.tar.gz) = 8ba2be616099724b0f66f58c71b7cec3b3ec5691fd12b338405deace46713a11
SIZE (dictd-1.10.4.tar.gz) = 647901
diff -urN dictd.cvs/files/dictd.sh dictd/files/dictd.sh
--- dictd.cvs/files/dictd.sh Thu Sep 2 22:18:17 2004
+++ dictd/files/dictd.sh Thu Jan 1 02:00:00 1970
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/net/dictd/files/dictd.sh,v 1.5 2004/09/02 06:37:52 clive Exp $
-#
-# PROVIDE: dictd
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD
-#
-# Add the following line to /etc/rc.conf to enable dictd:
-#
-# dictd_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=dictd
-rcvar=`set_rcvar`
-command=%%PREFIX%%/sbin/dictd
-
-load_rc_config $name
-run_rc_command "$1"
diff -urN dictd.cvs/files/dictd.sh.in dictd/files/dictd.sh.in
--- dictd.cvs/files/dictd.sh.in Thu Jan 1 02:00:00 1970
+++ dictd/files/dictd.sh.in Sun Jan 8 15:18:31 2006
@@ -0,0 +1,21 @@
+#!/bin/sh
+# $FreeBSD: ports/net/dictd/files/dictd.sh,v 1.5 2004/09/02 06:37:52 clive Exp $
+#
+# PROVIDE: dictd
+# REQUIRE: DAEMON
+#
+# Add the following line to /etc/rc.conf[.local] to enable dictd:
+#
+# dictd_enable="YES"
+#
+
+dictd_enable=${dictd_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name=dictd
+rcvar=`set_rcvar`
+command=%%PREFIX%%/sbin/dictd
+
+load_rc_config $name
+run_rc_command "$1"
diff -urN dictd.cvs/files/pkg-message.in dictd/files/pkg-message.in
--- dictd.cvs/files/pkg-message.in Thu Jan 1 02:00:00 1970
+++ dictd/files/pkg-message.in Sun Jan 8 14:07:04 2006
@@ -0,0 +1,15 @@
+==================================================================
+
+This port installs the dict daemon but does not envoke dictd
+by default.
+
+To invoke dictd on startup, put the following in /etc/rc.conf:
+
+ dictd_enable="YES"
+
+The dict client can be found within %%PORTSDIR%%/textproc/dict
+
+Don't forget to install %%PORTSDIR%%/net/dictd-database
+to run a dictd server without pain.
+
+==================================================================
diff -urN dictd.cvs/pkg-message dictd/pkg-message
--- dictd.cvs/pkg-message Sun Sep 12 23:53:38 2004
+++ dictd/pkg-message Thu Jan 1 02:00:00 1970
@@ -1,15 +0,0 @@
-==================================================================
-
-This port installs the dict daemon but does not envoke dictd
-by default.
-
-To invoke dictd on startup, put the following in /etc/rc.conf:
-
- dictd_enable="YES"
-
-The dict client can be found within ports/textproc/dict.
-
-Don't forget to install ports/net/dictd-database to run
-a dictd server without pain.
-
-==================================================================
diff -urN dictd.cvs/pkg-plist dictd/pkg-plist
--- dictd.cvs/pkg-plist Mon Jan 2 19:31:35 2006
+++ dictd/pkg-plist Sun Jan 8 13:52:51 2006
@@ -3,4 +3,3 @@
@unexec if cmp -s %D/etc/dictd.conf %D/etc/dictd.conf.sample; then rm -f %D/etc/dictd.conf; fi
etc/dictd.conf.sample
@exec [ -f %B/dictd.conf ] || cp %B/%f %B/dictd.conf
-etc/rc.d/dictd.sh
--- dictd.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1136726498.36062>