diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-01-03 22:22:09 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-01-03 22:22:09 +0000 |
| commit | 060bbbe7aa50cc45c939e159e97174c0c8ba657b (patch) | |
| tree | 8783fb7b229a6eb680610e25ec39984027bcbb20 /time/cal/patches | |
| parent | fa71a1df12170f68f5a76e4a16658d6cc8045a1e (diff) | |
| download | pkgsrc-060bbbe7aa50cc45c939e159e97174c0c8ba657b.tar.gz | |
Make this package install its configuration files under the examples tree
and honor PKG_SYSCONFDIR.
Also sync PLIST with reality: manpage is installed uncompressed.
Bump PKGREVISION to 1.
Diffstat (limited to 'time/cal/patches')
| -rw-r--r-- | time/cal/patches/patch-aa | 28 | ||||
| -rw-r--r-- | time/cal/patches/patch-ab | 17 |
2 files changed, 19 insertions, 26 deletions
diff --git a/time/cal/patches/patch-aa b/time/cal/patches/patch-aa index b60ee237228..015ad0294bb 100644 --- a/time/cal/patches/patch-aa +++ b/time/cal/patches/patch-aa @@ -1,17 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:09 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2003/01/03 22:22:10 jmmv Exp $ -*** makefile.unx.orig Tue Mar 5 06:36:27 1996 ---- makefile.unx Mon May 12 15:23:42 1997 -*************** -*** 10,15 **** ---- 10,19 ---- - CC=gcc - CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER - -+ .ifdef PREFIX -+ CFLAGS+=-DPREFIX="\"${PREFIX}\"" -+ .endif -+ - BINDIR=/usr/bin - MANDIR=/usr/man - +--- makefile.unx.orig Mon Mar 4 22:36:27 1996 ++++ makefile.unx +@@ -8,7 +8,7 @@ + + RM=rm -f + CC=gcc +-CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER ++CFLAGS+=-O -Wall -DUNIX -DUSE_REMINDER + + BINDIR=/usr/bin + MANDIR=/usr/man diff --git a/time/cal/patches/patch-ab b/time/cal/patches/patch-ab index 538f453a3b7..59fcb26946b 100644 --- a/time/cal/patches/patch-ab +++ b/time/cal/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:10 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2003/01/03 22:22:11 jmmv Exp $ --- cal.c.orig Thu Jul 11 21:36:33 1996 -+++ cal.c Thu Oct 23 14:37:49 1997 -@@ -122,6 +122,7 @@ ++++ cal.c +@@ -122,6 +122,7 @@ BASIC DATA STRUCTURE: #include <ctype.h> #include <string.h> #include <sys/types.h> @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:10 wiz Exp $ #ifndef max #define max(a,b) (((a)>(b))?(a):(b)) -@@ -130,6 +131,10 @@ +@@ -130,6 +131,10 @@ BASIC DATA STRUCTURE: /* Note: Other unix systems may require this next re-define to work. */ /* I believe that SCO is one such system. Please send in any fixes */ /* needed to get your system running. */ @@ -21,17 +21,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:10 wiz Exp $ #ifdef __linux__ /* Make linux compatible with stricmp() */ #define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */ #endif -@@ -1401,8 +1406,12 @@ +@@ -1401,8 +1406,8 @@ FILE *efopen(const char *file, const cha strcpy(str, "."); strcpy(str, file); if ((fp = fopen(str, mode)) == NULL) { - /* If still not found then look in a lib directory */ +- strcpy(str, "/usr/lib/"); + /* If still not found then look in config directory */ -+#ifdef PREFIX -+ strcpy(str, PREFIX "/etc/cal/"); -+#else - strcpy(str, "/usr/lib/"); -+#endif ++ strcpy(str, PKG_SYSCONFDIR "/"); strcat(str,file); fp = fopen(str, mode); } |