diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/cyrus-sasl/Makefile | 21 | ||||
-rw-r--r-- | security/cyrus-sasl/distinfo | 1 | ||||
-rw-r--r-- | security/cyrus-sasl/pkg-plist | 42 | ||||
-rw-r--r-- | security/cyrus-sasl/scripts/configure.sasl | 3 | ||||
-rw-r--r-- | security/cyrus-sasl2/Makefile | 21 | ||||
-rw-r--r-- | security/cyrus-sasl2/distinfo | 1 | ||||
-rw-r--r-- | security/cyrus-sasl2/pkg-plist | 42 | ||||
-rw-r--r-- | security/cyrus-sasl2/scripts/configure.sasl | 3 |
8 files changed, 66 insertions, 68 deletions
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 79a6c0c20e0d..6c55ae2e3a57 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -7,13 +7,16 @@ PORTNAME= cyrus-sasl PORTVERSION= 1.5.24 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_LOCAL} \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail +PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/ +PATCHFILES= ${DISTNAME}-ipv6-20010321.diff.gz + MAINTAINER= hetzels@westbend.net USE_OPENSSL= YES @@ -98,14 +101,10 @@ DOC2= draft-leach-digest-sasl-05.txt \ HTDOCS= gssapi index programming sysadmin -.if defined(NOPORTDOCS) -NODOCS= "@comment " -.endif - PLIST_SUB= PREFIX=${PREFIX} \ GSSAPI=${GSSAPI} \ EBONES=${EBONES} \ - NOPORTDOCS=${NODOCS} + DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \ pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl @@ -123,16 +122,16 @@ post-install: @${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh ${INSTALL} -d -m 770 -o cyrus -g cyrus /var/pwcheck .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/SASL/html + @${MKDIR} ${DOCSDIR}/html .for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SASL + @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .for file in ${DOC2} - @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/SASL + @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} .endfor - @${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${PREFIX}/share/doc/SASL + @${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR} .for file in ${HTDOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html + @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} .endfor .endif @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo index c21d945c6267..1b1e11d6810f 100644 --- a/security/cyrus-sasl/distinfo +++ b/security/cyrus-sasl/distinfo @@ -1 +1,2 @@ MD5 (cyrus-sasl-1.5.24.tar.gz) = ac3837c071c258b80021325936db2583 +MD5 (cyrus-sasl-1.5.24-ipv6-20010321.diff.gz) = a306953c91d9fbf2f4676ef394b38449 diff --git a/security/cyrus-sasl/pkg-plist b/security/cyrus-sasl/pkg-plist index cb928679b1cb..8eeb026c7fee 100644 --- a/security/cyrus-sasl/pkg-plist +++ b/security/cyrus-sasl/pkg-plist @@ -34,27 +34,27 @@ lib/sasl/libplain.so.1 sbin/sasldblistusers sbin/saslpasswd sbin/pwcheck -%%NOPORTDOCS%%share/doc/SASL/AUTHORS -%%NOPORTDOCS%%share/doc/SASL/COPYING -%%NOPORTDOCS%%share/doc/SASL/ChangeLog -%%NOPORTDOCS%%share/doc/SASL/INSTALL -%%NOPORTDOCS%%share/doc/SASL/NEWS -%%NOPORTDOCS%%share/doc/SASL/README -%%NOPORTDOCS%%share/doc/SASL/Sendmail.README -%%NOPORTDOCS%%share/doc/SASL/TODO -%%NOPORTDOCS%%share/doc/SASL/draft-leach-digest-sasl-05.txt -%%NOPORTDOCS%%share/doc/SASL/draft-newman-auth-scram-03.txt -%%NOPORTDOCS%%share/doc/SASL/rfc1321.txt -%%NOPORTDOCS%%share/doc/SASL/rfc2095.txt -%%NOPORTDOCS%%share/doc/SASL/rfc2104.txt -%%NOPORTDOCS%%share/doc/SASL/rfc2222.txt -%%NOPORTDOCS%%share/doc/SASL/rfc2245.txt -%%NOPORTDOCS%%share/doc/SASL/html/gssapi.html -%%NOPORTDOCS%%share/doc/SASL/html/index.html -%%NOPORTDOCS%%share/doc/SASL/html/programming.html -%%NOPORTDOCS%%share/doc/SASL/html/sysadmin.html -%%NOPORTDOCS%%@dirrm share/doc/SASL/html -%%NOPORTDOCS%%@dirrm share/doc/SASL +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/Sendmail.README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/draft-leach-digest-sasl-05.txt +%%PORTDOCS%%%%DOCSDIR%%/draft-newman-auth-scram-03.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc2095.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc2222.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc2245.txt +%%PORTDOCS%%%%DOCSDIR%%/gssapi.html +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/programming.html +%%PORTDOCS%%%%DOCSDIR%%/sysadmin.html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/sasl @mode ug=rwx,o= @cwd /var diff --git a/security/cyrus-sasl/scripts/configure.sasl b/security/cyrus-sasl/scripts/configure.sasl index befc7fa6ea45..9af2b47675df 100644 --- a/security/cyrus-sasl/scripts/configure.sasl +++ b/security/cyrus-sasl/scripts/configure.sasl @@ -21,8 +21,7 @@ if [ "${BATCH}" ]; then set ${OPTIONS} fi else - - if [ "x${ENABLE_DB3}" = "xYES" -o -f ${PREFIX}/lib/libdb3.so.1 ] ; then + if [ "x${ENABLE_DB3}" = "xYES" -o -f ${PREFIX}/lib/libdb3.so ] ; then SET_DB3="ON" else SET_DB3="OFF" diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 79a6c0c20e0d..6c55ae2e3a57 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -7,13 +7,16 @@ PORTNAME= cyrus-sasl PORTVERSION= 1.5.24 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_LOCAL} \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail +PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/ +PATCHFILES= ${DISTNAME}-ipv6-20010321.diff.gz + MAINTAINER= hetzels@westbend.net USE_OPENSSL= YES @@ -98,14 +101,10 @@ DOC2= draft-leach-digest-sasl-05.txt \ HTDOCS= gssapi index programming sysadmin -.if defined(NOPORTDOCS) -NODOCS= "@comment " -.endif - PLIST_SUB= PREFIX=${PREFIX} \ GSSAPI=${GSSAPI} \ EBONES=${EBONES} \ - NOPORTDOCS=${NODOCS} + DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \ pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl @@ -123,16 +122,16 @@ post-install: @${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh ${INSTALL} -d -m 770 -o cyrus -g cyrus /var/pwcheck .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/SASL/html + @${MKDIR} ${DOCSDIR}/html .for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SASL + @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .for file in ${DOC2} - @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/SASL + @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} .endfor - @${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${PREFIX}/share/doc/SASL + @${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR} .for file in ${HTDOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html + @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} .endfor .endif @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo index c21d945c6267..1b1e11d6810f 100644 --- a/security/cyrus-sasl2/distinfo +++ b/security/cyrus-sasl2/distinfo @@ -1 +1,2 @@ MD5 (cyrus-sasl-1.5.24.tar.gz) = ac3837c071c258b80021325936db2583 +MD5 (cyrus-sasl-1.5.24-ipv6-20010321.diff.gz) = a306953c91d9fbf2f4676ef394b38449 diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist index cb928679b1cb..8eeb026c7fee 100644 --- a/security/cyrus-sasl2/pkg-plist +++ b/security/cyrus-sasl2/pkg-plist @@ -34,27 +34,27 @@ lib/sasl/libplain.so.1 sbin/sasldblistusers sbin/saslpasswd sbin/pwcheck -%%NOPORTDOCS%%share/doc/SASL/AUTHORS -%%NOPORTDOCS%%share/doc/SASL/COPYING -%%NOPORTDOCS%%share/doc/SASL/ChangeLog -%%NOPORTDOCS%%share/doc/SASL/INSTALL -%%NOPORTDOCS%%share/doc/SASL/NEWS -%%NOPORTDOCS%%share/doc/SASL/README -%%NOPORTDOCS%%share/doc/SASL/Sendmail.README -%%NOPORTDOCS%%share/doc/SASL/TODO -%%NOPORTDOCS%%share/doc/SASL/draft-leach-digest-sasl-05.txt -%%NOPORTDOCS%%share/doc/SASL/draft-newman-auth-scram-03.txt -%%NOPORTDOCS%%share/doc/SASL/rfc1321.txt -%%NOPORTDOCS%%share/doc/SASL/rfc2095.txt -%%NOPORTDOCS%%share/doc/SASL/rfc2104.txt -%%NOPORTDOCS%%share/doc/SASL/rfc2222.txt -%%NOPORTDOCS%%share/doc/SASL/rfc2245.txt -%%NOPORTDOCS%%share/doc/SASL/html/gssapi.html -%%NOPORTDOCS%%share/doc/SASL/html/index.html -%%NOPORTDOCS%%share/doc/SASL/html/programming.html -%%NOPORTDOCS%%share/doc/SASL/html/sysadmin.html -%%NOPORTDOCS%%@dirrm share/doc/SASL/html -%%NOPORTDOCS%%@dirrm share/doc/SASL +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/Sendmail.README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/draft-leach-digest-sasl-05.txt +%%PORTDOCS%%%%DOCSDIR%%/draft-newman-auth-scram-03.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc2095.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc2222.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc2245.txt +%%PORTDOCS%%%%DOCSDIR%%/gssapi.html +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/programming.html +%%PORTDOCS%%%%DOCSDIR%%/sysadmin.html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/sasl @mode ug=rwx,o= @cwd /var diff --git a/security/cyrus-sasl2/scripts/configure.sasl b/security/cyrus-sasl2/scripts/configure.sasl index befc7fa6ea45..9af2b47675df 100644 --- a/security/cyrus-sasl2/scripts/configure.sasl +++ b/security/cyrus-sasl2/scripts/configure.sasl @@ -21,8 +21,7 @@ if [ "${BATCH}" ]; then set ${OPTIONS} fi else - - if [ "x${ENABLE_DB3}" = "xYES" -o -f ${PREFIX}/lib/libdb3.so.1 ] ; then + if [ "x${ENABLE_DB3}" = "xYES" -o -f ${PREFIX}/lib/libdb3.so ] ; then SET_DB3="ON" else SET_DB3="OFF" |