Date: Fri, 1 Feb 2002 16:57:06 -0600 (CST) From: "Scot W. Hetzel" <hetzels@westbend.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/34541: security/cyrus-sasl: Fix build for 4.4-RELEASE Message-ID: <200202012257.g11Mv6024603@mail.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 34541
>Category: ports
>Synopsis: security/cyrus-sasl: Fix build for 4.4-RELEASE
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 01 15:00:05 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Scot W. Hetzel
>Release: FreeBSD 4.5-RC i386
>Organization:
West Bend Internet
>Environment:
System: FreeBSD wbiW009.westbend.net 4.5-RC FreeBSD 4.5-RC #0: Tue Jan 15 12:14:35 CST 2002 root@wbiW009.westbend.net:/usr/obj/usr/src/sys/GENERIC-SMP i386
>Description:
The port will fail in the post-patch stage on 4.4-RELEASE
and earlier, due to '-w' option specified to the 'fmt' program.
This option first appeared during the later 4.4-STABLE releases.
Correct pkg-plist to not remove share/java[/clases] as these
directories are included in BSD.local.dist.
>How-To-Repeat:
Build cyrus-sasl on a 4.4-RELEASE system
>Fix:
Changed files:
Makefile
pkg-plist
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 1 Feb 2002 22:33:03 -0000
@@ -27,6 +27,13 @@
MAINTAINER= hetzels@westbend.net
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 450000
+FMT= /usr/bin/fmt
+.else
+FMT= /usr/bin/fmt -w 67
+.endif
+
USE_OPENSSL= YES
INSTALLS_SHLIB= yes
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
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?200202012257.g11Mv6024603>