diff options
| author | kristerw <kristerw> | 2004-05-24 10:16:52 +0000 |
|---|---|---|
| committer | kristerw <kristerw> | 2004-05-24 10:16:52 +0000 |
| commit | 4899c3f7a7aec3b1d776843d3aa62f53b51d8b67 (patch) | |
| tree | ca108aaee014dfc86292a3c06f11efdf2e61ec27 /games | |
| parent | 7b2b0d50dc8832b09475120a62f836dded31f863 (diff) | |
| download | pkgsrc-4899c3f7a7aec3b1d776843d3aa62f53b51d8b67.tar.gz | |
Use g++ when linking C++.
Diffstat (limited to 'games')
| -rw-r--r-- | games/xbill/distinfo | 4 | ||||
| -rw-r--r-- | games/xbill/patches/patch-aa | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/games/xbill/distinfo b/games/xbill/distinfo index 0440b3281f7..640111322be 100644 --- a/games/xbill/distinfo +++ b/games/xbill/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2004/04/30 20:29:40 tv Exp $ +$NetBSD: distinfo,v 1.7 2004/05/24 10:16:52 kristerw Exp $ SHA1 (xbill-2.0.tgz) = 4ce4e37687801343af5f57c28498bd0b969c0537 Size (xbill-2.0.tgz) = 46909 bytes -SHA1 (patch-aa) = 67f0bdeb4dc80bde68dbd99f2684c2d4908e0423 +SHA1 (patch-aa) = e4fad0653c5dae7d7cef3d85bd934a35c9f3d498 SHA1 (patch-ab) = 245573e1ea2223ed1bde91c16db81a658bfcc8f6 SHA1 (patch-ac) = c3dd487d0002f528f6726d268673bc11be0b24b6 diff --git a/games/xbill/patches/patch-aa b/games/xbill/patches/patch-aa index 47781cfc902..d91c350c4ff 100644 --- a/games/xbill/patches/patch-aa +++ b/games/xbill/patches/patch-aa @@ -1,14 +1,14 @@ -$NetBSD: patch-aa,v 1.6 2004/04/30 20:29:40 tv Exp $ +$NetBSD: patch-aa,v 1.7 2004/05/24 10:16:52 kristerw Exp $ ---- Imakefile.orig Thu Jan 23 11:38:35 1997 -+++ Imakefile +--- Imakefile.orig 1997-01-23 17:38:35.000000000 +0100 ++++ Imakefile 2004-05-24 12:13:39.000000000 +0200 @@ -1,4 +1,4 @@ -XBILL_DIR = /var/lib/games/xbill/ +XBILL_DIR = $(PREFIX)/share/xbill/ XCOMM XBILL_DIR = $(HOME)/.xbill/ XCOMM Which widget set? Motif looks slightly better; Athena is free. -@@ -10,7 +10,7 @@ XCOMM If you do not have libXpm installe +@@ -10,7 +10,7 @@ XCOMM the statement below and insert the correct path. XCOMM Make sure xpm.h can be referenced as <X11/xpm.h> @@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.6 2004/04/30 20:29:40 tv Exp $ XPMLIB = -lXpm XCOMM You shouldn't have to change anything below this line. -@@ -18,10 +18,7 @@ XCOMM You shouldn't have to change anyth +@@ -18,12 +18,10 @@ XBILL_DEF = -DXBILL_HOME=\"$(XBILL_DIR)\" INCLUDES = -I. $(XPMINC) @@ -27,8 +27,11 @@ $NetBSD: patch-aa,v 1.6 2004/04/30 20:29:40 tv Exp $ -CXX = g++ $(CCFLAGS) CCC = $(CXX) CC = $(CXX) ++CCLINK = $(CXXLINK) -@@ -35,7 +32,7 @@ CC = $(CXX) + #ifdef Use_Motif + WIDGET = motif +@@ -35,7 +33,7 @@ #endif LOCAL_LIBRARIES = $(WIDGETLIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) @@ -37,7 +40,7 @@ $NetBSD: patch-aa,v 1.6 2004/04/30 20:29:40 tv Exp $ TARGET = xbill -@@ -136,6 +133,9 @@ XBMS = bitmaps/apple.xbm \ +@@ -136,6 +134,9 @@ ComplexProgramTarget($(TARGET)) |