From owner-svn-ports-all@FreeBSD.ORG Mon Apr 7 10:47:46 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BEAD4F2; Mon, 7 Apr 2014 10:47:46 +0000 (UTC) Received: from svn.freebsd.org (svn.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 18A4CA11; Mon, 7 Apr 2014 10:47:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37AljjU088258; Mon, 7 Apr 2014 10:47:45 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37Aljoa088257; Mon, 7 Apr 2014 10:47:45 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404071047.s37Aljoa088257@svn.freebsd.org> From: Pawel Pekala Date: Mon, 7 Apr 2014 10:47:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350457 - head/editors/ne 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.17 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: Mon, 07 Apr 2014 10:47:46 -0000 Author: pawel Date: Mon Apr 7 10:47:45 2014 New Revision: 350457 URL: http://svnweb.freebsd.org/changeset/ports/350457 QAT: https://qat.redports.org/buildarchive/r350457/ Log: - Add staging support - Convert to USES=gmake, new options framework - Make post-patch target simplier Modified: head/editors/ne/Makefile Modified: head/editors/ne/Makefile ============================================================================== --- head/editors/ne/Makefile Mon Apr 7 10:45:23 2014 (r350456) +++ head/editors/ne/Makefile Mon Apr 7 10:47:45 2014 (r350457) @@ -11,13 +11,10 @@ COMMENT= Nice and powerful editor LICENSE= GPLv3 -OPTIONS_DEFINE= DOCS - BUILD_WRKSRC= ${WRKSRC}/src -USES= perl5 +USES= gmake perl5 USE_PERL5= build -USE_GMAKE= yes MAKEFILE= makefile ALL_TARGET= ${PORTNAME} MAKE_ARGS= CC="${CC}" \ @@ -25,10 +22,10 @@ MAKE_ARGS= CC="${CC}" \ LDFLAGS="-lgnuregex" \ NE_GLOBAL_DIR="${DATADIR}" -MAN1= ${PORTNAME}.1 INFO= ${PORTNAME} PORTDOCS= * PLIST_FILES= bin/${PORTNAME} \ + man/man1/${PORTNAME}.1.gz \ %%DATADIR%%/default.keys %%DATADIR%%/default.menus \ %%DATADIR%%/syntax/4gl.jsf %%DATADIR%%/syntax/ada.jsf \ %%DATADIR%%/syntax/asm.jsf %%DATADIR%%/syntax/awk.jsf \ @@ -55,43 +52,37 @@ PLIST_FILES= bin/${PORTNAME} \ %%DATADIR%%/syntax/vhdl.jsf %%DATADIR%%/syntax/xml.jsf PLIST_DIRS= %%DATADIR%%/syntax %%DATADIR%% -NO_STAGE= yes +OPTIONS_DEFINE= DEBUG DOCS + .include -.if !defined(WITH_DEBUG) +.if ! ${PORT_OPTIONS:MDEBUG} CFLAGS+= -DNODEBUG .endif post-patch: -.for file in actions.c - @${REINPLACE_CMD} -e 's|tmpnam(|mkstemp(|g' ${BUILD_WRKSRC}/${file} -.endfor -.for file in ne.c search.c - @${REINPLACE_CMD} -e 's|"regex\.h"||g' ${BUILD_WRKSRC}/${file} -.endfor -.for file in makefile + @${REINPLACE_CMD} -e 's|tmpnam(|mkstemp(|g' ${BUILD_WRKSRC}/actions.c + @${REINPLACE_CMD} -e 's|"regex\.h"||g' \ + ${BUILD_WRKSRC}/ne.c \ + ${BUILD_WRKSRC}/search.c @${REINPLACE_CMD} -e '/[[:space:]]regex.o/d ; \ - s|regex.h||g' ${BUILD_WRKSRC}/${file} -.endfor + s|regex.h||g' ${BUILD_WRKSRC}/makefile post-build: cd ${WRKSRC}/doc && makeinfo ${PORTNAME}.texinfo do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info ${PREFIX}/${INFO_PATH} - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/doc/default.* ${DATADIR} - @(cd ${WRKSRC} && ${COPYTREE_SHARE} syntax ${DATADIR}) -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.pdf ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.txt ${DOCSDIR} - @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR}) -.endif + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \ + ${STAGEDIR}${PREFIX}/${INFO_PATH} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/doc/default.* ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} syntax ${STAGEDIR}${DATADIR}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} CHANGES NEWS README \ + doc/${PORTNAME}.pdf doc/${PORTNAME}.txt ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) .include