- Remove ugly "configure" hack, use patches and "MAKEFILE" instead.

- Make this package work under Solaris.

4 files changed, 62 insertions, 26 deletions

diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index fb8d8f590d7..fd2a588ccfe 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/02/17 17:51:53 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/07/10 17:27:18 tron Exp $
 # FreeBSD Id: Makefile,v 1.15 1998/01/08 18:52:13 fenner Exp
 #
 
@@ -18,11 +18,10 @@ USE_PERL5=	yes
 .include "../../mk/bsd.prefs.mk"
 
 PAPERSIZE?=	A4
-MAKE_FLAGS+=	PAPER=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`
 
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	CPPFLAGS=
-.endif
+MAKE_ENV+=	CC="${CC}" PERL5="${PERL5}"
+MAKE_FLAGS+=	PAPER=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`
+MAKEFILE=	Makefile.unix
 
 pre-configure:
 	@case "X${PAPERSIZE}" in					\
diff --git a/print/psutils/distinfo b/print/psutils/distinfo
index 1db580ac24d..8c7da5ac9d4 100644
--- a/print/psutils/distinfo
+++ b/print/psutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/05/08 15:35:32 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/10 17:27:18 tron Exp $
 
 SHA1 (psutils-p17.tar.gz) = 6f1ecb5846cffb644826a02bd9153fe5d6387a9b
 Size (psutils-p17.tar.gz) = 62039 bytes
@@ -9,4 +9,4 @@ SHA1 (patch-ad) = 74bd84ae49127e5e7e69eca4025927e230d4521f
 SHA1 (patch-ae) = d6ed0910d6b2b6f43ffe1fa29c35543bb4b9855c
 SHA1 (patch-af) = 4452ec086be0abe895a48b2684f7e4afe65cf25c
 SHA1 (patch-ag) = a07233adb18ffa01999449935fce96983626e7c9
-SHA1 (patch-ah) = f69ac24e0fba9cdccf0e97db65e957b623c8fa0c
+SHA1 (patch-ah) = de2adaa4b76eacc6e8b08fa4c34225d550ac7ad4
diff --git a/print/psutils/patches/patch-ah b/print/psutils/patches/patch-ah
index 50829dab821..4b6d1174535 100644
--- a/print/psutils/patches/patch-ah
+++ b/print/psutils/patches/patch-ah
@@ -1,13 +1,64 @@
-$NetBSD: patch-ah,v 1.1 2001/01/11 01:53:28 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2001/07/10 17:27:18 tron Exp $
 
 --- Makefile.unix.orig	Tue Mar 11 23:52:59 1997
-+++ Makefile.unix
-@@ -39,7 +39,7 @@
- MANDIR = /usr/local/share/man/man$(MANEXT)
++++ Makefile.unix	Tue Jul 10 19:24:33 2001
+@@ -25,21 +25,19 @@
  
- CC = gcc
+ OS = UNIX
+ 
+-BINDIR = /usr/local/bin
++BINDIR = $(PREFIX)/bin
+ SCRIPTDIR = $(BINDIR)
+-INCLUDEDIR = /usr/local/share/psutils
+-PERL = /usr/local/bin/perl
++INCLUDEDIR = $(PREFIX)/share/psutils
++PERL = $(PERL5)
+ 
+ BINMODE = 0755
+ MANMODE = 0644
+ CHMOD = chmod
+-INSTALL = install -c -m $(BINMODE)
+-INSTALLMAN = install -c -m $(MANMODE)
+ MANEXT = 1
+-MANDIR = /usr/local/share/man/man$(MANEXT)
++MANDIR = $(PREFIX)/man/man1
+ 
+-CC = gcc
 -CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
++#CC = gcc
 +CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall
  
  BIN = psbook psselect pstops epsffit psnup \
  	psresize
+@@ -222,27 +220,27 @@
+ 	-mkdir $(BINDIR)
+ 	@for i in $(BIN); do \
+ 		echo Installing $$i; \
+-		$(INSTALL) $$i $(BINDIR); \
++		$(BSD_INSTALL_PROGRAM) $$i $(BINDIR); \
+ 	done
+ 
+ install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS)
+ 	-mkdir $(SCRIPTDIR)
+ 	@for i in $(PERLSCRIPTS) $(SHELLSCRIPTS); do \
+ 		echo Installing $$i; \
+-		$(INSTALL) $$i $(SCRIPTDIR); \
++		$(BSD_INSTALL_SCRIPT) $$i $(SCRIPTDIR); \
+ 	done
+ 
+ install.include: $(INCLUDES)
+ 	-mkdir $(INCLUDEDIR)
+ 	@for i in $(INCLUDES); do \
+ 		echo Installing $$i; \
+-		$(INSTALLMAN) $$i $(INCLUDEDIR); \
++		$(BSD_INSTALL_DATA) $$i $(INCLUDEDIR); \
+ 	done
+ 
+ install.man: $(MANPAGES)
+ 	-mkdir $(MANDIR)
+ 	@for i in $(MANPAGES); do \
+ 		echo Installing manual page for $$i; \
+-		$(INSTALLMAN) $$i $(MANDIR)/$$i; \
++		$(BSD_INSTALL_MAN) $$i $(MANDIR)/$$i; \
+ 	done
+ 
diff --git a/print/psutils/scripts/configure b/print/psutils/scripts/configure
deleted file mode 100644
index bd10efcf4d1..00000000000
--- a/print/psutils/scripts/configure
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: configure,v 1.3 1998/08/07 11:11:28 agc Exp $
-#
-cd $WRKSRC || exit 1
-cp Makefile.unix Makefile
-cat >>Makefile<<END
-BINDIR = $PREFIX/bin
-INCLUDEDIR = $PREFIX/share/psutils
-MANDIR =$PREFIX/man/man1
-PERL = $PREFIX/bin/perl
-CC=cc
-END
-exit 0