summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-02-20 13:31:19 +0000
committerjoerg <joerg@pkgsrc.org>2007-02-20 13:31:19 +0000
commitbd336963f59f896ff400554cff49d9304a96f2ad (patch)
treefb46cc8ceb1aeb7a20a848850b31a86d04b5c5b9
parent114317f32cb67faa684e27397d7f7137a496c1e9 (diff)
downloadpkgsrc-bd336963f59f896ff400554cff49d9304a96f2ad.tar.gz
All pkgsrc systems share the bsd.prog.mk from NetBSD.
-rw-r--r--net/csup/distinfo4
-rw-r--r--net/csup/patches/patch-ab39
2 files changed, 29 insertions, 14 deletions
diff --git a/net/csup/distinfo b/net/csup/distinfo
index 6e64432f691..539f41089d4 100644
--- a/net/csup/distinfo
+++ b/net/csup/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/16 12:06:39 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2007/02/20 13:31:19 joerg Exp $
SHA1 (csup-snap-20070216.tar.gz) = b2a5b5a95496f166caa6f4c03003fe354a4e76c2
RMD160 (csup-snap-20070216.tar.gz) = 7d96422461d7538b8f5ff2afaff9341a38ad2a8f
Size (csup-snap-20070216.tar.gz) = 80734 bytes
SHA1 (patch-aa) = 9f0792cb8d3f6acd28df3db6fd6b629800c4cc1c
-SHA1 (patch-ab) = 2577b0307a098fd5a3b6ed7906f3c550be169d6a
+SHA1 (patch-ab) = 3ae5cc715d204d2b08042b0ace24092cbc423f01
diff --git a/net/csup/patches/patch-ab b/net/csup/patches/patch-ab
index 4aebe7578b1..a50120406da 100644
--- a/net/csup/patches/patch-ab
+++ b/net/csup/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/02/16 12:06:39 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2007/02/20 13:31:19 joerg Exp $
---- Makefile.orig 2006-03-07 20:10:25.000000000 +0100
-+++ Makefile 2007-02-16 12:39:28.000000000 +0100
-@@ -11,19 +11,18 @@
+--- Makefile.orig 2006-03-07 19:10:25.000000000 +0000
++++ Makefile
+@@ -11,33 +11,13 @@ SRCS= attrstack.c config.c detailer.c di
globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
pathcomp.c proto.c status.c stream.c threads.c token.l updater.c
@@ -11,16 +11,31 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/02/16 12:06:39 xtraeme Exp $
+LDFLAGS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
WARNS?= 6
- # A bit of tweaking is needed to get this Makefile working
- # with the bsd.prog.mk of all the *BSD OSes...
- .if (${UNAME} == "NetBSD")
+-# A bit of tweaking is needed to get this Makefile working
+-# with the bsd.prog.mk of all the *BSD OSes...
+-.if (${UNAME} == "NetBSD")
-LDFLAGS+= -pthread
++# The NetBSD rules apply on all pkgsrc platforms.
YHEADER= yes
- .elif (${UNAME} == "OpenBSD")
- # I bet there's a better way to do this with the OpenBSD mk
- # framework but well, this works and I got bored.
+-.elif (${UNAME} == "OpenBSD")
+-# I bet there's a better way to do this with the OpenBSD mk
+-# framework but well, this works and I got bored.
-LDFLAGS+= -pthread
- YFLAGS= -d
- CLEANFILES+= parse.c parse.h y.tab.h
+-YFLAGS= -d
+-CLEANFILES+= parse.c parse.h y.tab.h
+-
+-config.c: parse.h
+-
+-token.l: parse.h
+-
+-y.tab.h: parse.c
+-
+-parse.h: y.tab.h
+- cp ${.ALLSRC} ${.TARGET}
+-
+-.endif
+-
+ DPADD= ${LIBCRYPTO} ${LIBZ}
+ LDADD= -lcrypto -lz