summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2001-05-01 06:55:51 +0000
committerjlam <jlam>2001-05-01 06:55:51 +0000
commit83f6e5aacd3aa6545dba230bb6236b6dd8541637 (patch)
treeeaa33e0c0d5ec64aa0104f09277e4ddde5b9680a
parent7f020445b93caaa0b129b62b2031b5b575c21784 (diff)
downloadpkgsrc-83f6e5aacd3aa6545dba230bb6236b6dd8541637.tar.gz
Honor CFLAGS passed in from the environment during the build. Also convert
from a context diff to a unidiff as per pkgsrc standards.
-rw-r--r--mail/cucipop/distinfo4
-rw-r--r--mail/cucipop/patches/patch-ad66
2 files changed, 28 insertions, 42 deletions
diff --git a/mail/cucipop/distinfo b/mail/cucipop/distinfo
index bc007b3444e..59c4a20f3d9 100644
--- a/mail/cucipop/distinfo
+++ b/mail/cucipop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:09:55 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/01 06:55:51 jlam Exp $
SHA1 (cucipop-1.31.tar.gz) = d9b5dc2960e96ad1ee63f0a6f8879165f4477434
Size (cucipop-1.31.tar.gz) = 35508 bytes
@@ -7,5 +7,5 @@ Size (cucipop-1.31-v6-20010223.diff.gz) = 1713 bytes
SHA1 (patch-aa) = baf7a7a262d8d50d404bcc1eed9fe8da72a7b927
SHA1 (patch-ab) = 2f021113d2634065034065aba0afd06b7a403cb1
SHA1 (patch-ac) = a44452d25e33d3090cdf85ab6d76405fcbf28746
-SHA1 (patch-ad) = 702e1be8b6ff53da9d26d764f772b0dc4b23a7b7
+SHA1 (patch-ad) = 5cc45c1f41f41fcf9da0c07d65c3ed3489c0cfe8
SHA1 (patch-ae) = 30715d0e00ed4862601ea0cb69fdb797a9eb234a
diff --git a/mail/cucipop/patches/patch-ad b/mail/cucipop/patches/patch-ad
index b28bc03432a..a9b507c84c3 100644
--- a/mail/cucipop/patches/patch-ad
+++ b/mail/cucipop/patches/patch-ad
@@ -1,41 +1,27 @@
-$NetBSD: patch-ad,v 1.3 2000/11/22 13:05:59 itojun Exp $
+$NetBSD: patch-ad,v 1.4 2001/05/01 06:55:52 jlam Exp $
-*** Makefile.orig Tue May 12 22:09:14 1998
---- Makefile Tue Jul 21 11:16:26 1998
-***************
-*** 2,4 ****
-
-! BASENAME= /usr
-
---- 2,4 ----
-
-! BASENAME= ${PREFIX}
-
-***************
-*** 12,18 ****
-
-! CFLAGS = -O -DUSE_DB #$(GCC_WARNINGS)
-! LDFLAGS = -lcrypt -ldb2
-
- # If you change this, edit config.h as well
-! CUCIPOPLIB=/var/lib/cucipop
- CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
---- 12,18 ----
-
-! CFLAGS = -O ${CFLAGS_INET6} #-DUSE_DB $(GCC_WARNINGS)
-! LDFLAGS = -lcrypt
-
- # If you change this, edit config.h as well
-! CUCIPOPLIB=${PREFIX}/share/cucipop
- CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
-***************
-*** 24,27 ****
-
-! INSTALL=install -o root -m
-! BINPERM=02755 -s -g mail
- REGPERM=0644
---- 24,27 ----
-
-! INSTALL=install -c -o root -m
-! BINPERM=02755 -s -g wheel
- REGPERM=0644
+--- Makefile.orig Tue May 12 17:09:14 1998
++++ Makefile
+@@ -2,3 +2,3 @@
+
+-BASENAME= /usr
++BASENAME= ${PREFIX}
+
+@@ -12,7 +12,7 @@
+
+-CFLAGS = -O -DUSE_DB #$(GCC_WARNINGS)
+-LDFLAGS = -lcrypt -ldb2
++CFLAGS += -O ${CFLAGS_INET6} #-DUSE_DB $(GCC_WARNINGS)
++LDFLAGS += -lcrypt
+
+ # If you change this, edit config.h as well
+-CUCIPOPLIB=/var/lib/cucipop
++CUCIPOPLIB=${PREFIX}/share/cucipop
+ CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
+@@ -24,4 +24,4 @@
+
+-INSTALL=install -o root -m
+-BINPERM=02755 -s -g mail
++INSTALL=install -c -o root -m
++BINPERM=02755 -s -g wheel
+ REGPERM=0644