Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Mar 2015 15:05:20 +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: r382830 - in head/dns/dnrd: . files
Message-ID:  <201503311505.t2VF5Khm039369@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Mar 31 15:05:20 2015
New Revision: 382830
URL: https://svnweb.freebsd.org/changeset/ports/382830
QAT: https://qat.redports.org/buildarchive/r382830/

Log:
  Remove useless pkg-install script
  Cleanup makefile (option helpers)
  Fix MASTER option

Deleted:
  head/dns/dnrd/files/pkg-install.in
  head/dns/dnrd/pkg-install
Modified:
  head/dns/dnrd/Makefile
  head/dns/dnrd/pkg-plist

Modified: head/dns/dnrd/Makefile
==============================================================================
--- head/dns/dnrd/Makefile	Tue Mar 31 15:02:59 2015	(r382829)
+++ head/dns/dnrd/Makefile	Tue Mar 31 15:05:20 2015	(r382830)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dnrd
 PORTVERSION=	2.20.3
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	SF
 
@@ -26,42 +27,20 @@ RANDOM_DESC=	Random source port
 
 USERS=		dnrd
 GROUPS=		dnrd
-DNRD_DIR?=	${ETCDIR}
 
-SUB_FILES=	pkg-install
-SUB_LIST+=	DNRD_DIR=${DNRD_DIR}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTCP}
-CONFIGURE_ARGS+=	--enable-tcp
-.endif
-
-.if ${PORT_OPTIONS:MMASTER}
-CONFIGURE_ARGS+=	--disable-master
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MRANDOM}
-CONFIGURE_ARGS+=	--enable-random-src
-.endif
+TCP_CONFIGURE_ENABLE=		tcp
+MASTER_CONFIGURE_ENABLE=	master
+DEBUG_CONFIGURE_ENABLE=		enable-debug
+RANDOM_CONFIGURE_ENABLE=	random-src
 
 do-install:
-	@${ECHO} "==>  Creating dnrd directory"
-	@${SETENV} DESTDIR="${STAGEDIR}" PKG_PREFIX="${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${STAGEDIR}${PREFIX}/sbin/
-	@${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
-	@${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${STAGEDIR}${ETCDIR}/
-.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
+	${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${STAGEDIR}${ETCDIR}/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${EXAMPLESDIR}/
-.endif
+	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>

Modified: head/dns/dnrd/pkg-plist
==============================================================================
--- head/dns/dnrd/pkg-plist	Tue Mar 31 15:02:59 2015	(r382829)
+++ head/dns/dnrd/pkg-plist	Tue Mar 31 15:05:20 2015	(r382830)
@@ -1,6 +1,3 @@
 sbin/dnrd
 %%ETCDIR%%/master.sample
 man/man8/dnrd.8.gz
-@unexec echo ""
-@unexec echo "If you are permanently removing dnrd, remove user/group 'dnrd'" | /usr/bin/fmt
-@unexec echo ""



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