diff options
| author | joerg <joerg@pkgsrc.org> | 2005-12-30 14:52:17 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2005-12-30 14:52:17 +0000 |
| commit | fc775895da4a4eca3e071b51f5adf55b43f2b71e (patch) | |
| tree | 4da2e670fdfe8e3bfae1a25e9ea2b2ac1890dde1 /www | |
| parent | d4d4ff95b70abdd9be644ee6d515a91dfc09cbcf (diff) | |
| download | pkgsrc-fc775895da4a4eca3e071b51f5adf55b43f2b71e.tar.gz | |
Fix DragonFly. Use C++ compiler for linkage and add a snippish comment
about the incorrect comment in the Makefile.
Diffstat (limited to 'www')
| -rw-r--r-- | www/squidpurge/distinfo | 6 | ||||
| -rw-r--r-- | www/squidpurge/patches/patch-aa | 10 | ||||
| -rw-r--r-- | www/squidpurge/patches/patch-ac | 21 |
3 files changed, 25 insertions, 12 deletions
diff --git a/www/squidpurge/distinfo b/www/squidpurge/distinfo index 262feb2bd4d..ab9a94a87d1 100644 --- a/www/squidpurge/distinfo +++ b/www/squidpurge/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/10/11 00:45:39 gdt Exp $ +$NetBSD: distinfo,v 1.2 2005/12/30 14:52:17 joerg Exp $ SHA1 (purge-20040201-src.tar.gz) = 9347ead8f1444c7c8d1828e0c8ff8bd0ca5e0891 RMD160 (purge-20040201-src.tar.gz) = c98c146223d6322850e7203af2b074a40440184a Size (purge-20040201-src.tar.gz) = 30572 bytes -SHA1 (patch-aa) = 89c9636fc0768b83dbfb3049df472e75e0ccffed +SHA1 (patch-aa) = cb01736e19a00eaaec18c5e4f61b20ca1609eb1b SHA1 (patch-ab) = c461769a7eae2f249ec3b8acb4fe40b42f2f411b -SHA1 (patch-ac) = 5d5ed1c0363ba29b9622f7541f2ac1e891fb65b6 +SHA1 (patch-ac) = d18823eca80d17a9c3768df5ffd515508b38f38c diff --git a/www/squidpurge/patches/patch-aa b/www/squidpurge/patches/patch-aa index dee27ec43ee..134bf7be72a 100644 --- a/www/squidpurge/patches/patch-aa +++ b/www/squidpurge/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/10/11 00:45:39 gdt Exp $ +$NetBSD: patch-aa,v 1.2 2005/12/30 14:52:17 joerg Exp $ ---- purge.cc.~1~ 2000-09-21 09:05:31.000000000 -0400 -+++ purge.cc 2005-10-09 19:53:58.000000000 -0400 -@@ -121,7 +121,7 @@ +--- purge.cc.orig 2000-09-21 13:05:31.000000000 +0000 ++++ purge.cc +@@ -121,7 +121,7 @@ typedef int bool; #include <signal.h> #include <errno.h> -#if defined(HAS_PSIGNAL) && !defined(LINUX) && !defined(FREEBSD) -+#if defined(HAS_PSIGNAL) && !defined(LINUX) && !defined(FREEBSD) && !defined(NETBSD) ++#if defined(HAS_PSIGNAL) && !defined(LINUX) && !defined(FREEBSD) && !defined(NETBSD) && !defined(DRAGONFLY) #include <siginfo.h> #endif // HAS_PSIGNAL diff --git a/www/squidpurge/patches/patch-ac b/www/squidpurge/patches/patch-ac index b99a42592d1..9154328c108 100644 --- a/www/squidpurge/patches/patch-ac +++ b/www/squidpurge/patches/patch-ac @@ -1,11 +1,24 @@ -$NetBSD: patch-ac,v 1.1.1.1 2005/10/11 00:45:39 gdt Exp $ +$NetBSD: patch-ac,v 1.2 2005/12/30 14:52:17 joerg Exp $ ---- Makefile.~1~ 2000-09-21 09:05:31.000000000 -0400 -+++ Makefile 2005-10-09 19:59:19.000000000 -0400 -@@ -77,6 +77,11 @@ +--- Makefile.orig 2000-09-21 13:05:31.000000000 +0000 ++++ Makefile +@@ -17,7 +17,7 @@ + # + CXX = g++ -ffor-scope -DHAS_BOOL -DHAS_PSIGNAL + CC = gcc +-LD = $(CC) # yes, I do mean gcc and not g++ ++LD = $(CXX) # yes, I do mean gcc and not g++ # and yes, this is clueless + CXXFLAGS = # -pg -g # -fprofile-arcs -ftest-coverage + SYSTEM = $(shell uname -s | tr '[a-z]' '[A-Z]' | tr -d '_ -/') + CPU = $(shell uname -p) +@@ -77,6 +77,15 @@ ifeq (FREEBSD,${SYSTEM}) SOCKLEN = socklen_t endif ++ifeq (DRAGONFLY,${SYSTEM}) ++SOCKLEN = socklen_t ++endif ++ +ifeq (NETBSD,${SYSTEM}) +SOCKLEN = socklen_t +LD = $(CXX) |