5 files changed, 4 insertions, 75 deletions

diff --git a/mail/quickml/Makefile b/mail/quickml/Makefile
index c39a278b7906..1968447e587a 100644
--- a/mail/quickml/Makefile
+++ b/mail/quickml/Makefile
@@ -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 @@ OPTIONS+=	ANALOG "Enable quickml-analog" on \
 		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 @@ USE_AUTOTOOLS=	autoconf:262
 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}"
@@ -57,15 +57,11 @@ post-patch:
 .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 @@ post-install:
 	${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>
diff --git a/mail/quickml/files/quickml.sh b/mail/quickml/files/quickml.sh
index 3e1b6de452bf..e69de29bb2d1 100644
--- a/mail/quickml/files/quickml.sh
+++ b/mail/quickml/files/quickml.sh
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/mail/quickml/files/Attic/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"
diff --git a/mail/quickml/pkg-install b/mail/quickml/pkg-install
index 6c062cf6541d..e69de29bb2d1 100644
--- a/mail/quickml/pkg-install
+++ b/mail/quickml/pkg-install
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/mail/quickml/Attic/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
diff --git a/mail/quickml/pkg-message b/mail/quickml/pkg-message
index 4b8f873cfb2e..e69de29bb2d1 100644
--- a/mail/quickml/pkg-message
+++ b/mail/quickml/pkg-message
@@ -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
-----------------------------------------------------------------------
diff --git a/mail/quickml/pkg-plist b/mail/quickml/pkg-plist
index af0c6af1d49a..9bae35ddac1e 100644
--- a/mail/quickml/pkg-plist
+++ b/mail/quickml/pkg-plist
@@ -13,7 +13,6 @@ sbin/quickml
 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