From e927ca3c45ffcb07345fee828e33956b4327793e Mon Sep 17 00:00:00 2001
From: alek <alek@openbsd.org>
Date: Sun, 13 Feb 2005 16:40:59 +0000
Subject: [PATCH] - Fix libintl detection - Don't use included libintl headers
 - Regen PLIST - Bump PKGNAME

---
 devel/doc++/Makefile                      |  3 ++-
 devel/doc++/patches/patch-configure       | 21 +++++++++++++++++++++
 devel/doc++/patches/patch-src_Makefile_in | 12 ++++++++++++
 devel/doc++/pkg/PLIST                     |  4 +---
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 devel/doc++/patches/patch-configure
 create mode 100644 devel/doc++/patches/patch-src_Makefile_in

diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index 7445b5ee850..a3f3d1904d7 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2004/11/23 11:22:01 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2005/02/13 16:40:59 alek Exp $
 
 COMMENT=	"documentation system for C, C++, IDL and Java"
 
 DISTNAME=	doc++-3.4.10
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	devel
 
 HOMEPAGE=	http://docpp.sourceforge.net/
diff --git a/devel/doc++/patches/patch-configure b/devel/doc++/patches/patch-configure
new file mode 100644
index 00000000000..86c2c2ceff7
--- /dev/null
+++ b/devel/doc++/patches/patch-configure
@@ -0,0 +1,21 @@
+$OpenBSD: patch-configure,v 1.1 2005/02/13 16:40:59 alek Exp $
+--- configure.orig	Sun Feb 13 17:21:26 2005
++++ configure	Sun Feb 13 17:24:35 2005
+@@ -7930,7 +7930,7 @@ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ()
+   ;
+   return 0;
+ }
+@@ -7976,7 +7976,7 @@ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ()
+   ;
+   return 0;
+ }
diff --git a/devel/doc++/patches/patch-src_Makefile_in b/devel/doc++/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..3cc19373266
--- /dev/null
+++ b/devel/doc++/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2005/02/13 16:40:59 alek Exp $
+--- src/Makefile.in.orig	Sun Feb 13 17:27:29 2005
++++ src/Makefile.in	Sun Feb 13 17:27:41 2005
+@@ -114,7 +114,7 @@ am__quote = @am__quote@
+ install_sh = @install_sh@
+ 
+ localedir = $(datadir)/locale
+-INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
++INCLUDES = -DLOCALEDIR=\"$(localedir)\"
+ 
+ # The `equate' program is still experimental.
+ bin_PROGRAMS = doc++ docify promote #equate
diff --git a/devel/doc++/pkg/PLIST b/devel/doc++/pkg/PLIST
index 5115cda692a..f09225b7483 100644
--- a/devel/doc++/pkg/PLIST
+++ b/devel/doc++/pkg/PLIST
@@ -1,8 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/14 23:43:55 espie Exp $
+@comment $OpenBSD: PLIST,v 1.7 2005/02/13 16:40:59 alek Exp $
 bin/doc++
 bin/docify
 bin/promote
-@comment lib/charset.alias
 share/doc/doc++/
 share/doc/doc++/ClassGraph.class
 share/doc/doc++/ClassGraphPanel.class
@@ -39,6 +38,5 @@ share/doc/doc++/supportedTeXmacros.html
 share/doc/doc++/toc.html
 share/locale/fr/LC_MESSAGES/doc++.mo
 share/locale/ja/LC_MESSAGES/doc++.mo
-@comment share/locale/locale.alias
 share/locale/ro/LC_MESSAGES/doc++.mo
 share/locale/ru/LC_MESSAGES/doc++.mo