ports/136841: [PATCH] mail/quickml: USE_RC_SUBR != yes
Philip M. Gollucci
pgollucci at FreeBSD.org
Fri Jul 17 07:20:04 UTC 2009
>Number: 136841
>Category: ports
>Synopsis: [PATCH] mail/quickml: USE_RC_SUBR != yes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 17 07:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 7.2-STABLE i386
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD freefall.freebsd.org 7.2-STABLE FreeBSD 7.2-STABLE #38 r194101: Sat Jun 13 11:12:24 UTC
>Description:
Added file(s):
- files/pkg-install.in
- files/pkg-message.in
- files/quickml.in
Removed file(s):
- pkg-install
- pkg-message
- files/quickml.sh
Port maintainer (yaizawa at 2004.jukuin.keio.ac.jp) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- quickml-0.7_6.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/quickml/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile 20 Aug 2008 00:56:57 -0000 1.12
+++ Makefile 17 Jul 2009 07:11:42 -0000
@@ -7,7 +7,7 @@
PORTNAME= quickml
PORTVERSION= 0.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= mail
MASTER_SITES= http://0xcc.net/quickml/
@@ -18,6 +18,7 @@
LIMIT "Enable Creators and Members Limitation Patch" off
PKGINSTALL= ${WRKDIR}/pkg-install
+SUB_FILES+= pkg-install
QUICKML_USER= quickml
QUICKML_GROUP= quickml
@@ -26,9 +27,8 @@
GNU_CONFIGURE= yes
USE_RUBY= yes
-USE_RC_SUBR= yes
-FILES_SUB= USER=${QUICKML_USER} GROUP=${QUICKML_GROUP} \
- PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} RUBY=${RUBY}
+USE_RC_SUBR= ${PORTNAME}
+SUB_LIST+= USER=${QUICKML_USER} GROUP=${QUICKML_GROUP} RUBY=${RUBY}
CONFIGURE_ARGS+= --datadir="${PREFIX}/share/quickml"
CONFIGURE_ARGS+= --with-ruby="${RUBY}"
@@ -43,9 +43,9 @@
.endif
.if !defined(WITHOUT_ANALOG)
-USE_GHOSTSCRIPT_RUN= yes
-RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot \
- convert:${PORTSDIR}/graphics/ImageMagick
+#USE_GHOSTSCRIPT_RUN= yes
+#RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot \
+# convert:${PORTSDIR}/graphics/ImageMagick
.endif
post-fetch:
@@ -57,15 +57,11 @@
.if !defined(WITHOUT_LIMIT)
@${PATCH} ${PATCH_DIST_ARGS} < ${DISTDIR}/${PORTNAME}-${PORTVERSION}-limited.patch
.endif
- @${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${FILESDIR}/quickml.sh > ${WRKDIR}/quickml.sh
.if defined(WITHOUT_ANALOG)
${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/without_quickml-analog
.endif
pre-install:
- @${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${PKGDIR}/pkg-install > ${PKGINSTALL}
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
@@ -79,10 +75,5 @@
${INSTALL_DATA} ${FILESDIR}/with-mta.en.rd ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/with-mta.ja.rd ${DOCSDIR}
.endif
-.if !exists(${PREFIX}/etc/rc.d/quickml.sh)
- @${ECHO} "Installing ${PREFIX}/etc/rc.d/quickml.sh startup file."
- ${INSTALL_SCRIPT} -m 751 ${WRKDIR}/quickml.sh ${PREFIX}/etc/rc.d/quickml.sh
-.endif
- @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%DOCSDIR%%|${DOCSDIR}|g' ${PKGMESSAGE}
.include <bsd.port.post.mk>
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- pkg-install 5 Jul 2004 17:20:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/mail/quickml/pkg-install,v 1.1 2004/07/05 17:20:17 pav Exp $
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-
-PRE-INSTALL)
- echo "---> Starting pre-install script:"
-
- if pw showgroup "%%GROUP%%" 2>/dev/null; then
- echo "---> Using existing group \"%%GROUP%%\""
- else
- echo "---> Adding group \"%%GROUP%%\""
- pw addgroup %%GROUP%% -g 109 -h - || exit 1
- fi
-
- # Create user if required
- if pw showuser "%%USER%%" 2>/dev/null; then
- echo "---> Using existing user \"%%USER%%\""
- else
- echo "---> Adding user \"%%USER%%\""
- pw adduser %%USER%% -u 109 -g %%GROUP%% -h - \
- -d "/nonexistent" -s "/sbin/nologin" -c "quickml Server" || exit 1
- fi
-
- ;;
-
-esac
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 5 Jul 2004 17:20:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-----------------------------------------------------------------------
-Installation of QuickML is finished. QuickML works as a SMTP server.
-The default configuration let QuickML hold tcp/25, so if you are using
-the host as a SMTP server you must change settings.
-
-You can change port for QuickML in %%PREFIX%%/etc/quickmlrc like:
- :port => 10025,
-
-Please see also :
- %%DOCSDIR%%/with-mta.en.rd
- %%DOCSDIR%%/with-mta.ja.rd
-----------------------------------------------------------------------
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/mail/quickml/pkg-plist,v
retrieving revision 1.2
diff -u -u -r1.2 pkg-plist
--- pkg-plist 11 Oct 2004 23:02:00 -0000 1.2
+++ pkg-plist 17 Jul 2009 07:11:42 -0000
@@ -13,7 +13,6 @@
sbin/quickml-ctl
@unexec if cmp -s %D/etc/quickmlrc %D/etc/quickmlrc.sample; then rm -f %D/etc/quickmlrc; fi
etc/quickmlrc.sample
-etc/rc.d/quickml.sh
%%DATADIR%%/messages.ja
@dirrm %%DATADIR%%
@dirrm %%RUBY_LIBDIR%%/quickml
Index: files/pkg-install.in
===================================================================
RCS file: files/pkg-install.in
diff -N files/pkg-install.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-install.in 17 Jul 2009 07:11:42 -0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/mail/quickml/pkg-install,v 1.1 2004/07/05 17:20:17 pav Exp $
+#
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+case $2 in
+
+PRE-INSTALL)
+ echo "---> Starting pre-install script:"
+
+ if pw showgroup "%%GROUP%%" 2>/dev/null; then
+ echo "---> Using existing group \"%%GROUP%%\""
+ else
+ echo "---> Adding group \"%%GROUP%%\""
+ pw addgroup %%GROUP%% -g 109 -h - || exit 1
+ fi
+
+ # Create user if required
+ if pw showuser "%%USER%%" 2>/dev/null; then
+ echo "---> Using existing user \"%%USER%%\""
+ else
+ echo "---> Adding user \"%%USER%%\""
+ pw adduser %%USER%% -u 109 -g %%GROUP%% -h - \
+ -d "/nonexistent" -s "/sbin/nologin" -c "quickml Server" || exit 1
+ fi
+
+ ;;
+
+esac
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in 17 Jul 2009 07:11:42 -0000
@@ -0,0 +1,12 @@
+----------------------------------------------------------------------
+Installation of QuickML is finished. QuickML works as a SMTP server.
+The default configuration let QuickML hold tcp/25, so if you are using
+the host as a SMTP server you must change settings.
+
+You can change port for QuickML in %%PREFIX%%/etc/quickmlrc like:
+ :port => 10025,
+
+Please see also :
+ %%DOCSDIR%%/with-mta.en.rd
+ %%DOCSDIR%%/with-mta.ja.rd
+----------------------------------------------------------------------
Index: files/quickml.in
===================================================================
RCS file: files/quickml.in
diff -N files/quickml.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/quickml.in 17 Jul 2009 07:11:42 -0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/mail/quickml/files/quickml.sh,v 1.1 2004/07/05 17:20:17 pav Exp $
+#
+
+. %%RC_SUBR%%
+
+name="quickml"
+rcvar=`set_rcvar`
+
+command="%%RUBY%%"
+command_args="%%PREFIX%%/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files=%%PREFIX%%/etc/quickmlrc
+
+load_rc_config $name
+
+run_rc_command "$1"
Index: files/quickml.sh
===================================================================
RCS file: files/quickml.sh
diff -N files/quickml.sh
--- files/quickml.sh 5 Jul 2004 17:20:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/mail/quickml/files/quickml.sh,v 1.1 2004/07/05 17:20:17 pav Exp $
-#
-
-. %%RC_SUBR%%
-
-name="quickml"
-rcvar=`set_rcvar`
-
-command="%%RUBY%%"
-command_args="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files=%%PREFIX%%/etc/quickmlrc
-
-load_rc_config $name
-
-run_rc_command "$1"
--- quickml-0.7_6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list