From owner-svn-ports-head@freebsd.org Sun Sep 20 19:23:56 2015 Return-Path: Delivered-To: svn-ports-head@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 765219D099E; Sun, 20 Sep 2015 19:23:56 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 4D88C1FE1; Sun, 20 Sep 2015 19:23:56 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8KJNuqs052803; Sun, 20 Sep 2015 19:23:56 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8KJNuMf052801; Sun, 20 Sep 2015 19:23:56 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509201923.t8KJNuMf052801@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 20 Sep 2015 19:23:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397390 - head/sysutils/dolly X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Sep 2015 19:23:56 -0000 Author: amdmi3 Date: Sun Sep 20 19:23:55 2015 New Revision: 397390 URL: https://svnweb.freebsd.org/changeset/ports/397390 Log: - Switch to options helpers - Fix targets order Modified: head/sysutils/dolly/Makefile Modified: head/sysutils/dolly/Makefile ============================================================================== --- head/sysutils/dolly/Makefile Sun Sep 20 19:23:36 2015 (r397389) +++ head/sysutils/dolly/Makefile Sun Sep 20 19:23:55 2015 (r397390) @@ -15,37 +15,19 @@ OPTIONS_DEFAULT= BZIP2 HIGHEST_COMPRESSI BZIP2_DESC= bzip2 instead of gzip for compressing HIGHEST_COMPRESSION_DESC= Highest rather than fastest compression -DOCS= README - -.include -do-configure: -# C{C,FLAGS} safeness - @${REINPLACE_CMD} -E \ - -e 's|^(CC[[:space:]]*=).*$$|\1${CC}|' \ - -e 's|^(CFLAGS[[:space:]]*=.*)$$|\1 ${CFLAGS}|' \ - ${BUILD_WRKSRC}/${MAKEFILE} - -do-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for _file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${_file} ${STAGEDIR}${DOCSDIR}/ -. endfor -.endif - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - # Correctly depend upon bzip2 if necessary -.if ${PORT_OPTIONS:MBZIP2} -EXTRA_PATCHES+= ${FILESDIR}/extra-bzip2-patch-dolly.c -.endif +BZIP2_EXTRA_PATCHES= ${FILESDIR}/extra-bzip2-patch-dolly.c + +DOCS= README post-patch: # fix comment error @${REINPLACE_CMD} -E \ -e 's|use gzip|use gunzip|' \ ${WRKSRC}/dolly.c + +post-patch-BZIP2-on: # Properly reference bzip2 instead of gzip -.if ${PORT_OPTIONS:MBZIP2} @${REINPLACE_CMD} -E \ -e 's|/usr/bin/gzip|${BZIP2_CMD}|' \ -e 's|gzip|bzip2|' \ @@ -64,12 +46,27 @@ post-patch: -e 's|gunzip|bzcat|' \ -e 's|\.gz|\.bz2|g' \ ${WRKSRC}/* -.endif + +post-patch-HIGHEST_COMPRESSION-on: # Highest compression possible -.if ${PORT_OPTIONS:MHIGHEST_COMPRESSION} @${REINPLACE_CMD} -E \ -e 's|-cf|-9cf|' \ ${WRKSRC}/dolly.c -.endif + +do-configure: +# C{C,FLAGS} safeness + @${REINPLACE_CMD} -E \ + -e 's|^(CC[[:space:]]*=).*$$|\1${CC}|' \ + -e 's|^(CFLAGS[[:space:]]*=.*)$$|\1 ${CFLAGS}|' \ + ${BUILD_WRKSRC}/${MAKEFILE} + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for _file in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/${_file} ${STAGEDIR}${DOCSDIR}/ +.endfor .include