[PATCH] Convert devel/picprog to USE_GETOPT_LONG

[Sergei Kolobov]

>Submitter-Id:	current-users
>Originator:	Sergei Kolobov
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] Convert devel/picprog to USE_GETOPT_LONG
>Severity:	non-critical 
>Priority:	low
>Category:	ports 
>Class:		update 
>Release:	FreeBSD 5.0-CURRENT i386
>Environment:
System: FreeBSD elf.chetwood.ru 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Apr 13 01:13:44 MSD 2003
>Description:
- Properly conditionalize gnugetopt dependency by USE_GETOPT_LONG=yes
- Remove GNU make build-time dependency
- Reformat pkg-descr
- Install additional documentation
- Use DOCSDIR in pkg-plist
- Bump PORTREVISIION

Tested on:	-STABLE, -CURRENT
>How-To-Repeat:
>Fix:

--- picprog-1.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/picprog/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	2003/02/20 17:07:02	1.9
+++ Makefile	2003/04/28 23:11:37
@@ -7,22 +7,26 @@
 
 PORTNAME=	picprog
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://hyvatti.iki.fi/~jaakko/pic/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Serial port pic16c84 programmer
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=	yes
 
-USE_GMAKE=	yes
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
 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>
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/devel/picprog/pkg-descr,v
retrieving revision 1.5
diff -u -r1.5 pkg-descr
--- pkg-descr	2003/02/07 00:09:00	1.5
+++ pkg-descr	2003/04/28 23:11:37
@@ -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 at 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 at iki.fi
+WWW:	http://hyvatti.iki.fi/~jaakko/pic/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/picprog/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	2001/07/18 14:26:47	1.2
+++ pkg-plist	2003/04/28 23:11:37
@@ -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%%
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/picprog/files/patch-Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile
--- files/patch-Makefile	2002/11/19 01:59:27	1.1
+++ files/patch-Makefile	2003/04/28 23:11:37
@@ -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
--- picprog-1.1.patch ends here ---