From d3555f6529f326f40b2a3ceb8e5b90fac74e5e0e Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 14 Sep 2011 15:35:40 +0000
Subject: [PATCH] - update to 1.18 - remove a patch, instead use FAKE_FLAGS.

---
 textproc/gtk-doc/Makefile                  |  8 ++++----
 textproc/gtk-doc/distinfo                  | 10 +++++-----
 textproc/gtk-doc/patches/patch-Makefile_in | 12 ------------
 textproc/gtk-doc/pkg/PLIST                 |  6 ++++--
 4 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 textproc/gtk-doc/patches/patch-Makefile_in

diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 1822eabcb94..ef0224f5ea0 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.26 2011/09/12 12:07:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/14 15:35:40 jasper Exp $
 
 COMMENT=	GTK C code documentation system
 
-GNOME_VERSION=	1.17
+GNOME_VERSION=	1.18
 GNOME_PROJECT=	gtk-doc
 
 CATEGORIES=    	textproc devel
@@ -15,8 +15,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-EXTRACT_SUFX=		.tar.bz2
-
 MODULES=		x11/gnome \
 			lang/python
 
@@ -39,6 +37,8 @@ RUN_DEPENDS=		textproc/openjade \
 
 REGRESS_DEPENDS=	shells/bash
 
+FAKE_FLAGS=		pkgconfigdir=${PREFIX}/lib/pkgconfig/
+
 post-extract:
 	cp ${LOCALBASE}/share/xml/docbook/catalog.xml \
 		${WRKDIR}/catalog.xml
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index 26e2ae00ad4..7e9a73664b4 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,5 +1,5 @@
-MD5 (gtk-doc-1.17.tar.bz2) = ylLKEIRQidppZtgQcJ1O4w==
-RMD160 (gtk-doc-1.17.tar.bz2) = 1dqJ+S1nGZJ5eQg1fc+nEob6xt8=
-SHA1 (gtk-doc-1.17.tar.bz2) = Fb57+SnGLUrXwzVDZhcpW7X01zU=
-SHA256 (gtk-doc-1.17.tar.bz2) = kR/4xiB0POp7QBVvGUf5Rw2l5yPzWp2PtoPlDGGDDR8=
-SIZE (gtk-doc-1.17.tar.bz2) = 832128
+MD5 (gtk-doc-1.18.tar.xz) = OSe+1g/dD8kJOh0AAY50ag==
+RMD160 (gtk-doc-1.18.tar.xz) = RyQG9qsrrirZ+VAc02ZfMoIbCvw=
+SHA1 (gtk-doc-1.18.tar.xz) = QXA/UjaR6N3F16I/WWtkJ1HEbTk=
+SHA256 (gtk-doc-1.18.tar.xz) = eFtZHFYb4cggbw0lddxjVY6mGZw6/knLxO/elKZimiA=
+SIZE (gtk-doc-1.18.tar.xz) = 637936
diff --git a/textproc/gtk-doc/patches/patch-Makefile_in b/textproc/gtk-doc/patches/patch-Makefile_in
deleted file mode 100644
index 90e56e9bf39..00000000000
--- a/textproc/gtk-doc/patches/patch-Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2011/01/14 22:10:58 ajacoutot Exp $
---- Makefile.in.orig	Fri Jan 14 22:48:16 2011
-+++ Makefile.in	Fri Jan 14 23:03:34 2011
-@@ -322,7 +322,7 @@ gtkdocdata_DATA = \
- 	up.png			\
- 	style.css
- 
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = gtk-doc.pc
- aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gtk-doc.m4
diff --git a/textproc/gtk-doc/pkg/PLIST b/textproc/gtk-doc/pkg/PLIST
index c5310a3db09..b815e4088c5 100644
--- a/textproc/gtk-doc/pkg/PLIST
+++ b/textproc/gtk-doc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2011/01/14 22:10:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.12 2011/09/14 15:35:40 jasper Exp $
 bin/gtkdoc-check
 bin/gtkdoc-depscan
 bin/gtkdoc-fixxref
@@ -14,6 +14,8 @@ bin/gtkdoc-scanobj
 bin/gtkdocize
 lib/pkgconfig/gtk-doc.pc
 share/aclocal/gtk-doc.m4
+share/gnome/
+share/gnome/help/
 share/gnome/help/gtk-doc-manual/
 share/gnome/help/gtk-doc-manual/C/
 share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
@@ -41,7 +43,6 @@ share/gnome/help/gtk-doc-manual/ta/gtk-doc-manual.xml
 share/gnome/help/gtk-doc-manual/te/
 share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml
 share/gtk-doc/data/
-share/gtk-doc/data/devhelp.xsl
 share/gtk-doc/data/devhelp2.xsl
 share/gtk-doc/data/gtk-doc.dcl
 share/gtk-doc/data/gtk-doc.dsl
@@ -57,6 +58,7 @@ share/gtk-doc/data/right.png
 share/gtk-doc/data/style.css
 share/gtk-doc/data/up.png
 share/gtk-doc/data/version-greater-or-equal.xsl
+share/omf/
 share/omf/gtk-doc-manual/
 share/omf/gtk-doc-manual/gtk-doc-manual-C.omf
 share/omf/gtk-doc-manual/gtk-doc-manual-bn_IN.omf