All pkgsrc systems share the bsd.prog.mk from NetBSD.

This commit is contained in:
joerg 2007-02-20 13:31:19 +00:00
parent 114317f32c
commit bd336963f5
2 changed files with 29 additions and 14 deletions

View file

@ -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

View file

@ -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