Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 05 May 2002 14:42:06 +0900
From:      Jun Kuriyama <kuriyama@imgsrc.co.jp>
To:        khera@kciLink.com
Cc:        Ports Team <ports@FreeBSD.org>
Subject:   postfix non-official IPv6 patch and PKGNAMESUFFIX
Message-ID:  <7mit63ywup.wl@black.imgsrc.co.jp>

next in thread | raw e-mail | index | archive | help
--Multipart_Sun_May__5_14:42:06_2002-1
Content-Type: text/plain; charset=US-ASCII


How about this patch?

(1) New IPv6 patch which is based on KAME, but not KAME official.
(2) Add selected options to $PKGNAMESUFFIX to indicate which option
    selected.


-- 
Jun Kuriyama <kuriyama@imgsrc.co.jp> // IMG SRC, Inc.
             <kuriyama@FreeBSD.org> // FreeBSD Project

--Multipart_Sun_May__5_14:42:06_2002-1
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline; filename="postfix.diff.txt"
Content-Transfer-Encoding: 7bit

Index: scripts/configure.postfix
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/scripts/configure.postfix,v
retrieving revision 1.19
diff -u -r1.19 configure.postfix
--- scripts/configure.postfix	1 Apr 2002 18:01:27 -0000	1.19
+++ scripts/configure.postfix	28 Apr 2002 06:55:40 -0000
@@ -20,7 +20,7 @@
 OpenLDAP	"OpenLDAP map lookups" OFF \
 Test		"SMTP/LMTP test server and generator" OFF \
 TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support (CURRENTLY BROKEN)" OFF \
+IPv6		"IPv6 support (not KAME official)" OFF \
 2> $tempfile
 
 	retval=$?
@@ -55,12 +55,14 @@
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libpcre.a"
+			echo "PCRE_SUFFIX=	+pcre"
 			SUB_PCRE=""
 			;;
 		\"SASL\")
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+			echo "SASL_SUFFIX=	+sasl"
 			if [ -f ${PREFIX}/lib/libsasl.a ]; then 
 				if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
@@ -82,31 +84,32 @@
 			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz"
 			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
+			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
 			;;
 		\"DB3\")
 			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
+			echo "DB3_SUFFIX=	+db3"
 			;;
 		\"MySQL\")
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+			echo "MYSQL_SUFFIX=	+mysql"
 			;;
 		\"OpenLDAP\")
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+			echo "OPENLDAP_SUFFIX=	+openldap"
 			;;
 		\"Test\")
 			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
 		\"IPv6\")
-			/usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
 			if [ `uname -m` != "i386" ]; then
 				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
@@ -117,10 +120,10 @@
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "PATCH_SITES+=	ftp://ftp.kame.net/pub/kame/misc/"
-			echo "PATCH_SITES+=	\${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
-			echo "PATCHFILES+=	postfix-20010225snap-v6-20010228a.diff.gz"
+			echo "PATCH_SITES+=	http://www.cyber-magic.org/~taka/misc/"
+			echo "PATCHFILES+=	postfix-1.1.7+ipv6.patch.gz"
 			echo "PATCH_DIST_STRIP= -p1"
+			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
 			;;
 		*)
@@ -134,3 +137,4 @@
 
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
 echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
+echo "PKGNAMESUFFIX=	\${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"

--Multipart_Sun_May__5_14:42:06_2002-1--

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?7mit63ywup.wl>