diff options
| author | joerg <joerg> | 2014-02-04 00:15:14 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-02-04 00:15:14 +0000 |
| commit | ed85b4bd592cb3f9b217c864c5073f1170b25ccb (patch) | |
| tree | acfedc8eb7fdc63678e869474741064948c05fb1 /mbone | |
| parent | 72d1c92f6cf1d8de7c383f11f32c71c1ed193413 (diff) | |
| download | pkgsrc-ed85b4bd592cb3f9b217c864c5073f1170b25ccb.tar.gz | |
Fix build with TCL 8.6. Honour system CFLAGS. Bump revision.
Diffstat (limited to 'mbone')
| -rw-r--r-- | mbone/wbd/Makefile | 8 | ||||
| -rw-r--r-- | mbone/wbd/distinfo | 4 | ||||
| -rw-r--r-- | mbone/wbd/patches/patch-aa | 10 |
3 files changed, 13 insertions, 9 deletions
diff --git a/mbone/wbd/Makefile b/mbone/wbd/Makefile index 20b5709375c..daae82e5c33 100644 --- a/mbone/wbd/Makefile +++ b/mbone/wbd/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2014/01/27 21:51:03 wiedi Exp $ +# $NetBSD: Makefile,v 1.12 2014/02/04 00:15:14 joerg Exp $ # DISTNAME= wbd-1.0ucl4 PKGNAME= wbd-1.0p4 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= mbone tk MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/wbd/1.0ucl4/ @@ -18,6 +18,10 @@ NO_CONFIGURE= yes INSTALLATION_DIRS= bin +.include "../../mk/bsd.prefs.mk" +CFLAGS+= -DUSE_INTERP_RESULT +MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} + LDFLAGS.SunOS+= -lsocket -lnsl do-install: diff --git a/mbone/wbd/distinfo b/mbone/wbd/distinfo index f135de52fb6..de6bd041bb4 100644 --- a/mbone/wbd/distinfo +++ b/mbone/wbd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2014/01/27 21:51:03 wiedi Exp $ +$NetBSD: distinfo,v 1.6 2014/02/04 00:15:14 joerg Exp $ SHA1 (wbd-1.0ucl4.tar.gz) = 09a399ed435372d7a62fd1c98c6a06aca15cb4e3 RMD160 (wbd-1.0ucl4.tar.gz) = ae094420243f35edc664b1be5c496e4f504e277e Size (wbd-1.0ucl4.tar.gz) = 53591 bytes -SHA1 (patch-aa) = e11dd29dfd663b97211d04b1c204041279d64d60 +SHA1 (patch-aa) = 98f774d61ca9a5464709735269c8f7c487a1c4b0 SHA1 (patch-ab) = 70c932caacddb93aacbf245ea8aab3ed685fed8c SHA1 (patch-ac) = 8e72488495f29bc42d9572901d1d766025b11c9e SHA1 (patch-comms.c) = e8efcb792cfe245fa3c367ed8a9868544832c0c2 diff --git a/mbone/wbd/patches/patch-aa b/mbone/wbd/patches/patch-aa index 5a07a5811e8..5974f3a52c8 100644 --- a/mbone/wbd/patches/patch-aa +++ b/mbone/wbd/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2014/01/27 21:51:03 wiedi Exp $ +$NetBSD: patch-aa,v 1.5 2014/02/04 00:15:14 joerg Exp $ -Patch hardcoded with libtcl85. Previously it was hardcoded to libtcl84. +Patch hardcoded with libtcl86. Previously it was hardcoded to libtcl84. --- makefile.orig 1998-01-29 11:46:41.000000000 +0000 +++ makefile @@ -12,13 +12,13 @@ Patch hardcoded with libtcl85. Previously it was hardcoded to libtcl84. -INCDIR = /cs/research/mice/starship/common/solaris/include +LIBDIR = ${PREFIX}/lib +INCDIR = ${PREFIIX}/include -+LIBS = -ll -ltk85 -ltcl85 -lm -lX11 -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib $(LDFLAGS) ++LIBS = -ll -ltk86 -ltcl86 -lm -lX11 -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib $(LDFLAGS) # The files needed from the tcl/tk library directories... -LIBRARY_TK = $(LIBDIR)/tk4.2 -LIBRARY_TCL = $(LIBDIR)/tcl7.6 -+LIBRARY_TK = $(LIBDIR)/tk8.5 -+LIBRARY_TCL = $(LIBDIR)/tcl8.5 ++LIBRARY_TK = $(LIBDIR)/tk8.6 ++LIBRARY_TCL = $(LIBDIR)/tcl8.6 # Uncomment these lines for SGI (IRIX 5.3). |