From b546178b612eea0ba3898bafe8f20c87a75c139d Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 6 Apr 2006 16:16:38 +0000 Subject: Override sysconfdir at install time instead of patching the Makefile to install the example config files into the examples directory. --- print/enscript/Makefile | 6 ++++-- print/enscript/distinfo | 3 +-- print/enscript/patches/patch-ac | 13 ------------- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 print/enscript/patches/patch-ac (limited to 'print/enscript') diff --git a/print/enscript/Makefile b/print/enscript/Makefile index f0a35e229fb..763e7d2794b 100644 --- a/print/enscript/Makefile +++ b/print/enscript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/03/04 21:30:28 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2006/04/06 16:16:38 jlam Exp $ # DISTNAME= enscript-1.6.3 @@ -20,10 +20,12 @@ INFO_FILES= enscript.info EGDIR= ${PREFIX}/share/examples/enscript CONF_FILES= ${EGDIR}/enscript.cfg ${PKG_SYSCONFDIR}/enscript.cfg +INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} .include "../../mk/bsd.prefs.mk" + .if defined(PAPERSIZE) -CONFIGURE_ARGS+=--with-media=${PAPERSIZE:Q} +CONFIGURE_ARGS+= --with-media=${PAPERSIZE:Q} .endif .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/print/enscript/distinfo b/print/enscript/distinfo index 42279512559..c103d0d0f50 100644 --- a/print/enscript/distinfo +++ b/print/enscript/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.5 2005/03/17 12:24:13 salo Exp $ +$NetBSD: distinfo,v 1.6 2006/04/06 16:16:38 jlam Exp $ SHA1 (enscript-1.6.3.tar.gz) = 2189c1f9b80160d4b2acac0f60cc7c7ff05f10aa RMD160 (enscript-1.6.3.tar.gz) = 7aafd03dad2e9a1fb3bbf61ed9b95ed6bef02921 Size (enscript-1.6.3.tar.gz) = 814308 bytes SHA1 (patch-aa) = 4f958c8e2b01cf6934beebe249f1f67da2fb3f11 SHA1 (patch-ab) = 13885dbd3aa0d0e90f8aa07640c4d917d7feaf13 -SHA1 (patch-ac) = 9d4d412e3016b7490741f7c6ba31d43b2be1465b SHA1 (patch-ad) = b2f12cc6875289978194315927ccbc8e963476a2 SHA1 (patch-ae) = 9a3209196eea1c6ed1f07f39fb7b4f1c35cdb850 diff --git a/print/enscript/patches/patch-ac b/print/enscript/patches/patch-ac deleted file mode 100644 index 8665ad0151e..00000000000 --- a/print/enscript/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/05/01 12:58:16 jmmv Exp $ - ---- lib/Makefile.in.orig 1998-07-01 11:28:28.000000000 +0200 -+++ lib/Makefile.in -@@ -49,7 +49,7 @@ bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ --sysconfdir = @sysconfdir@ -+sysconfdir = @datadir@/examples/@PACKAGE@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ -- cgit v1.2.3