Date: Wed, 18 May 2005 11:13:20 -0500 From: Erik Greenwald <erik@smluc.org> To: Kirill Ponomarew <krion@FreeBSD.org> Cc: bug-followup@freebsd.org Subject: Re: ports/80917: Update: devel/picprog 1.4 -> 1.7 + adoption Message-ID: <20050518161320.GA15278@smluc.org> In-Reply-To: <200505120144.j4C1i0nk057692@freefall.freebsd.org> References: <200505120144.j4C1i0nk057692@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--huq684BweRXVnRxX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, May 12, 2005 at 01:44:00AM +0000, Kirill Ponomarew wrote: > Synopsis: Update: devel/picprog 1.4 -> 1.7 + adoption <snip> > http://www.freebsd.org/cgi/query-pr.cgi?pr=80917 the issue was with CPPFLAGS and LDFLAGS not being honored, so the getopt_long fu for 4 was being ignored... required a MAKE_ENV clause in the port makefile and a .cc.o target in the softwares makefile.. Attached is a replacement patch (throw the other patch away). If it's easier to fetch it, it's also at http://smluc.org/~erik/devel-picprog.2.patch Thanks -- -Erik <erik@smluc.org> [http://math.smsu.edu/~erik] The opinions expressed by me are not necessarily opinions. In all probability, they are random rambling, and to be ignored. Failure to ignore may result in severe boredom or confusion. Shake well before opening. Keep Refrigerated. --huq684BweRXVnRxX Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="devel-picprog.2.patch" ? devel/picprog/files/patch-picport.cc Index: devel/picprog/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/picprog/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- devel/picprog/Makefile 12 Jan 2004 23:38:04 -0000 1.11 +++ devel/picprog/Makefile 18 May 2005 16:02:23 -0000 @@ -6,26 +6,17 @@ # PORTNAME= picprog -PORTVERSION= 1.4 +PORTVERSION= 1.7 CATEGORIES= devel MASTER_SITES= http://hyvatti.iki.fi/~jaakko/pic/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= erik@smluc.org COMMENT= Serial port pic16c84 programmer USE_GETOPT_LONG= yes MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -MAN1= picprog.1 -DOCS= README picprog.html *.jpg *.png - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/picprog ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/picprog.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.endif +MAN1= picprog.1 .include <bsd.port.mk> Index: devel/picprog/distinfo =================================================================== RCS file: /home/ncvs/ports/devel/picprog/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- devel/picprog/distinfo 29 Jan 2004 07:23:22 -0000 1.5 +++ devel/picprog/distinfo 18 May 2005 16:02:23 -0000 @@ -1,2 +1,2 @@ -MD5 (picprog-1.4.tar.gz) = 98d8fb42f92b57ea2114033a3f207706 -SIZE (picprog-1.4.tar.gz) = 53394 +MD5 (picprog-1.7.tar.gz) = 342f65a9cc71a0507fe8083181e2681c +SIZE (picprog-1.7.tar.gz) = 55118 Index: devel/picprog/pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/picprog/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- devel/picprog/pkg-plist 12 Jan 2004 23:38:04 -0000 1.4 +++ devel/picprog/pkg-plist 18 May 2005 16:02:23 -0000 @@ -1,8 +1 @@ bin/picprog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/adapter.jpg -%%PORTDOCS%%%%DOCSDIR%%/anybrowser3.png -%%PORTDOCS%%%%DOCSDIR%%/jdm84ne1.png -%%PORTDOCS%%%%DOCSDIR%%/jdm84pcb4.png -%%PORTDOCS%%%%DOCSDIR%%/picprog.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: devel/picprog/files/patch-Makefile =================================================================== RCS file: /home/ncvs/ports/devel/picprog/files/patch-Makefile,v retrieving revision 1.3 diff -u -r1.3 patch-Makefile --- devel/picprog/files/patch-Makefile 12 Jan 2004 23:38:05 -0000 1.3 +++ devel/picprog/files/patch-Makefile 18 May 2005 16:02:23 -0000 @@ -1,33 +1,35 @@ ---- Makefile.orig Mon Jan 12 22:42:23 2004 -+++ Makefile Mon Jan 12 22:44:01 2004 -@@ -26,10 +26,6 @@ +--- Makefile.orig Thu Apr 29 04:08:22 2004 ++++ Makefile Mon May 16 18:40:27 2005 +@@ -26,9 +26,9 @@ # Please use a reasonably recent GNU make. -CXX=g++ --CXXFLAGS=-g -O2 -Wall -W -Wwrite-strings -Wmissing-prototypes --LDFLAGS=-g -- +-CXXFLAGS=-O2 -Wall -W -Wwrite-strings -Wmissing-prototypes +-LDFLAGS=-s ++#CXX=g++ ++#CXXFLAGS=-O2 -Wall -W -Wwrite-strings -Wmissing-prototypes ++#LDFLAGS=-s + OBJS=main.o picport.o hexfile.o program.o PROG=picprog - -@@ -37,6 +33,8 @@ - +@@ -38,6 +38,9 @@ $(PROG): $(OBJS) $(CXX) $(LDFLAGS) $(OBJS) -o $@ + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $> - ++ dep: $(CXX) -M $(CXXFLAGS) *.cc > .depend -@@ -55,10 +53,3 @@ - install: all - install -c -o 0 -g 0 -m 755 $(PROG) /usr/local/bin/ - install -c -o 0 -g 0 -m 644 *.1 /usr/local/man/man1/ -- --# --# include a dependency file if one exists --# + +@@ -59,6 +62,6 @@ + # + # include a dependency file if one exists + # -ifeq (.depend,$(wildcard .depend)) -include .depend -endif ++#ifeq (.depend,$(wildcard .depend)) ++#include .depend ++#endif --huq684BweRXVnRxX--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050518161320.GA15278>