cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not run mandoc(1) at build time.

Browse Source 
Just install the mdoc(7) source code of the saslauthd(8) manual.
Also regenerate patch-saslauthd_configure.
Bump.

ok ajacoutot@
This commit is contained in:
schwarze 2013-10-31 19:42:45 +00:00
parent c3c5794b62
commit 92d95bf55d
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/cyrus-sasl2/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.80 2013/10/30 15:06:46 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.81 2013/10/31 19:42:45 schwarze Exp $
COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)
DISTNAME= cyrus-sasl-2.1.26
REVISION= 9
REVISION= 10
SHARED_LIBS += sasl2 3.0 # 3.0
@ -110,14 +110,12 @@ pre-configure:
${WRKSRC}/saslauthd/saslauthd.mdoc \
${WRKSRC}/saslauthd/LDAP_SASLAUTHD
perl -pi -e 's,-lresolv,,g' ${WRKSRC}/{,saslauthd}/configure
perl -pi -e 's,nroff,mandoc,g' ${WRKSRC}/saslauthd/Makefile.in
post-install:
rm ${PREFIX}/lib/sasl2/*.a
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cyrus-sasl
${INSTALL_DATA} ${WRKSRC}/doc/{*.html,*.txt} ${PREFIX}/share/doc/cyrus-sasl
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cyrus-sasl
mv ${PREFIX}/man/man8/saslauthd.8 ${PREFIX}/man/cat8/saslauthd.0
.if ${FLAVOR:Mmysql} || ${FLAVOR:Mpgsql} || ${FLAVOR:Msqlite3}
${INSTALL_DATA} ${FILESDIR}/Sendmail.conf-sql \
${PREFIX}/share/examples/cyrus-sasl

22
security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-saslauthd_Makefile_in,v 1.13 2013/10/31 19:42:45 schwarze Exp $
Remove hand-rolled formatting, just install mdoc(7) source manual.
--- saslauthd/Makefile.in.orig Tue Nov 6 20:21:45 2012
+++ saslauthd/Makefile.in Thu Oct 31 02:59:28 2013
@@ -714,15 +714,9 @@ uninstall-am: uninstall-sbinPROGRAMS
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-sbinPROGRAMS
-
-dist-hook: saslauthd.8
-
-saslauthd.8: saslauthd.mdoc
- nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
-
-install-data-local: saslauthd.8
+install-data-local:
$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
+ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

6
security/cyrus-sasl2/patches/patch-saslauthd_configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-saslauthd_configure,v 1.17 2013/06/17 19:31:09 ajacoutot Exp $
$OpenBSD: patch-saslauthd_configure,v 1.18 2013/10/31 19:42:45 schwarze Exp $
--- saslauthd/configure.orig Tue Nov 6 20:21:44 2012
+++ saslauthd/configure Tue Nov 20 07:59:02 2012
@@ -11717,7 +11720,7 @@ fi
+++ saslauthd/configure Thu Oct 31 02:48:18 2013
@@ -11717,7 +11717,7 @@ fi

4
security/cyrus-sasl2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.28 2013/10/30 15:06:47 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.29 2013/10/31 19:42:45 schwarze Exp $
@conflict cyrus-sasl-*
@extraunexec rm -rf /var/sasl2/*
include/sasl/
@ -14,7 +14,6 @@ lib/libsasl2.la
@lib lib/libsasl2.so.${LIBsasl2_VERSION}
lib/pkgconfig/
lib/pkgconfig/libsasl2.pc
@man man/cat8/saslauthd.0
@man man/man3/sasl.3
@man man/man3/sasl_authorize_t.3
@man man/man3/sasl_auxprop.3
@ -59,6 +58,7 @@ lib/pkgconfig/libsasl2.pc
@man man/man3/sasl_user_exists.3
@man man/man3/sasl_verifyfile_t.3
@man man/man8/pluginviewer.8
@man man/man8/saslauthd.8
@man man/man8/sasldblistusers2.8
@man man/man8/saslpasswd2.8
@bin sbin/pluginviewer