From 17e2f783eec0863004e0bd9ef05f75ba8513e89d Mon Sep 17 00:00:00 2001
From: Volker Stolz <vs@FreeBSD.org>
Date: Thu, 21 Apr 2005 12:13:59 +0000
Subject: Use MAKE_ARGS & PLIST_FILES

---
 misc/viz/Makefile       |  7 +++++
 misc/viz/files/patch-aa | 70 -------------------------------------------------
 misc/viz/pkg-plist      |  2 --
 3 files changed, 7 insertions(+), 72 deletions(-)
 delete mode 100644 misc/viz/pkg-plist

(limited to 'misc/viz')

diff --git a/misc/viz/Makefile b/misc/viz/Makefile
index 1491cfc8c40a..cffcaa8ce022 100644
--- a/misc/viz/Makefile
+++ b/misc/viz/Makefile
@@ -15,6 +15,13 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert invisible (binary) characters to a visible form
 
+MAKE_ARGS=	CC="${CC}" DEFS="${CFLAGS}"
+
 MAN1=		viz.1 inviz.1
+PLIST_FILES=	bin/viz bin/inviz
+
+do-install:
+		cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_FILES:T} ${PREFIX}/bin/
+		cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1/
 
 .include <bsd.port.mk>
diff --git a/misc/viz/files/patch-aa b/misc/viz/files/patch-aa
index 83763318329d..36421917ffbd 100644
--- a/misc/viz/files/patch-aa
+++ b/misc/viz/files/patch-aa
@@ -1,73 +1,3 @@
---- Makefile.patched	Sat Mar  8 18:07:20 1997
-+++ Makefile	Sat Mar  8 18:08:02 1997
-@@ -1,42 +1,30 @@
- #######
--# Where the executable goes
--BINDIR=/usr/local/bin
--
--#######
--# Man pages
--
--MANDIR=/usr/local/man/man1
--MANEXT=1
--
--#######
- # CC
--CC=gcc
-+CC=cc
- 
- #######
- # Define's
- # Define STRINGS if <strings.h> is to be used in place of <string.h>
- # Define NOMEM if <memory.h> isn't available.
- # Define EBCDIC if that character set is used.
--DEFS =  -D_HPUX_SOURCE # -DNOMEM -DSTRINGS # -DEBCDIC
-+DEFS = # -D_HPUX_SOURCE # -DNOMEM -DSTRINGS # -DEBCDIC
- 
-+#######
- # Sizes of shorts, ints, longs.  (This has to be a #define: the sizeof
- # operator isn't sufficient because we need to use the sizes in the argument
- # to a #if expression.)
- SIZES = -DL_SHORT=2 -DL_INT=4 -DL_LONG=4
- 
--
- #######
- # CFLAGS
- # Always keep $(DEFS) and $(SIZES) in CFLAGS
--CFLAGS = -O $(DEFS) $(SIZES)
-+CFLAGS+= $(DEFS) $(SIZES)
- 
- #######
- # LDFLAGS,LDLIBS
--
- LDFLAGS=
- LDLIBS=
- 
--
- ####################################################################
- # You shouldn't have to modify anything below this line.
- ####################################################################
-@@ -89,15 +77,13 @@
- 	$(CC) $(CFLAGS) -c inviz_num.c
- 
- install: viz inviz
--	cp viz $(BINDIR) && chmod 755 $(BINDIR)/viz
--	cp inviz $(BINDIR) && chmod 755 $(BINDIR)/inviz
--	cp viz.1 $(MANDIR)/viz.$(MANEXT) && \
--		chmod 644 $(MANDIR)/viz.$(MANEXT)
--	cp inviz.1 $(MANDIR)/inviz.$(MANEXT) && \
--		chmod 644 $(MANDIR)/inviz.$(MANEXT)
-+	install -c -s -m 755 viz $(PREFIX)/bin/viz
-+	install -c -s -m 755 inviz $(PREFIX)/bin/inviz
-+	install -c -m 644 viz.1 $(PREFIX)/man/man1/viz.1
-+	install -c -m 644 inviz.1 $(PREFIX)/man/man1/inviz.1
- 
- clean:
--	rm -f *.o viz inviz y.tab.c y.tab.h
-+	rm -f *.o viz inviz y.tab.c y.tab.h vizgrammar.c
- 
- # Because of the wide variation in shar commands, the shar arguments
- # used below sticks to a minimal set, and we generate various shar file
 --- viz.c.patched	Sat Mar  8 18:07:20 1997
 +++ viz.c	Sat Mar  8 18:07:26 1997
 @@ -55,14 +55,17 @@
diff --git a/misc/viz/pkg-plist b/misc/viz/pkg-plist
deleted file mode 100644
index d32b4c952413..000000000000
--- a/misc/viz/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/viz
-bin/inviz
-- 
cgit v1.2.3