Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Apr 2014 22:05:35 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352155 - head/dns/samba-nsupdate
Message-ID:  <201404252205.s3PM5Z9k066313@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Apr 25 22:05:35 2014
New Revision: 352155
URL: http://svnweb.freebsd.org/changeset/ports/352155
QAT: https://qat.redports.org/buildarchive/r352155/

Log:
  Support stage
  Cleanup a bit

Modified:
  head/dns/samba-nsupdate/Makefile

Modified: head/dns/samba-nsupdate/Makefile
==============================================================================
--- head/dns/samba-nsupdate/Makefile	Fri Apr 25 21:57:42 2014	(r352154)
+++ head/dns/samba-nsupdate/Makefile	Fri Apr 25 22:05:35 2014	(r352155)
@@ -37,11 +37,13 @@ CONFIGURE_ARGS+=	\
 			--without-idn \
 			--with-randomdev=/dev/random
 
-NO_STAGE=		yes
-
 OPTIONS_DEFINE=	IPV6
 
-.include <bsd.port.options.mk>
+SIGCHASE_CONFIGURE_ARGS+=	STD_CDEFINES="-DDIG_SIGCHASE=1"
+IPV6_CONFIGURE_ON=	--enable-ipv6
+
+PLIST_FILES=		bin/${UNIQUENAME} \
+			man/man1/${UNIQUENAME}.1.gz
 
 .include <bsd.port.pre.mk>
 
@@ -49,14 +51,6 @@ OPTIONS_DEFINE=	IPV6
 ARCH=		x86_64
 .endif
 
-.if ${PORT_OPTIONS:MSIGCHASE}
-CONFIGURE_ARGS+=	STD_CDEFINES="-DDIG_SIGCHASE=1"
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
 # Enable OpenSSL API
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 # Try to find appropriate GSSAPI libs
@@ -71,27 +65,23 @@ LIB_DEPENDS+=		krb5:${PORTSDIR}/security
 CONFIGURE_ARGS+=	--with-gssapi="${LOCALBASE}"
 .endif
 
-MAN1=			${UNIQUENAME}.1
-
-PLIST_FILES=		bin/${UNIQUENAME}
-
 post-patch:
-			@${REINPLACE_CMD} \
-				-e 's|^SUBDIRS.*|SUBDIRS = lib bin|' \
-				-e 's|isc-config.sh installdirs|installdirs|' \
-				-e 's|.*INSTALL.*isc-config.*||' \
-				-e 's|.*INSTALL.*bind.keys.*||' \
-			${WRKSRC}/Makefile.in
-			@${REINPLACE_CMD} \
-				-e 's|^SUBDIRS.*|SUBDIRS = ${PORTNAME}|' \
-				-e 's|^.*check confgen ||' \
-			${WRKSRC}/bin/Makefile.in
-			@${REINPLACE_CMD} \
-				-e 's|${PORTNAME}|${UNIQUENAME}|g' \
-			${WRKSRC}/bin/nsupdate/${PORTNAME}.1
+	@${REINPLACE_CMD} \
+		-e 's|^SUBDIRS.*|SUBDIRS = lib bin|' \
+		-e 's|isc-config.sh installdirs|installdirs|' \
+		-e 's|.*INSTALL.*isc-config.*||' \
+		-e 's|.*INSTALL.*bind.keys.*||' \
+	${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} \
+		-e 's|^SUBDIRS.*|SUBDIRS = ${PORTNAME}|' \
+		-e 's|^.*check confgen ||' \
+	${WRKSRC}/bin/Makefile.in
+	@${REINPLACE_CMD} \
+		-e 's|${PORTNAME}|${UNIQUENAME}|g' \
+	${WRKSRC}/bin/nsupdate/${PORTNAME}.1
 
 do-install:
-			${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${MANPREFIX}/man/man1/${UNIQUENAME}.1
-			${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${PREFIX}/bin/${UNIQUENAME}
+	${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${UNIQUENAME}.1
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${UNIQUENAME}
 
 .include <bsd.port.post.mk>



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