utilize USE_GETOPT_LONG

Remove GNU make build-time dependency

PR:		51529
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

4 files changed, 43 insertions, 28 deletions

diff --git a/devel/picprog/Makefile b/devel/picprog/Makefile
index e46be71e3535..371b3029a901 100644
--- a/devel/picprog/Makefile
+++ b/devel/picprog/Makefile
@@ -7,22 +7,26 @@
 
 PORTNAME=	picprog
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://hyvatti.iki.fi/~jaakko/pic/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Serial port pic16c84 programmer
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=	yes
+
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-USE_GMAKE=	yes
 MAN1=		picprog.1
+DOCS=		README picprog.html *.gif
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/picprog ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/picprog.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/picprog.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.gif ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/picprog/files/patch-Makefile b/devel/picprog/files/patch-Makefile
index 36424d732611..29adc16ed361 100644
--- a/devel/picprog/files/patch-Makefile
+++ b/devel/picprog/files/patch-Makefile
@@ -1,15 +1,34 @@
---- Makefile.orig	Thu Feb  7 21:33:59 2002
-+++ Makefile	Tue Nov 19 12:55:52 2002
-@@ -26,9 +26,9 @@
+--- Makefile.orig	Thu Feb  7 13:33:59 2002
++++ Makefile	Tue Apr 29 02:57:00 2003
+@@ -26,10 +26,6 @@
  
  # Please use a reasonably recent GNU make.
  
 -CXX=g++
 -CXXFLAGS=-g -O2 -Wall -W -Wwrite-strings -Wmissing-prototypes
 -LDFLAGS=
-+CXX?=g++
-+CXXFLAGS=-g -O2 -Wall -W -Wwrite-strings -Wmissing-prototypes -I/usr/local/include
-+LDFLAGS= -L/usr/local/lib -lgnugetopt
- 
+-
  OBJS=main.o picport.o hexfile.o program.o
  PROG=picprog
+ 
+@@ -38,6 +34,9 @@
+ $(PROG): $(OBJS)
+ 	$(CXX) $(LDFLAGS) $(OBJS) -o $@
+ 
++.cc.o:
++	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $>
++
+ dep:
+ 	$(CXX) -M $(CXXFLAGS) *.cc > .depend
+ 
+@@ -55,10 +54,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/pkg-descr b/devel/picprog/pkg-descr
index f75637671f3a..3f19d9a8a116 100644
--- a/devel/picprog/pkg-descr
+++ b/devel/picprog/pkg-descr
@@ -1,19 +1,10 @@
 This is Picprog, pic16c84 programmer software for the serial port device.
-Copyright 1997 Jaakko Hyvatti
-
 To program a pic16c84 chip:
 
 	picprog --burn --input something.hex --pic /dev/cuaa1
 
-Full manual:
-
-	see file /usr/local/share/doc/picprog/picprog.html
-
-The author may be contacted at:
-
-	Email: Jaakko.Hyvatti@iki.fi
-
 Remember: this is not a production quality programmer!  See PIC16C84
 data sheet for more information.
 
-WWW: http://hyvatti.iki.fi/~jaakko/pic/
+Author:	Jaakko.Hyvatti@iki.fi
+WWW:	http://hyvatti.iki.fi/~jaakko/pic/
diff --git a/devel/picprog/pkg-plist b/devel/picprog/pkg-plist
index f5c98c579a54..891ed9864df3 100644
--- a/devel/picprog/pkg-plist
+++ b/devel/picprog/pkg-plist
@@ -1,6 +1,7 @@
 bin/picprog
-%%PORTDOCS%%share/doc/picprog/anybrowser3.gif
-%%PORTDOCS%%share/doc/picprog/jdm84pcb3.gif
-%%PORTDOCS%%share/doc/picprog/jdm84new.gif
-%%PORTDOCS%%share/doc/picprog/picprog.html
-%%PORTDOCS%%@dirrm share/doc/picprog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/anybrowser3.gif
+%%PORTDOCS%%%%DOCSDIR%%/jdm84pcb3.gif
+%%PORTDOCS%%%%DOCSDIR%%/jdm84new.gif
+%%PORTDOCS%%%%DOCSDIR%%/picprog.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%