Attachment #53503 for bug #80917




#

PORTNAME=	picprog
PORTVERSION=	1.7
CATEGORIES=	devel
MASTER_SITES=	http://hyvatti.iki.fi/~jaakko/pic/

MAINTAINER=	erik@smluc.org
COMMENT=	Serial port pic16c84 programmer

USE_GETOPT_LONG=	yes

MAN1=	picprog.1

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

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/picprog/distinfo (-2 / +2 lines)
1	MD5 (picprog-1.4.tar.gz) = 98d8fb42f92b57ea2114033a3f207706	1	MD5 (picprog-1.7.tar.gz) = 342f65a9cc71a0507fe8083181e2681c
2	SIZE (picprog-1.4.tar.gz) = 53394	2	SIZE (picprog-1.7.tar.gz) = 55118

Lines 1-8 Link Here

(-)devel/picprog/pkg-plist (-7 lines)
1	bin/picprog	1	bin/picprog
2	%%PORTDOCS%%%%DOCSDIR%%/README
3	%%PORTDOCS%%%%DOCSDIR%%/adapter.jpg
4	%%PORTDOCS%%%%DOCSDIR%%/anybrowser3.png
5	%%PORTDOCS%%%%DOCSDIR%%/jdm84ne1.png
6	%%PORTDOCS%%%%DOCSDIR%%/jdm84pcb4.png
7	%%PORTDOCS%%%%DOCSDIR%%/picprog.html
8	%%PORTDOCS%%@dirrm %%DOCSDIR%%




--- Makefile.orig	Wed May 11 00:29:24 2005
+++ Makefile	Wed May 11 00:29:43 2005
@@ -26,9 +26,9 @@
 
 # Please use a reasonably recent GNU make.
 
-CXX=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
@@ -59,6 +59,6 @@
 #
 # include a dependency file if one exists
 #
 	$(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
-#
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
+#ifeq (.depend,$(wildcard .depend))
+#include .depend
+#endif

Return to bug 80917

Lines 6-31 Link Here

(-)devel/picprog/Makefile (-14 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= picprog	8	PORTNAME= picprog
9	PORTVERSION= 1.4	9	PORTVERSION= 1.7
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://hyvatti.iki.fi/~jaakko/pic/	11	MASTER_SITES= http://hyvatti.iki.fi/~jaakko/pic/
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= erik@smluc.org
14	COMMENT= Serial port pic16c84 programmer	14	COMMENT= Serial port pic16c84 programmer
15		15
16	USE_GETOPT_LONG= yes	16	USE_GETOPT_LONG= yes
17		17
18	MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	18	MAN1= picprog.1
19
20	MAN1= picprog.1
21	DOCS= README picprog.html .jpg .png
22
23	do-install:
24	${INSTALL_PROGRAM} ${WRKSRC}/picprog ${PREFIX}/bin
25	${INSTALL_MAN} ${WRKSRC}/picprog.1 ${MANPREFIX}/man/man1
26	.if !defined(NOPORTDOCS)
27	@${MKDIR} ${DOCSDIR}
28	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
29	.endif
30		19
31	.include <bsd.port.mk>	20	.include <bsd.port.mk>

Lines 1-33 Link Here

(-)devel/picprog/files/patch-Makefile (-24 / +16 lines)
1	--- Makefile.orig Mon Jan 12 22:42:23 2004	1	--- Makefile.orig Wed May 11 00:29:24 2005
2	+++ Makefile Mon Jan 12 22:44:01 2004	2	+++ Makefile Wed May 11 00:29:43 2005
3	@@ -26,10 +26,6 @@	3	@@ -26,9 +26,9 @@
4		4
5	# Please use a reasonably recent GNU make.	5	# Please use a reasonably recent GNU make.
6		6
7	-CXX=g++	7	-CXX=g++
8	-CXXFLAGS=-g -O2 -Wall -W -Wwrite-strings -Wmissing-prototypes	8	-CXXFLAGS=-O2 -Wall -W -Wwrite-strings -Wmissing-prototypes
9	-LDFLAGS=-g	9	-LDFLAGS=-s
10	-	10	+#CXX=g++
		11	+#CXXFLAGS=-O2 -Wall -W -Wwrite-strings -Wmissing-prototypes
		12	+#LDFLAGS=-s
		13
11	OBJS=main.o picport.o hexfile.o program.o	14	OBJS=main.o picport.o hexfile.o program.o
12	PROG=picprog	15	PROG=picprog
13		16	@@ -59,6 +59,6 @@
14	@@ -37,6 +33,8 @@	17	#
15		18	# include a dependency file if one exists
16	$(PROG): $(OBJS)	19	#
17	$(CXX) $(LDFLAGS) $(OBJS) -o $@
18	+.cc.o:
19	+ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $>
20
21	dep:
22	$(CXX) -M $(CXXFLAGS) *.cc > .depend
23	@@ -55,10 +53,3 @@
24	install: all
25	install -c -o 0 -g 0 -m 755 $(PROG) /usr/local/bin/
26	install -c -o 0 -g 0 -m 644 *.1 /usr/local/man/man1/
27	-
28	-#
29	-# include a dependency file if one exists
30	-#
31	-ifeq (.depend,$(wildcard .depend))	20	-ifeq (.depend,$(wildcard .depend))
32	-include .depend	21	-include .depend
33	-endif	22	-endif
		23	+#ifeq (.depend,$(wildcard .depend))
		24	+#include .depend
		25	+#endif