Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Jul 2014 20:36:48 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360816 - head/security/pam_krb5-rh
Message-ID:  <201407052036.s65Kamxf057925@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sat Jul  5 20:36:48 2014
New Revision: 360816
URL: http://svnweb.freebsd.org/changeset/ports/360816
QAT: https://qat.redports.org/buildarchive/r360816/

Log:
  - Add USES=libtool
  - Simplify CONFIGURE_ARGS
  - Use option helpers

Modified:
  head/security/pam_krb5-rh/Makefile
  head/security/pam_krb5-rh/pkg-plist

Modified: head/security/pam_krb5-rh/Makefile
==============================================================================
--- head/security/pam_krb5-rh/Makefile	Sat Jul  5 19:57:32 2014	(r360815)
+++ head/security/pam_krb5-rh/Makefile	Sat Jul  5 20:36:48 2014	(r360816)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pam_krb5
 DISTVERSION=	2.4.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://fedorahosted.org/released/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
@@ -16,26 +17,19 @@ LICENSE_COMB=	dual
 
 CONFLICTS=	pam_krb5-4.*
 
-USES=		iconv
+USES=		iconv libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} --without-afs \
-		--with-libintl-prefix=${LOCALBASE} --with-krb4=no \
-		--without-keyutils
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--without-afs --without-keyutils --without-krb4
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS=""
-LDFLAGS+=	-lintl
-USES+=		gettext
-.else
-PLIST_SUB+=	NLS="@comment "
-CONFIGURE_ARGS+=--disable-nls
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_LIBS=	-lintl
+NLS_USES=	gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libdir)/security|libdir)|g' ${WRKSRC}/src/Makefile.in

Modified: head/security/pam_krb5-rh/pkg-plist
==============================================================================
--- head/security/pam_krb5-rh/pkg-plist	Sat Jul  5 19:57:32 2014	(r360815)
+++ head/security/pam_krb5-rh/pkg-plist	Sat Jul  5 20:36:48 2014	(r360816)
@@ -1,7 +1,9 @@
 lib/pam_krb5/pam_krb5_cchelper
-lib/pam_krb5.so
-lib/pam_krb5.la
 @dirrm lib/pam_krb5
+lib/pam_krb5.so
+man/man5/pam_krb5.5.gz
+man/man8/pam_krb5.8.gz
+man/man8/pam_krb5_cchelper.8.gz
 %%NLS%%share/locale/as/LC_MESSAGES/pam_krb5.mo
 %%NLS%%share/locale/bn_IN/LC_MESSAGES/pam_krb5.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/pam_krb5.mo
@@ -37,9 +39,6 @@ lib/pam_krb5.la
 %%NLS%%share/locale/uk/LC_MESSAGES/pam_krb5.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/pam_krb5.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/pam_krb5.mo
-man/man5/pam_krb5.5.gz
-man/man8/pam_krb5.8.gz
-man/man8/pam_krb5_cchelper.8.gz
 %%NLS%%@dirrmtry share/locale/as/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407052036.s65Kamxf057925>