summaryrefslogtreecommitdiff
path: root/games/xbill
diff options
context:
space:
mode:
authortv <tv>2004-04-30 20:13:12 +0000
committertv <tv>2004-04-30 20:13:12 +0000
commit5bb969ff7b0cc1c0f18c4b136f1b38aff30f4d8d (patch)
treec0d9d365c6591050924032c93e322f0b247966bd /games/xbill
parentef0b1b9fee0c57a238e128ff2fb809c9f938c519 (diff)
downloadpkgsrc-5bb969ff7b0cc1c0f18c4b136f1b38aff30f4d8d.tar.gz
Don't override CXX or CXXDEFINES in the Imakefile. pkgsrc supplies CXX,
and X supplies CXXDEFINES, so add local stuff to just DEFINES as X intended.
Diffstat (limited to 'games/xbill')
-rw-r--r--games/xbill/distinfo4
-rw-r--r--games/xbill/patches/patch-aa29
2 files changed, 22 insertions, 11 deletions
diff --git a/games/xbill/distinfo b/games/xbill/distinfo
index a4c640f2208..0f233c56120 100644
--- a/games/xbill/distinfo
+++ b/games/xbill/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/12/11 14:59:17 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/04/30 20:13:12 tv Exp $
SHA1 (xbill-2.0.tgz) = 4ce4e37687801343af5f57c28498bd0b969c0537
Size (xbill-2.0.tgz) = 46909 bytes
-SHA1 (patch-aa) = 0dfe8041d71e101e2ecdf989cbb544c96ef93c99
+SHA1 (patch-aa) = b783da740f6ed03952a7eb5d7b5b75060165a3e6
SHA1 (patch-ab) = 245573e1ea2223ed1bde91c16db81a658bfcc8f6
SHA1 (patch-ac) = c3dd487d0002f528f6726d268673bc11be0b24b6
diff --git a/games/xbill/patches/patch-aa b/games/xbill/patches/patch-aa
index b1c7788374a..57b56e368e6 100644
--- a/games/xbill/patches/patch-aa
+++ b/games/xbill/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.4 1999/12/08 17:48:13 bouyer Exp $
+$NetBSD: patch-aa,v 1.5 2004/04/30 20:13:12 tv Exp $
---- Imakefile.orig Thu Jan 23 09:38:35 1997
-+++ Imakefile Mon Sep 14 13:20:24 1998
+--- Imakefile.orig Thu Jan 23 11:38:35 1997
++++ Imakefile
@@ -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 @@
+@@ -10,7 +10,7 @@ XCOMM If you do not have libXpm installe
XCOMM the statement below and insert the correct path.
XCOMM Make sure xpm.h can be referenced as <X11/xpm.h>
@@ -17,16 +17,27 @@ $NetBSD: patch-aa,v 1.4 1999/12/08 17:48:13 bouyer Exp $
XPMLIB = -lXpm
XCOMM You shouldn't have to change anything below this line.
-@@ -19,7 +19,7 @@
+@@ -18,10 +18,7 @@ XCOMM You shouldn't have to change anyth
+ XBILL_DEF = -DXBILL_HOME=\"$(XBILL_DIR)\"
INCLUDES = -I. $(XPMINC)
- CXXDEFINES = $(XBILL_DEF) $(DEFS) $(INCS)
+-CXXDEFINES = $(XBILL_DEF) $(DEFS) $(INCS)
-CCFLAGS = $(ALLDEFINES) -Wall -g
-+CCFLAGS = $(ALLDEFINES) -O $(CXXDEFINES)
- CXX = g++ $(CCFLAGS)
+-CXX = g++ $(CCFLAGS)
CCC = $(CXX)
-@@ -136,6 +136,12 @@
+ CC = $(CXX)
+
+@@ -35,7 +32,7 @@ CC = $(CXX)
+ #endif
+
+ LOCAL_LIBRARIES = $(WIDGETLIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+-DEFINES = -D$(WIDGET)
++DEFINES = -D$(WIDGET) $(XBILL_DEF)
+
+ TARGET = xbill
+
+@@ -136,6 +133,12 @@ XBMS = bitmaps/apple.xbm \
ComplexProgramTarget($(TARGET))