From 7df494e95b6608d0a2b1d7f04a5395e500baaa37 Mon Sep 17 00:00:00 2001
From: avsm <avsm@openbsd.org>
Date: Sun, 29 Feb 2004 01:03:32 +0000
Subject: [PATCH] update to p5-XML-Sablotron-1.0, fix on gcc3

---
 textproc/p5-XML-Sablotron/Makefile              | 14 ++++++++++----
 textproc/p5-XML-Sablotron/distinfo              |  6 +++---
 .../p5-XML-Sablotron/patches/patch-Makefile_PL  | 17 +++++++++++++----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index 5ef15bf0d00..79126c9153d 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -1,18 +1,18 @@
-# $OpenBSD: Makefile,v 1.12 2004/01/17 15:58:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2004/02/29 01:03:32 avsm Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"perl interface to the Sablotron XSLT engine"
 
-DISTNAME=	XML-Sablotron-0.98
+DISTNAME=	XML-Sablotron-1.0
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	textproc perl5
-MASTER_SITES=	http://download-2.gingerall.cz/download/sablot/
+MASTER_SITES=	http://download-1.gingerall.cz/download/sablot/
 
 HOMEPAGE=	http://www.gingerall.cz/
 MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
 
-LIB_DEPENDS=	sablot.98::textproc/sablotron
+LIB_DEPENDS=	sablot.100::textproc/sablotron
 
 # GPL/Mozilla
 PERMIT_PACKAGE_CDROM=	Yes
@@ -23,4 +23,10 @@ PERMIT_DISTFILES_FTP=	Yes
 CONFIGURE_STYLE= perl
 CONFIGURE_ARGS=  EXPATLIBPATH="${LOCALBASE}/lib" EXPATINCPATH="${LOCALBASE}/include" SABLOTLIBPATH="${LOCALBASE}/lib" SABLOTINCPATH="${LOCALBASE}/include"
 
+.include <bsd.own.mk>
+USE_GCC3?= No
+.if ${USE_GCC3:L} == "yes"
+CONFIGURE_ENV+=	LDFLAGS="-lstdc++"
+.endif
+
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Sablotron/distinfo b/textproc/p5-XML-Sablotron/distinfo
index 77c334ff0f2..fa42094d106 100644
--- a/textproc/p5-XML-Sablotron/distinfo
+++ b/textproc/p5-XML-Sablotron/distinfo
@@ -1,3 +1,3 @@
-MD5 (XML-Sablotron-0.98.tar.gz) = 4ffc14eef7b1ad626e4abd9993bf57cc
-RMD160 (XML-Sablotron-0.98.tar.gz) = 00bc3435f9ada8925f2602c7f2692d6820906e62
-SHA1 (XML-Sablotron-0.98.tar.gz) = 2db2d049d2dfa8fc4d801de3916e51fc7f198f06
+MD5 (XML-Sablotron-1.0.tar.gz) = f9825c7f9a2243841de65bba9310fa58
+RMD160 (XML-Sablotron-1.0.tar.gz) = bb4697e282829aa1afd59c870261295f3e53c4b1
+SHA1 (XML-Sablotron-1.0.tar.gz) = 6149fc6127566952bc23e3342789d5a8b648d1f5
diff --git a/textproc/p5-XML-Sablotron/patches/patch-Makefile_PL b/textproc/p5-XML-Sablotron/patches/patch-Makefile_PL
index e70b20274bb..73677086b7a 100644
--- a/textproc/p5-XML-Sablotron/patches/patch-Makefile_PL
+++ b/textproc/p5-XML-Sablotron/patches/patch-Makefile_PL
@@ -1,7 +1,16 @@
-$OpenBSD: patch-Makefile_PL,v 1.1 2002/08/17 01:56:14 avsm Exp $
---- Makefile.PL.orig	Sat Aug 17 02:52:15 2002
-+++ Makefile.PL	Sat Aug 17 02:52:41 2002
-@@ -189,7 +189,7 @@ if ($js_found || $js_libpath) {
+$OpenBSD: patch-Makefile_PL,v 1.2 2004/02/29 01:03:32 avsm Exp $
+--- Makefile.PL.orig	2003-02-21 14:17:32.000000000 +0000
++++ Makefile.PL	2004-02-29 00:45:03.000000000 +0000
+@@ -185,7 +185,7 @@ unless ($js_libpath) {
+     }
+ }
+ 
+-our $libs = ' ';
++our $libs = $ENV{'LDFLAGS'}. ' ';
+ 
+ if ($js_found || $js_libpath) {
+     $libs = "-l$js_libname $libs" if $js_libname;
+@@ -193,7 +193,7 @@ if ($js_found || $js_libpath) {
  }
  
  #sablot and expat libraries