From owner-ports-jp@jp.FreeBSD.org Thu Aug 19 01:29:16 2004
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id i7IGTGQ44192;
	Thu, 19 Aug 2004 01:29:16 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from nm01omta02f.dion.ne.jp (sns01-41-51.dion.ne.jp [61.117.3.75])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with SMTP/inet id i7IGTF844179
	for <ports-jp@jp.FreeBSD.org>; Thu, 19 Aug 2004 01:29:15 +0900 (JST)
	(envelope-from info@otsune.com)
Received: from [127.0.0.1] (unknown[221.119.122.223])
	by nm01mta02e.dion.ne.jp;
	Thu, 19 Aug 2004 01:29:15 +0900
Message-ID: <412383DB.7000802@otsune.com>
From: Masafumi Otsune <info@otsune.com>
User-Agent: Mozilla Thunderbird 0.7.2 (Windows/20040707)
X-Accept-Language: ja, en-us, en
MIME-Version: 1.0
To: ports-jp@jp.FreeBSD.org
References: <40DB71D8.4080506@otsune.com> <86wu0nms49.fsf@elephant.netsystems.co.jp>
In-Reply-To: <86wu0nms49.fsf@elephant.netsystems.co.jp>
Content-Type: text/plain; charset=Shift_JIS
Content-Transfer-Encoding: 8bit
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
Date: Thu, 19 Aug 2004 01:29:15 +0900
X-Sequence: ports-jp 14950
Subject: [ports-jp 14950] Re: New ports: netqmail
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: info@otsune.com
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+040816

otsunełB

YamagaminetqmailportsOPTIONSǉ肵̂diffƂ܂B
.include <bsd.port.pre.mk>WITH_TLSUSE_OPENSSL=yesB
${PREFIX}/etc/rc.d/qmail.shqmail.sh.sampleɂ܂B
portlintFATALoƂ͂ŏ܂AׂĂKNOBł̓`FbNłĂ܂B

diff -u netqmail.orig/Makefile netqmail/Makefile
--- netqmail.orig/Makefile	Tue Jul 27 18:16:45 2004
+++ netqmail/Makefile	Tue Aug 17 23:30:44 2004
@@ -25,6 +25,18 @@
 		qmail-tls \
 		qmail-smtp_auth+tls

+OPTIONS=	DATE_LOCALTIME_PATCH "Localtime patch support" off \
+		TLS "TLS support" off \
+		SMTPAUTH "SMTPAuth support" off \
+		QMTP "Quick Mail Transfer Protocol support" off \
+		IPV6 "IPv6 support" off \
+		THROTTLE "spam throttle patch support" off \
+		BADHELO "bad HELO patch support" off \
+		BADRCPTTO "bad RCPT TO patch support" off \
+		REJECT_PERCENT "reject percent patch support" off
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_DATE_LOCALTIME_PATCH)
 PATCHFILES+=	qmail-date-localtime.patch:localtime
 PATCH_DIST_STRIP+=	-p1
@@ -167,7 +179,8 @@
 .endif

 .if defined(WITH_TLS)
-USE_OPENSSL=	YES
+# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS
 .if defined(WITH_TLS_DEBUG)
 CFLAGS+=	-DDEBUG
@@ -295,21 +308,6 @@
 NO_MTREE=	yes
 USE_PERL5_BUILD=yes

-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "============================================================================="
-	@${ECHO_MSG} "WITH_DATE_LOCALTIME_PATCH Enable Localtime patch support"
-	@${ECHO_MSG} "WITH_TLS                  Enable TLS support"
-	@${ECHO_MSG} "WITH_SMTPAUTH             Enable SMTPAUTH support"
-	@${ECHO_MSG} "WITH_QMTP                 Enable QMTP support"
-	@${ECHO_MSG} "WITH_IPV6                 Enable IPv6 support"
-	@${ECHO_MSG} "WITH_THROTTLE             Enable throttle patch support"
-	@${ECHO_MSG} "WITH_BADHELO              Enable bad HELO patch support"
-	@${ECHO_MSG} "WITH_BADRCPTTO            Enable bad RCPT TO patch support"
-	@${ECHO_MSG} "WITH_REJECT_PERCENT       Enable reject percent patch support"
-	@${ECHO_MSG} "============================================================================="
-	@${ECHO_MSG}
-
 post-extract:
 	@cd ${WRKSRC} ; ${SH} collate.sh

@@ -384,12 +382,10 @@
 	${INSTALL_SCRIPT} ${FILESDIR}/mkaliasdir ${PREFIX}/${DOCDIR}
 	@cd ${PREFIX}/configure ; ./config
 	@${MKDIR} ${LOCALBASE}/etc/rc.d
-	@${LN} -sf ${PREFIX}/rc ${LOCALBASE}/etc/rc.d/qmail.sh
+	@${LN} -sf ${PREFIX}/rc ${LOCALBASE}/etc/rc.d/qmail.sh.sample
 	@${ECHO}
 	@${SED} s!/var/qmail!${PREFIX}!g ${PKGMESSAGE} | ${FMT}

-.include <bsd.port.mk>
-
 #
 #
 #
@@ -550,3 +546,4 @@
 	fi
 .endif

+.include <bsd.port.post.mk>

