diff options
| author | salo <salo@pkgsrc.org> | 2003-01-19 08:45:38 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2003-01-19 08:45:38 +0000 |
| commit | 14294bfccbc60560cc73001e399c73273ca5913f (patch) | |
| tree | e92672c6ac7fc227c6a6a125629bd3e517d2b4b6 /print/pnm2ppa/patches | |
| parent | 480a55521d98cf99c92b31374a728621e7d46f42 (diff) | |
| download | pkgsrc-14294bfccbc60560cc73001e399c73273ca5913f.tar.gz | |
Improve package a bit:
- s/INSTALL_*/BSD_INSTALL_*/ in patch-aa, remove unnecessary MAKE_ENV
- use PKG_SYSCONFDIR and use bsd.pkg.install.mk for configuration file
- fix /etc -> PKG_SYSCONFDIR in documentation
- install more documentation
Bump PKGREVISION.
Diffstat (limited to 'print/pnm2ppa/patches')
| -rw-r--r-- | print/pnm2ppa/patches/patch-aa | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/print/pnm2ppa/patches/patch-aa b/print/pnm2ppa/patches/patch-aa index 4a53b1fd452..59d0a0a4a72 100644 --- a/print/pnm2ppa/patches/patch-aa +++ b/print/pnm2ppa/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/04/28 03:10:59 kei Exp $ +$NetBSD: patch-aa,v 1.2 2003/01/19 08:45:39 salo Exp $ ---- Makefile.orig Fri Nov 3 03:33:08 2000 -+++ Makefile Fri Apr 27 17:00:51 2001 +--- Makefile.orig Thu Nov 2 19:33:08 2000 ++++ Makefile Sun Jan 19 09:01:19 2003 @@ -2,16 +2,17 @@ # Makefile for pnm2ppa # @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/28 03:10:59 kei Exp $ -CONFDIR=/etc -MANDIR=/usr/local/man/man1 +INSTALLDIR=${PREFIX}/bin -+CONFDIR=${PREFIX}/etc ++CONFDIR=${PKG_SYSCONFDIR} +MANDIR=${PREFIX}/man/man1 -CC=gcc @@ -19,37 +19,34 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/28 03:10:59 kei Exp $ +#INSTALL=install # production build --CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG --LDFLAGS=-lm +CPPFLAGS=-I${PREFIX}/include -+CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG + CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG +-LDFLAGS=-lm +LDFLAGS=-lm #-L${PREFIX}/lib -R${PREFIX}/lib OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o SRC = pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c -@@ -89,23 +90,23 @@ +@@ -89,23 +90,21 @@ install: pnm2ppa calibrate_ppa - $(INSTALL) -m 755 pnm2ppa $(INSTALLDIR) - $(INSTALLD) $(MANDIR) - $(INSTALL) -m 644 docs/en/pnm2ppa.1 $(MANDIR) -+ ${INSTALL_PROGRAM} -m 755 pnm2ppa $(INSTALLDIR) -+ ${INSTALL_MAN} -m 644 docs/en/pnm2ppa.1 $(MANDIR) ++ ${BSD_INSTALL_PROGRAM} -m 755 pnm2ppa $(INSTALLDIR) ++ ${BSD_INSTALL_MAN} -m 644 docs/en/pnm2ppa.1 $(MANDIR) # development only - allows root to edit - $(INSTALL) -m 644 pnm2ppa.conf $(CONFDIR) -+ ${INSTALL_DATA} -m 644 pnm2ppa.conf $(CONFDIR)/pnm2ppa.conf.default ++ ${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/examples/pnm2ppa ++ ${BSD_INSTALL_DATA} -m 644 pnm2ppa.conf $(PREFIX)/share/examples/pnm2ppa/pnm2ppa.conf.default # calibration tool - $(INSTALL) -m 755 calibrate_ppa $(INSTALLDIR) -+ ${INSTALL_PROGRAM} -m 755 calibrate_ppa $(INSTALLDIR) ++ ${BSD_INSTALL_PROGRAM} -m 755 calibrate_ppa $(INSTALLDIR) # final production - much tighter -# $(INSTALL) -m 444 pnm2ppa.conf $(CONFDIR) - @@echo - @@echo Now, edit /etc/pnm2ppa.conf to choose your printer -+# ${INSTALL_DATA} -m 444 pnm2ppa.conf $(CONFDIR)/pnm2ppa.conf.default -+ @${ECHO} -+ @${ECHO} Now, copy ${CONFDIR}/pnm2ppa.conf.default to /etc/pnm2ppa.conf -+ @${ECHO} and edit to choose your printer ++# ${BSD_INSTALL_DATA} -m 444 pnm2ppa.conf $(CONFDIR)/pnm2ppa.conf.default uninstall: rm -f $(INSTALLDIR)/pnm2ppa |