diff options
author | Cy Schubert <cy@FreeBSD.org> | 2015-02-05 03:39:14 +0000 |
---|---|---|
committer | Cy Schubert <cy@FreeBSD.org> | 2015-02-05 03:39:14 +0000 |
commit | b896d782ddb95a64e02c2ef992e7b0e55c256af7 (patch) | |
tree | c6cb353b7057ee5ed1b55fea1c0d466a96501dee /security/krb5 | |
parent | 64f02c86a0a2fed8e73c9ace7b2dfe0277458c1e (diff) | |
download | ports-b896d782ddb95a64e02c2ef992e7b0e55c256af7.tar.gz ports-b896d782ddb95a64e02c2ef992e7b0e55c256af7.zip |
Correct various packaging issues:
- Libraries are not installed stripped;
- pkgconfig files should be installed to libdata;
- Use of deprecated @dirrm[try]
PR: PR/197338
Submitted by: delphij
Notes
Notes:
svn path=/head/; revision=378441
Diffstat (limited to 'security/krb5')
-rw-r--r-- | security/krb5/Makefile | 16 | ||||
-rw-r--r-- | security/krb5/files/patch-config__pre.in | 20 | ||||
-rw-r--r-- | security/krb5/pkg-plist | 39 |
3 files changed, 36 insertions, 39 deletions
diff --git a/security/krb5/Makefile b/security/krb5/Makefile index 5d19e3ffd7e9..d3ffd759494d 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -8,10 +8,10 @@ CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-signed EXTRACT_SUFX= .tar -PATCHFILES= 2015-001-patch-r113.txt PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 +PATCHFILES= 2015-001-patch-r113.txt MAINTAINER= cy@FreeBSD.org COMMENT= Authentication system developed at MIT, successor to Kerberos IV @@ -29,8 +29,8 @@ USE_CSTD= gnu99 GNU_CONFIGURE= yes USES= gettext gmake perl5 libtool:build CONFIGURE_ARGS?= --enable-shared --without-system-verto -CONFIGURE_ENV= INSTALL="${INSTALL}" YACC="${YACC}" -MAKE_ARGS= INSTALL="${INSTALL}" +CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" +MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP READLINE OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML @@ -71,8 +71,8 @@ PLIST_SUB+= LDAP="@comment " .if ${PORT_OPTIONS:MREADLINE} .if ${OSVERSION} >= 1100000 # libtool has some gas with libreadline in 11-CURRENT. -BUILD_DEPENDS+= ${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline -LIB_DEPENDS+= ${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline +BUILD_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline +LIB_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline .else USES+= readline:port .endif @@ -123,15 +123,15 @@ post-install: .endif .if ${PORT_OPTIONS:MKRB5_PDF} for i in $${pdf_dirs}; do \ - ${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \ + ${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \ done | ${TAIL} -r >> ${TMPPLIST} .endif .if ${PORT_OPTIONS:MKRB5_HTML} for i in $${html_dirs}; do \ - ${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \ + ${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \ done | ${TAIL} -r >> ${TMPPLIST} .endif - ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST} + ${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST} @${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD @${CHMOD} 444 ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD @${ECHO} "------------------------------------------------------" diff --git a/security/krb5/files/patch-config__pre.in b/security/krb5/files/patch-config__pre.in index bdd183e98ad4..8527c550dc25 100644 --- a/security/krb5/files/patch-config__pre.in +++ b/security/krb5/files/patch-config__pre.in @@ -1,11 +1,23 @@ ---- config/pre.in.orig Fri Nov 19 13:47:51 2004 -+++ config/pre.in Thu Jan 27 17:43:12 2005 -@@ -177,7 +177,7 @@ +--- config/pre.in.orig 2014-10-15 16:55:10.000000000 -0700 ++++ config/pre.in 2015-02-04 12:43:45.693875606 -0800 +@@ -178,9 +178,9 @@ INSTALL=@INSTALL@ INSTALL_STRIP= INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) -INSTALL_SCRIPT=@INSTALL_PROGRAM@ +INSTALL_SCRIPT=@INSTALL_SCRIPT@ INSTALL_DATA=@INSTALL_DATA@ - INSTALL_SHLIB=@INSTALL_SHLIB@ +-INSTALL_SHLIB=@INSTALL_SHLIB@ ++INSTALL_SHLIB=$(INSTALL_LIB) INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root + ## This is needed because autoconf will sometimes define @exec_prefix@ to be + ## ${prefix}. +@@ -197,7 +197,7 @@ + ADMIN_BINDIR = @sbindir@ + SERVER_BINDIR = @sbindir@ + CLIENT_BINDIR =@bindir@ +-PKGCONFIG_DIR = @libdir@/pkgconfig ++PKGCONFIG_DIR = $(prefix)/libdata/pkgconfig + ADMIN_MANDIR = $(KRB5MANROOT)/man8 + SERVER_MANDIR = $(KRB5MANROOT)/man8 + CLIENT_MANDIR = $(KRB5MANROOT)/man1 diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist index ab2b5fc28ce7..ca25dff93ebb 100644 --- a/security/krb5/pkg-plist +++ b/security/krb5/pkg-plist @@ -94,14 +94,14 @@ lib/libkrad.so lib/libkrad.so.0 lib/libverto.so.0 lib/libverto.so -lib/pkgconfig/gssrpc.pc -lib/pkgconfig/kadm-client.pc -lib/pkgconfig/kadm-server.pc -lib/pkgconfig/kdb.pc -lib/pkgconfig/krb5-gssapi.pc -lib/pkgconfig/krb5.pc -lib/pkgconfig/mit-krb5-gssapi.pc -lib/pkgconfig/mit-krb5.pc +libdata/pkgconfig/gssrpc.pc +libdata/pkgconfig/kadm-client.pc +libdata/pkgconfig/kadm-server.pc +libdata/pkgconfig/kdb.pc +libdata/pkgconfig/krb5-gssapi.pc +libdata/pkgconfig/krb5.pc +libdata/pkgconfig/mit-krb5-gssapi.pc +libdata/pkgconfig/mit-krb5.pc man/man1/k5srvutil.1.gz man/man1/kadmin.1.gz man/man1/krb5-config.1.gz @@ -151,22 +151,7 @@ share/examples/krb5/kdc.conf share/examples/krb5/krb5.conf share/examples/krb5/services.append share/locale/en_US/LC_MESSAGES/mit-krb5.mo -@exec mkdir -p %D/var/krb5kdc -@dirrmtry var/krb5kdc -@dirrmtry var -@dirrmtry share/locale/en_US/LC_MESSAGES -@dirrmtry share/locale/en_US -@dirrm lib/pkgconfig -@dirrm lib/krb5/plugins/tls -@dirrm lib/krb5/plugins/preauth -@dirrm lib/krb5/plugins/libkrb5 -@dirrm lib/krb5/plugins/kdb -@dirrm lib/krb5/plugins/authdata -@dirrm lib/krb5/plugins -@dirrm lib/krb5 -@dirrm include/gssapi -@dirrm include/gssrpc -@dirrm include/krb5 -@dirrm include/kadm5 -@dirrm share/et -@dirrm share/examples/krb5 +@dir lib/krb5/plugins/authdata +@dir lib/krb5/plugins/libkrb5 +@dir var/run/krb5kdc +@dir var/krb5kdc |