From f53fe097e47b147c862ea7795da4961017a39589 Mon Sep 17 00:00:00 2001
From: kristerw <kristerw@pkgsrc.org>
Date: Sat, 10 Jul 2004 17:20:30 +0000
Subject: USE_LANGUAGES=c c++ Use CXX (instead of CC) as linker.

---
 geography/mapserver/Makefile         |  3 ++-
 geography/mapserver/distinfo         |  4 ++--
 geography/mapserver/patches/patch-aa | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'geography')

diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index 8d1c14a7f62..f86c27c5b6b 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/05/09 02:30:53 snj Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/10 17:20:30 kristerw Exp $
 #
 
 DISTNAME=		mapserver-4.0
@@ -14,6 +14,7 @@ USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c c++
 
 CONFIGURE_ARGS+=	--with-gd=${PREFIX}				\
 			--with-libiconv=${PREFIX}			\
diff --git a/geography/mapserver/distinfo b/geography/mapserver/distinfo
index 04c3de36055..ceb3fe00abf 100644
--- a/geography/mapserver/distinfo
+++ b/geography/mapserver/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/10/05 17:41:31 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2004/07/10 17:20:30 kristerw Exp $
 
 SHA1 (mapserver-4.0.tar.gz) = 1007771932e43f97d868862fdc3a7ad3ab3d9880
 Size (mapserver-4.0.tar.gz) = 857870 bytes
-SHA1 (patch-aa) = f2a6d9d332c55955f3813ca39f2f2c397175e92b
+SHA1 (patch-aa) = be9ec2335e608f52804287c5731e2adf597d86e4
diff --git a/geography/mapserver/patches/patch-aa b/geography/mapserver/patches/patch-aa
index 915abdfb9ac..ca4409e363e 100644
--- a/geography/mapserver/patches/patch-aa
+++ b/geography/mapserver/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/10/05 17:41:32 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/10 17:20:30 kristerw Exp $
 
---- Makefile.in.orig	2003-06-18 09:12:06.000000000 -0400
-+++ Makefile.in	2003-10-05 13:15:33.000000000 -0400
+--- Makefile.in.orig	2003-06-18 15:12:06.000000000 +0200
++++ Makefile.in	2004-07-10 19:17:29.000000000 +0200
+@@ -137,7 +137,7 @@
+ #
+ CXX=	@CXX@
+ CC=     @CC@
+-LD=     @CC@
++LD=     @CXX@
+ AR= ar rc
+ RANLIB= @RANLIB@
+ LEX=    @LEX@
 @@ -155,10 +155,10 @@
  	$(CURL_INC) $(MING_INC) $(ORACLESPATIAL_INC)
  
-- 
cgit v1.2.3