diff options
| author | pat <pat@FreeBSD.org> | 2002-02-02 12:09:27 +0800 |
|---|---|---|
| committer | pat <pat@FreeBSD.org> | 2002-02-02 12:09:27 +0800 |
| commit | 5ff953cfed686ad255150963bcc2bebd4b389642 (patch) | |
| tree | ce0b8fe6aef75bf42a3e932e9afed8e88c77d73f /security | |
| parent | 771e9c50817511b68f1a06c0c1166c3428408e95 (diff) | |
| download | freebsd-ports-gnome-5ff953cfed686ad255150963bcc2bebd4b389642.tar.gz freebsd-ports-gnome-5ff953cfed686ad255150963bcc2bebd4b389642.tar.zst freebsd-ports-gnome-5ff953cfed686ad255150963bcc2bebd4b389642.zip | |
Fix plist and dont use -w flag with fmt on older releases.
PR: 34541
Submitted by: maintainer
Diffstat (limited to 'security')
| -rw-r--r-- | security/cyrus-sasl/Makefile | 13 | ||||
| -rw-r--r-- | security/cyrus-sasl/pkg-plist | 2 | ||||
| -rw-r--r-- | security/cyrus-sasl2/Makefile | 13 | ||||
| -rw-r--r-- | security/cyrus-sasl2/pkg-plist | 2 |
4 files changed, 20 insertions, 10 deletions
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 4e8d235a9e6e..adb455403062 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -68,7 +68,6 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ 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/ @@ -105,6 +104,14 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 450000 +FMT= /usr/bin/fmt +.else +FMT= /usr/bin/fmt -w 67 +.endif + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl @@ -129,7 +136,7 @@ post-patch: -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 +174,4 @@ post-clean: #include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" #endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/cyrus-sasl/pkg-plist b/security/cyrus-sasl/pkg-plist index 7e772335df14..7b8e18d814d4 100644 --- a/security/cyrus-sasl/pkg-plist +++ b/security/cyrus-sasl/pkg-plist @@ -85,8 +85,6 @@ sbin/pwcheck_pam %%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 diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 4e8d235a9e6e..adb455403062 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -68,7 +68,6 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ 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/ @@ -105,6 +104,14 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 450000 +FMT= /usr/bin/fmt +.else +FMT= /usr/bin/fmt -w 67 +.endif + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl @@ -129,7 +136,7 @@ post-patch: -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 +174,4 @@ post-clean: #include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" #endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist index 7e772335df14..7b8e18d814d4 100644 --- a/security/cyrus-sasl2/pkg-plist +++ b/security/cyrus-sasl2/pkg-plist @@ -85,8 +85,6 @@ sbin/pwcheck_pam %%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 |