Date: Fri, 1 Feb 2002 20:40:05 -0800 (PST) From: "Scot W. Hetzel" <hetzels@westbend.net> To: freebsd-ports@FreeBSD.org Subject: Re: ports/34541: security/cyrus-sasl: Fix build for 4.4-RELEASE Message-ID: <200202020440.g124e5a96989@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/34541; it has been noted by GNATS. From: "Scot W. Hetzel" <hetzels@westbend.net> To: "FreeBSD-gnats-submit@FreeBSD.ORG" <FreeBSD-gnats-submit@FreeBSD.ORG> Cc: Subject: Re: ports/34541: security/cyrus-sasl: Fix build for 4.4-RELEASE Date: Fri, 1 Feb 2002 22:31:12 -0600 (CST) Use this patch instead, as the previous patch fails due to USE_OPENSSL isn't defined before bsd.port.pre.mk Scot Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- Makefile 29 Jan 2002 11:58:39 -0000 1.36 +++ Makefile 2 Feb 2002 03:54:57 -0000 @@ -44,6 +44,13 @@ sasl_setprop.3 sasl_usererr.3 MAN8= sasldblistusers.8 saslpasswd.8 +.include <bsd.port.pre.mk> +.if ${OSVERSION} < 450000 +FMT= /usr/bin/fmt +.else +FMT= /usr/bin/fmt -w 67 +.endif + USE_AUTOMAKE_VER=14 USE_LIBTOOL= YES AUTOMAKE_ARGS= --add-missing --include-deps @@ -68,7 +75,6 @@ WITH_LDAP1="${WITH_LDAP1}" \ WITH_LDAP2="${WITH_LDAP2}" -# JavaSASL needs someone to look at to get it to build JAVADIR= jdk1.3.1 JAVALIBDIR= ${PREFIX}/${JAVADIR}/lib/i386/green_threads/ @@ -129,7 +135,7 @@ -e "s;%%PREFIX%%;${PREFIX};g" \ ${.CURDIR}/pkg-message > ${PKGMESSAGE} .ifdef LDAP_MYSQL_MSG - @${ECHO_CMD} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE} + @${ECHO_CMD} ${LDAP_MYSQL_MSG} | ${FMT} >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} .endif @@ -167,4 +173,4 @@ #include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" #endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/pkg-plist,v retrieving revision 1.13 diff -u -r1.13 pkg-plist --- pkg-plist 20 Jan 2002 19:23:17 -0000 1.13 +++ pkg-plist 31 Jan 2002 22:47:24 -0000 @@ -85,8 +85,6 @@ %%JAVASASL%%@dirrm share/java/classes/sasl/javax %%JAVASASL%%@dirrm share/java/classes/sasl/CyrusSasl %%JAVASASL%%@dirrm share/java/classes/sasl -%%JAVASASL%%@unexec rmdir %D/share/java/classes || true -%%JAVASASL%%@unexec rmdir %D/share/java || true @dirrm lib/sasl @cwd /var @exec install -d -m 770 -o cyrus -g cyrus %D/pwcheck 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?200202020440.g124e5a96989>