mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-25 21:07:40 +00:00
Code Issues Releases Activity

Fix plist and dont use -w flag with fmt on older releases.

Browse Source 
PR:		34541
Submitted by:	maintainer
This commit is contained in:
Patrick Li 2002-02-02 04:09:27 +00:00
parent 3bcd0572c1
commit af571993d8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=54119
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
security/cyrus-sasl/Makefile
View File

@ -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>

2
security/cyrus-sasl/pkg-plist
View File

@ -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

13
security/cyrus-sasl2/Makefile
View File

@ -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>

2
security/cyrus-sasl2/pkg-plist
View File

@ -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