From e05af7b2d3b4700d968101c43be0cd905366067c Mon Sep 17 00:00:00 2001 From: jolan Date: Sat, 2 Aug 2003 01:41:43 +0000 Subject: [PATCH] make this respect ${PREFIX}/${SYSCONFDIR}, from Xavier Santolaria while here, also sync w/update-{patches,plist} --- archivers/freeze/Makefile | 9 ++++++++- archivers/freeze/patches/patch-Makefile_in | 16 +++++++++++----- archivers/freeze/patches/patch-configure | 7 ++++--- archivers/freeze/patches/patch-freeze_1 | 9 +++++---- .../patches/{patch-statist.1 => patch-statist_1} | 9 +++++---- archivers/freeze/pkg/PLIST | 10 +++++----- 6 files changed, 38 insertions(+), 22 deletions(-) rename archivers/freeze/patches/{patch-statist.1 => patch-statist_1} (54%) diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile index a1cdb0fe555..55e793d1024 100644 --- a/archivers/freeze/Makefile +++ b/archivers/freeze/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2003/05/24 01:09:59 jolan Exp $ +# $OpenBSD: Makefile,v 1.18 2003/08/02 01:41:43 jolan Exp $ COMMENT= "FREEZE / MELT compression program - often used in QNX" @@ -17,4 +17,11 @@ CONFIGURE_STYLE= gnu dest MAKE_FLAGS= CFLAGS="${CFLAGS} -I." NO_REGRESS= Yes +post-configure: + @perl -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile + @perl -pi -e 's|%%SYSCONFDIR%%|${SYSCONFDIR}|g' \ + ${WRKSRC}/Makefile \ + ${WRKSRC}/freeze.1 \ + ${WRKSRC}/statist.1 + .include diff --git a/archivers/freeze/patches/patch-Makefile_in b/archivers/freeze/patches/patch-Makefile_in index 465ec44d91c..795feb5c626 100644 --- a/archivers/freeze/patches/patch-Makefile_in +++ b/archivers/freeze/patches/patch-Makefile_in @@ -1,6 +1,7 @@ ---- Makefile.in.orig Wed Feb 24 08:36:56 1993 -+++ Makefile.in Sun Mar 26 15:52:20 2000 -@@ -15,6 +15,7 @@ +$OpenBSD: patch-Makefile_in,v 1.2 2003/08/02 01:41:43 jolan Exp $ +--- Makefile.in.orig 1993-02-24 14:36:56.000000000 +0100 ++++ Makefile.in 2003-08-01 08:29:26.000000000 +0200 +@@ -15,10 +15,11 @@ EXE = .PHONY: default @@ -8,7 +9,12 @@ default: prog # Added the prefix macro, so that it was easier to change installation place. -@@ -32,9 +33,9 @@ +-prefix = /usr/local ++prefix = %%PREFIX%% + DEST = $(prefix)/bin + MANDEST = $(prefix)/man/man1 + SEC = 1 +@@ -32,9 +33,9 @@ HDRS = bitio.h\ # define DEFFILE as a filename with freeze's default Huffman values # e.g. -DDEFFILE=\"/etc/default/freeze\" @@ -16,7 +22,7 @@ +# !!!! NOTE !!!! default is now /etc/freeze.cnf !!!!! -OPTIONS = -DDEFFILE=\"$(prefix)/lib/freeze.cnf\" -+OPTIONS = -DDEFFILE=\"/etc/freeze.cnf\" ++OPTIONS = -DDEFFILE=\"%%SYSCONFDIR%%/freeze.cnf\" LINTFLAGS = -DDEBUG -DGATHER_STAT -x -h diff --git a/archivers/freeze/patches/patch-configure b/archivers/freeze/patches/patch-configure index bd2471be178..401688a355e 100644 --- a/archivers/freeze/patches/patch-configure +++ b/archivers/freeze/patches/patch-configure @@ -1,6 +1,7 @@ ---- configure.orig Sat Dec 25 23:57:00 1999 -+++ configure Sat Dec 25 23:57:19 1999 -@@ -126,7 +126,6 @@ +$OpenBSD: patch-configure,v 1.2 2003/08/02 01:41:43 jolan Exp $ +--- configure.orig 1993-02-24 14:36:54.000000000 +0100 ++++ configure 2003-08-01 08:29:26.000000000 +0200 +@@ -126,7 +126,6 @@ EOF ${CC-cc} -E conftest.c > conftest.out 2>&1 if egrep yes conftest.out >/dev/null 2>&1; then GCC=1 # For later tests. diff --git a/archivers/freeze/patches/patch-freeze_1 b/archivers/freeze/patches/patch-freeze_1 index 09310fd83c1..3baa7497940 100644 --- a/archivers/freeze/patches/patch-freeze_1 +++ b/archivers/freeze/patches/patch-freeze_1 @@ -1,11 +1,12 @@ ---- freeze.1.orig Sun Dec 26 00:19:16 1999 -+++ freeze.1 Sun Dec 26 00:21:11 1999 -@@ -109,7 +109,7 @@ +$OpenBSD: patch-freeze_1,v 1.2 2003/08/02 01:41:43 jolan Exp $ +--- freeze.1.orig 1993-02-24 14:36:57.000000000 +0100 ++++ freeze.1 2003-08-01 08:32:50.000000000 +0200 +@@ -109,7 +109,7 @@ is a token preceded by a '+' or a '--', of following files in the command string. An explicite definition of the file's type can give up to 2% of additional compression. The list of types is stored in file -.IR /usr/local/lib/freeze.cnf . -+.IR /etc/freeze.cnf . ++.IR %%SYSCONFDIR%%/freeze.cnf . Types may be abbreviated while not ambigious. You can also determine values for the static Huffman table by using a list of 8 numbers separated by commas instead of diff --git a/archivers/freeze/patches/patch-statist.1 b/archivers/freeze/patches/patch-statist_1 similarity index 54% rename from archivers/freeze/patches/patch-statist.1 rename to archivers/freeze/patches/patch-statist_1 index 0dcfa1f3067..2ffdb4920c0 100644 --- a/archivers/freeze/patches/patch-statist.1 +++ b/archivers/freeze/patches/patch-statist_1 @@ -1,6 +1,7 @@ ---- statist.1.orig Sun Dec 26 00:19:25 1999 -+++ statist.1 Sun Dec 26 00:22:59 1999 -@@ -102,11 +102,8 @@ +$OpenBSD: patch-statist_1,v 1.1 2003/08/02 01:41:43 jolan Exp $ +--- statist.1.orig 1993-02-24 14:36:59.000000000 +0100 ++++ statist.1 2003-08-01 08:33:14.000000000 +0200 +@@ -102,11 +102,8 @@ results may be unusable). Other values ( percentiles and sigma) are FYI only. .PP You may create the @@ -9,7 +10,7 @@ -.IR /etc/default/ -directory, choose another - in MS-DOS it is FREEZE.CNF in -the directory of FREEZE.EXE), which has the following format: -+.IR /etc/freeze.cnf ++.IR %%SYSCONFDIR%%/freeze.cnf +file, which has the following format: .in +8 .I name diff --git a/archivers/freeze/pkg/PLIST b/archivers/freeze/pkg/PLIST index fce82dab434..2ba3663d905 100644 --- a/archivers/freeze/pkg/PLIST +++ b/archivers/freeze/pkg/PLIST @@ -1,11 +1,11 @@ -@comment $OpenBSD: PLIST,v 1.3 2000/06/10 19:00:59 brad Exp $ +@comment $OpenBSD: PLIST,v 1.4 2003/08/02 01:41:43 jolan Exp $ +bin/fcat bin/freeze bin/melt -bin/unfreeze -bin/fcat bin/statist +bin/unfreeze +man/man1/fcat.1 man/man1/freeze.1 man/man1/melt.1 -man/man1/unfreeze.1 -man/man1/fcat.1 man/man1/statist.1 +man/man1/unfreeze.1