Date: Mon, 03 Jun 2013 05:07:00 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@freebsd.org Cc: gahr@FreeBSD.org Subject: ports/179244: [PATCH] devel/dparser: Fix docs, cleanup Makefile Message-ID: <20130603030703.67FE26D3@hub.freebsd.org> Resent-Message-ID: <201306030310.r533A0Zi018165@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179244 >Category: ports >Synopsis: [PATCH] devel/dparser: Fix docs, cleanup Makefile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jun 03 03:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.1-RELEASE-p3 amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013 >Description: - Remove DOCS Option - Fix docs - Cleanup Makefile - Trim files/patch-Makefile Port maintainer (gahr@FreeBSD.org) is cc'd. Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: Build log https://redports.org/buildarchive/20130603022801-13245/ >Fix: --- dparser-1.30.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/dparser/Makefile ./Makefile --- /usr/ports/devel/dparser/Makefile 2013-06-02 18:59:46.000000000 +0200 +++ ./Makefile 2013-06-03 04:26:22.000000000 +0200 @@ -10,7 +10,7 @@ MAINTAINER= gahr@FreeBSD.org COMMENT= Simple but powerful tool for parsing -OPTIONS_DEFINE= BOEHM DOCS +OPTIONS_DEFINE= BOEHM BOEHM_DESC= Boehm garbage collector support WRKSRC= ${WRKDIR}/d @@ -26,6 +26,9 @@ .include <bsd.port.options.mk> +post-patch: + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Makefile + .if ${PORT_OPTIONS:MBOEHM} LIB_DEPENDS+= gc:${PORTSDIR}/devel/boehm-gc MAKE_ARGS+= D_USE_GC=1 \ @@ -41,12 +44,12 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/make_dparser ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/make_dparser.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/dparse.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/dparse_tables.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/dparse_tree.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/dsymtab.h ${PREFIX}/include + ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1 +.for f in dparse.h dparse_tables.h dparse_tree.h dsymtab.h + (cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${PREFIX}/include) +.endfor ${INSTALL_DATA} ${WRKSRC}/${LIBDPARSE} ${PREFIX}/lib + .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR} diff -ruN --exclude=CVS /usr/ports/devel/dparser/files/patch-Makefile ./files/patch-Makefile --- /usr/ports/devel/dparser/files/patch-Makefile 2013-06-02 18:59:46.000000000 +0200 +++ ./files/patch-Makefile 2013-04-04 02:03:12.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.orig 2013-04-02 10:00:17.000000000 +0200 -+++ Makefile 2013-04-02 10:01:34.000000000 +0200 -@@ -11,7 +11,7 @@ +--- Makefile.orig 2013-03-02 22:22:20.000000000 +0100 ++++ Makefile 2013-04-04 01:59:35.000000000 +0200 +@@ -11,10 +11,10 @@ MINOR=30 RELEASE=$(MAJOR).$(MINOR) @@ -8,7 +8,11 @@ +CC ?= gcc ifndef PREFIX - PREFIX=/usr/local +-PREFIX=/usr/local ++PREFIX=%%PREFIX%% + endif + + .PHONY: all gram test install myexample @@ -38,7 +38,7 @@ ARCH = x86 endif @@ -41,12 +45,3 @@ d/grammar.g d/sample.g d/my.g LIB_SRCS = arg.c parse.c scan.c symtab.c util.c read_binary.c dparse_tree.c -@@ -141,7 +141,7 @@ - - ALL_SRCS = $(MAKE_PARSER_SRCS) $(BASE_SAMPLE_PARSER_SRCS) $(LIB_SRCS) $(MK_LIB_SRCS) - --all: $(EXECS) $(LIBRARIES) D_BUILD_VERSION make_dparser.cat -+all: $(EXECS) $(LIBRARIES) make_dparser.cat - - version: - echo $(OS_TYPE) $(OS_VERSION) diff -ruN --exclude=CVS /usr/ports/devel/dparser/files/patch-arg.c ./files/patch-arg.c --- /usr/ports/devel/dparser/files/patch-arg.c 2013-06-02 18:59:46.000000000 +0200 +++ ./files/patch-arg.c 2013-04-04 02:03:41.000000000 +0200 @@ -1,5 +1,5 @@ ---- arg.c.orig Fri Nov 7 03:03:52 2003 -+++ arg.c Mon Feb 2 18:35:43 2004 +--- arg.c.orig 2013-01-23 03:14:58.000000000 +0100 ++++ arg.c 2013-04-04 02:02:01.000000000 +0200 @@ -40,7 +40,7 @@ *(double *)desc[i].location = atof(arg); break; --- dparser-1.30.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130603030703.67FE26D3>