diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2011-11-01 14:47:09 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2011-11-01 14:47:09 +0000 |
| commit | 0fc8c6c52da176a94f3a7daa5cabba27aeafc263 (patch) | |
| tree | 1277275c7d85fda940047c922023500948e9593b | |
| parent | b4475ae4cccbfab75cfb4fe1cc212a4984fe61ee (diff) | |
| download | pkgsrc-0fc8c6c52da176a94f3a7daa5cabba27aeafc263.tar.gz | |
Do not link against -lcrypt on MirBSD, fixes the build.
| -rw-r--r-- | mail/cucipop/Makefile | 10 | ||||
| -rw-r--r-- | mail/cucipop/distinfo | 4 | ||||
| -rw-r--r-- | mail/cucipop/patches/patch-ad | 12 |
3 files changed, 16 insertions, 10 deletions
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile index c3613f7aa53..1479eca718b 100644 --- a/mail/cucipop/Makefile +++ b/mail/cucipop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2010/02/19 19:22:33 joerg Exp $ +# $NetBSD: Makefile,v 1.34 2011/11/01 14:47:09 bsiegert Exp $ # DISTNAME= cucipop-1.31 @@ -40,13 +40,19 @@ PKG_SUPPORTED_OPTIONS= db inet6 .include "../../mk/bsd.prefs.mk" .include "../../mk/bsd.options.mk" +.if ${OPSYS} != "MirBSD" +LIBS+= -lcrypt +.endif + .if !empty(PKG_OPTIONS:Mdb) BDB_ACCEPTED= db2 CFLAGS+= -DUSE_DB -MAKE_ENV+= LIBS=${BDB_LIBS:Q} +LIBS+= ${BDB_LIBS} . include "../../mk/bdb.buildlink3.mk" .endif +MAKE_ENV+= LIBS=${LIBS:Q} + .if !empty(PKG_OPTIONS:Minet6) MAKE_ENV+= CFLAGS_INET6=-DINET6 .endif diff --git a/mail/cucipop/distinfo b/mail/cucipop/distinfo index d86c82fb7ed..553c15d5309 100644 --- a/mail/cucipop/distinfo +++ b/mail/cucipop/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2007/06/19 21:07:42 jlam Exp $ +$NetBSD: distinfo,v 1.10 2011/11/01 14:47:09 bsiegert Exp $ SHA1 (cucipop-1.31.tar.gz) = d9b5dc2960e96ad1ee63f0a6f8879165f4477434 RMD160 (cucipop-1.31.tar.gz) = dbca1b313a755544578f89586c200a0227858f92 @@ -9,7 +9,7 @@ Size (cucipop-1.31-v6-20010223.diff.gz) = 1713 bytes SHA1 (patch-aa) = baf7a7a262d8d50d404bcc1eed9fe8da72a7b927 SHA1 (patch-ab) = 3dcbfb7525bd59a1a5ede8cabe286f1bc3704cca SHA1 (patch-ac) = 5d768b6b0badf8357bdb6668efb144bc14f98318 -SHA1 (patch-ad) = 3755ac6cfd60c192eff2fe406c4ff8e9daba43f9 +SHA1 (patch-ad) = bd7707134264129c548ce7d93dbaa96ec61637be SHA1 (patch-ae) = 30715d0e00ed4862601ea0cb69fdb797a9eb234a SHA1 (patch-af) = 3521a623741f7dda8d8c837e9dd46e070b1719a4 SHA1 (patch-ag) = 9c6bb228b5a00ef241cd3edd57a7d523f5474f42 diff --git a/mail/cucipop/patches/patch-ad b/mail/cucipop/patches/patch-ad index 2a7565591a1..dfb0a72c095 100644 --- a/mail/cucipop/patches/patch-ad +++ b/mail/cucipop/patches/patch-ad @@ -1,31 +1,31 @@ -$NetBSD: patch-ad,v 1.6 2007/06/19 21:07:42 jlam Exp $ +$NetBSD: patch-ad,v 1.7 2011/11/01 14:47:09 bsiegert Exp $ ---- Makefile.orig 1998-05-12 17:09:14.000000000 -0400 +--- Makefile.orig Tue May 12 21:08:53 1998 +++ Makefile @@ -2,3 +2,3 @@ -BASENAME= /usr +BASENAME= ${PREFIX} -@@ -12,7 +12,7 @@ GCC_WARNINGS = -O2 -pedantic -Wreturn-ty +@@ -12,4 +12,3 @@ GCC_WARNINGS = -O2 -pedantic -Wreturn-ty -CFLAGS = -O -DUSE_DB #$(GCC_WARNINGS) -LDFLAGS = -lcrypt -ldb2 +CFLAGS += -O ${CFLAGS_INET6} #-DUSE_DB $(GCC_WARNINGS) -+LDFLAGS += -lcrypt +@@ -16,3 +15,3 @@ LDFLAGS = -lcrypt -ldb2 # If you change this, edit config.h as well -CUCIPOPLIB=/var/lib/cucipop +CUCIPOPLIB=${PREFIX}/share/cucipop CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins -@@ -24,6 +24,2 @@ MANDIR=$(BASENAME)/man/man8 +@@ -24,6 +23,2 @@ MANDIR=$(BASENAME)/man/man8 -INSTALL=install -o root -m -BINPERM=02755 -s -g mail -REGPERM=0644 - # -@@ -70,4 +66,4 @@ $(MD5_OBJ): md5/md5c.c md5/md5.h +@@ -70,4 +65,4 @@ $(MD5_OBJ): md5/md5c.c md5/md5.h install: $(BINS) $(MANS) - $(INSTALL) $(BINPERM) $(BINS) $(BINDIR) - $(INSTALL) $(REGPERM) $(MANS) $(MANDIR) |