5 files changed, 33 insertions, 50 deletions

diff --git a/devel/picprog/Makefile b/devel/picprog/Makefile
index fd0b9372a73e..c3702c7958c6 100644
--- a/devel/picprog/Makefile
+++ b/devel/picprog/Makefile
@@ -6,26 +6,39 @@
 #
 
 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
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
 
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	CXX="${CXX}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
+PLIST_FILES=	bin/picprog
 MAN1=		picprog.1
-DOCS=		README picprog.html *.jpg *.png
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|^CXX=.*||; s|^CXXFLAGS=.*||; s|^LDFLAGS=.*||' \
+		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/picprog ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/picprog.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/picprog.1 ${MAN1PREFIX}/man/man1
+
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+.for f in README *.png picprog.html
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/picprog/distinfo b/devel/picprog/distinfo
index 97fb2f31225d..90500dd3a7ce 100644
--- a/devel/picprog/distinfo
+++ b/devel/picprog/distinfo
@@ -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
diff --git a/devel/picprog/files/patch-Makefile b/devel/picprog/files/patch-Makefile
deleted file mode 100644
index d67cea131fd9..000000000000
--- a/devel/picprog/files/patch-Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	Mon Jan 12 22:42:23 2004
-+++ Makefile	Mon Jan 12 22:44:01 2004
-@@ -26,10 +26,6 @@
- 
- # Please use a reasonably recent GNU make.
- 
--CXX=g++
--CXXFLAGS=-g -O2 -Wall -W -Wwrite-strings -Wmissing-prototypes
--LDFLAGS=-g
--
- OBJS=main.o picport.o hexfile.o program.o
- PROG=picprog
- 
-@@ -37,6 +33,8 @@
- 
- $(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
--#
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
diff --git a/devel/picprog/files/patch-picport.cc b/devel/picprog/files/patch-picport.cc
new file mode 100644
index 000000000000..0b4f619e0294
--- /dev/null
+++ b/devel/picprog/files/patch-picport.cc
@@ -0,0 +1,11 @@
+--- picport.cc.orig	Thu Apr 29 06:08:10 2004
++++ picport.cc	Wed May 25 11:09:06 2005
+@@ -40,7 +40,7 @@
+ #include <unistd.h>
+ #include <termios.h>
+ #include <sysexits.h>
+-#include <string.h>
++#include <string>
+ #include <sched.h>
+ 
+ #include "picport.h"
diff --git a/devel/picprog/pkg-plist b/devel/picprog/pkg-plist
deleted file mode 100644
index 677a3314f6de..000000000000
--- a/devel/picprog/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-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%%