ports/51530: [PATCH] Convert databases/dbview to USE_GETOPT_LONG

[Sergei Kolobov]

>Number:         51530
>Category:       ports
>Synopsis:       [PATCH] Convert databases/dbview to USE_GETOPT_LONG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 28 16:30:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>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
- Cleanup Makefile (whitespace changes)
- Bump PORTREVISION

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

--- dbview-1.0.3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/dbview/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	2003/02/20 17:00:11	1.10
+++ Makefile	2003/04/28 23:16:46
@@ -5,35 +5,33 @@
 # $FreeBSD: ports/databases/dbview/Makefile,v 1.10 2003/02/20 17:00:11 knu Exp $
 #
 
-PORTNAME=		dbview
-PORTVERSION=		1.0.3
-CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_SUNSITE} \
-			ftp://ftp.infodrom.north.de/pub/Linux/Devel/dbview/
+PORTNAME=	dbview
+PORTVERSION=	1.0.3
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+		ftp://ftp.infodrom.north.de/pub/Linux/Devel/dbview/
 MASTER_SITE_SUBDIR=	apps/database/proprietary
 
-MAINTAINER=		ports at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	View dBase III files
 
-LIB_DEPENDS=		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_REINPLACE=		yes
+USE_GETOPT_LONG=	yes
 
-MAN1=			dbview.1
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-USE_REINPLACE=		yes
+MAN1=		dbview.1
+DOCS=		README dBASE
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
-		${WRKSRC}/db_dump.c
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/db_dump.c
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/dbview ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKSRC}/dbview.1 ${PREFIX}/man/man1
-
-post-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/dbview ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/dbview.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/dBASE ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/databases/dbview/files/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- files/patch-aa	2002/10/20 21:23:01	1.3
+++ files/patch-aa	2003/04/28 23:16:46
@@ -1,37 +1,31 @@
---- Makefile.orig	Thu Sep 26 13:05:30 1996
-+++ Makefile	Sun Oct 20 14:24:16 2002
-@@ -18,8 +18,8 @@
+--- Makefile.orig	Fri Sep 27 00:05:30 1996
++++ Makefile	Tue Apr 29 02:41:08 2003
+@@ -18,8 +18,6 @@
  
  MAN=man
  
 -CC= gcc
 -CFLAGS= -O6 -fomit-frame-pointer -Wall -pipe
-+#CC= gcc
-+#CFLAGS= -O6 -fomit-frame-pointer -Wall -pipe
  # CFLAGS= -g -fomit-frame-pointer -Wall -pipe
  
  # Look where your install program is
-@@ -32,15 +32,15 @@
+@@ -32,12 +30,12 @@
  obj = db_dump.o dbview.o version.o
  
  .c.o:
 -	$(CC) ${CFLAGS} -c $*.c
-+	$(CC) ${CFLAGS} -I$(LOCALBASE)/include -c $*.c
++	$(CC) ${CFLAGS} $(CPPFLAGS) -c $*.c
  
  all:	dbview
  
  dbview: $(obj)
 -	$(CC) $(CFLAGS) -o dbview $(obj)
-+	$(CC) $(CFLAGS) -o dbview $(obj) -L$(LOCALBASE)/lib -lgnugetopt
++	$(CC) $(CFLAGS) $(LDFLAGS) -o dbview $(obj)
  
  depend:
--	makedepend *.c
-+	makedepend -I$(LOCALBASE)/include *.c
+ 	makedepend *.c
+@@ -56,13 +54,3 @@
  
- install: all
- 	$(INSTALL) -d -o root -g root -m 755 $(bindir)
-@@ -56,13 +56,13 @@
- 
  # DO NOT DELETE
  
 -db_dump.o: db_dump.h /usr/include/fcntl.h /usr/include/features.h
@@ -44,13 +38,3 @@
 -db_dump.o: /usr/include/confname.h /usr/include/malloc.h
 -dbview.o: version.h db_dump.h /usr/include/stdio.h /usr/include/libio.h
 -dbview.o: /usr/include/_G_config.h /usr/include/getopt.h
-+db_dump.o: db_dump.h /usr/include/fcntl.h /usr/include/sys/types.h
-+db_dump.o: /usr/include/sys/cdefs.h /usr/include/inttypes.h
-+db_dump.o: /usr/include/machine/endian.h /usr/include/sys/stat.h
-+db_dump.o: /usr/include/sys/time.h /usr/include/time.h
-+db_dump.o: /usr/include/stdio.h
-+db_dump.o: /usr/include/unistd.h /usr/include/sys/unistd.h
-+db_dump.o: /usr/include/stdlib.h /usr/include/stdlib.h /usr/include/ctype.h
-+db_dump.o: /usr/include/runetype.h /usr/include/string.h
-+dbview.o: version.h db_dump.h /usr/include/stdio.h /usr/include/sys/cdefs.h
-+dbview.o: /usr/local/include/getopt.h
--- dbview-1.0.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: