From 540ba26317f1e3af34eac33aa75a9dec9360056e Mon Sep 17 00:00:00 2001
From: Alex Kozlov <ak@FreeBSD.org>
Date: Wed, 23 Oct 2013 17:51:19 +0000
Subject: - Support STAGEDIR - Rename patches according to porter's handbook -
 Convert to PLIST_FILES

---
 databases/dbview/Makefile             | 15 ++++++---------
 databases/dbview/files/patch-Makefile | 26 ++++++++++++++++++++++++++
 databases/dbview/files/patch-aa       | 26 --------------------------
 databases/dbview/pkg-plist            |  4 ----
 4 files changed, 32 insertions(+), 39 deletions(-)
 create mode 100644 databases/dbview/files/patch-Makefile
 delete mode 100644 databases/dbview/files/patch-aa
 delete mode 100644 databases/dbview/pkg-plist

(limited to 'databases/dbview')

diff --git a/databases/dbview/Makefile b/databases/dbview/Makefile
index 58b6248f6d64..ffffc523e526 100644
--- a/databases/dbview/Makefile
+++ b/databases/dbview/Makefile
@@ -10,10 +10,9 @@ MASTER_SITE_SUBDIR=	apps/database/proprietary
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View dBase III files
 
-MAN1=		dbview.1
-DOCS=		README dBASE
+PLIST_FILES=	bin/dbview man/man1/dbview.1.gz
+PORTDOCS=	README dBASE
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|; \
 	    s|<endian.h>|<sys/endian.h>|; \
@@ -21,11 +20,9 @@ post-patch:
 	    ${WRKSRC}/db_dump.c
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/dbview ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/dbview.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/dbview ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/dbview.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/dbview/files/patch-Makefile b/databases/dbview/files/patch-Makefile
new file mode 100644
index 000000000000..bf4430dc2e06
--- /dev/null
+++ b/databases/dbview/files/patch-Makefile
@@ -0,0 +1,26 @@
+--- 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
+ # CFLAGS= -g -fomit-frame-pointer -Wall -pipe
+ 
+ # Look where your install program is
+@@ -32,12 +30,12 @@
+ obj = db_dump.o dbview.o version.o
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} -c $*.c
++	$(CC) ${CFLAGS} $(CPPFLAGS) -c $*.c
+ 
+ all:	dbview
+ 
+ dbview: $(obj)
+-	$(CC) $(CFLAGS) -o dbview $(obj)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o dbview $(obj)
+ 
+ depend:
+ 	makedepend *.c
diff --git a/databases/dbview/files/patch-aa b/databases/dbview/files/patch-aa
deleted file mode 100644
index bf4430dc2e06..000000000000
--- a/databases/dbview/files/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
- # CFLAGS= -g -fomit-frame-pointer -Wall -pipe
- 
- # Look where your install program is
-@@ -32,12 +30,12 @@
- obj = db_dump.o dbview.o version.o
- 
- .c.o:
--	$(CC) ${CFLAGS} -c $*.c
-+	$(CC) ${CFLAGS} $(CPPFLAGS) -c $*.c
- 
- all:	dbview
- 
- dbview: $(obj)
--	$(CC) $(CFLAGS) -o dbview $(obj)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o dbview $(obj)
- 
- depend:
- 	makedepend *.c
diff --git a/databases/dbview/pkg-plist b/databases/dbview/pkg-plist
deleted file mode 100644
index 0c31fda20b89..000000000000
--- a/databases/dbview/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/dbview
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/dBASE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit v1.2.3