From owner-svn-ports-all@freebsd.org Thu Mar 31 18:55:24 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D1DCAE46D9; Thu, 31 Mar 2016 18:55:24 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1C74511B7; Thu, 31 Mar 2016 18:55:24 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2VItNNn005282; Thu, 31 Mar 2016 18:55:23 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2VItNcm005280; Thu, 31 Mar 2016 18:55:23 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201603311855.u2VItNcm005280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 31 Mar 2016 18:55:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412285 - in head/dns/opendd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Mar 2016 18:55:24 -0000 Author: amdmi3 Date: Thu Mar 31 18:55:22 2016 New Revision: 412285 URL: https://svnweb.freebsd.org/changeset/ports/412285 Log: - Switch to options helpers - Regenerate patches with `make makepatch` Modified: head/dns/opendd/Makefile head/dns/opendd/files/patch-Makefile Modified: head/dns/opendd/Makefile ============================================================================== --- head/dns/opendd/Makefile Thu Mar 31 18:45:15 2016 (r412284) +++ head/dns/opendd/Makefile Thu Mar 31 18:55:22 2016 (r412285) @@ -14,15 +14,15 @@ COMMENT= DynDNS client LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= OPENSSL RCNG DOCS -OPTIONS_DEFAULT= OPENSSL RCNG -RCNG_DESC= Install RC_NG script - PORTDOCS= README PLIST_FILES= sbin/${PORTNAME} \ "@sample(,,600) %%ETCDIR%%/${PORTNAME}.conf.sample" \ "%%ETCDIR%%/${PORTNAME}.pem" +OPTIONS_DEFINE= OPENSSL RCNG DOCS +OPTIONS_DEFAULT= OPENSSL RCNG +RCNG_DESC= Install RC_NG script + .include .if ${PORT_OPTIONS:MRCNG} @@ -40,31 +40,31 @@ post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}.${PORTVERSION} post-patch: -.if ${PORT_OPTIONS:MOPENSSL} - @${REINPLACE_CMD} 's|use_ssl = 0|use_ssl = 1|' ${WRKSRC}/${PORTNAME}.conf - @${REINPLACE_CMD} -e "s|^FLAGS =|FLAGS = ${CFLAGS}|" -e "s|^SSL =|SSL = ${LDFLAGS}|" \ - ${WRKSRC}/Makefile -.endif .for i in ${PORTNAME}.conf globals.h @${REINPLACE_CMD} 's|/etc/${PORTNAME}.pem|${ETCDIR}/${PORTNAME}.pem|' \ - ${WRKSRC}/${i} + ${WRKSRC}/${i} .endfor @${REINPLACE_CMD} 's|/etc/${PORTNAME}.conf|${ETCDIR}/${PORTNAME}.conf|' \ - ${WRKSRC}/globals.h -.if ${PORT_OPTIONS:MRCNG} + ${WRKSRC}/globals.h + +post-patch-OPENSSL-on: + @${REINPLACE_CMD} 's|use_ssl = 0|use_ssl = 1|' ${WRKSRC}/${PORTNAME}.conf + @${REINPLACE_CMD} -e "s|^FLAGS =|FLAGS = ${CFLAGS}|" -e "s|^SSL =|SSL = ${LDFLAGS}|" \ + ${WRKSRC}/Makefile + +post-patch-RCNG-on: @${REINPLACE_CMD} 's|runasdaemon = 0|runasdaemon = 1|' ${WRKSRC}/${PORTNAME}.conf -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin - ${MKDIR} ${STAGEDIR}${ETCDIR} + @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.pem ${STAGEDIR}${ETCDIR} -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} -p ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Modified: head/dns/opendd/files/patch-Makefile ============================================================================== --- head/dns/opendd/files/patch-Makefile Thu Mar 31 18:45:15 2016 (r412284) +++ head/dns/opendd/files/patch-Makefile Thu Mar 31 18:55:22 2016 (r412285) @@ -1,7 +1,7 @@ ---- Makefile.orig Mon May 1 07:29:07 2006 -+++ Makefile Sun Nov 12 14:57:38 2006 +--- Makefile.orig 2008-03-15 02:15:51 UTC ++++ Makefile @@ -5,8 +5,7 @@ - # USE_SOCKET_SSL=yto enable SSL socket + # USE_SOCKET_SSL=y to enable SSL socket # -CC = cc @@ -10,7 +10,7 @@ BIN_PROGRAM = opendd -@@ -49,15 +49,13 @@ +@@ -49,15 +48,13 @@ ${BIN_PROGRAM}: ${OBJS} ${COMMON_OBJS}; fi @echo "" .c.o: