From 49733cfa6cbb89ee7ce2ac4f2b01e611d43f5983 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Sun, 30 Dec 2012 16:09:33 +0000
Subject: [PATCH] Bring some sanity, dont hardcode AUTOMAKE/AUTOCONF_VERSION in
 xdt-autogen, the script respect env vars since bug #8683 was fixed. Replace a
 bogus ${PREFIX} by ${TRUEPREFIX} while here.

---
 x11/xfce4/xfce4-dev-tools/Makefile                   |  8 +++-----
 .../patches/patch-scripts_xdt-autogen                | 12 ------------
 .../xfce4-dev-tools/patches/patch-scripts_xdt-commit |  6 +++---
 3 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-autogen

diff --git a/x11/xfce4/xfce4-dev-tools/Makefile b/x11/xfce4/xfce4-dev-tools/Makefile
index 25b3790e244..56c6cb79844 100644
--- a/x11/xfce4/xfce4-dev-tools/Makefile
+++ b/x11/xfce4/xfce4-dev-tools/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2012/09/01 14:37:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2012/12/30 16:09:33 landry Exp $
 
 COMMENT =	Xfce4 developer tools and macros
 
 XFCE_PROJECT =	xfce4-dev-tools
 HOMEPAGE =	http://foo-projects.org/~benny/projects/xfce4-dev-tools/
-REVISION=	0
+REVISION=	1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM =	Yes
@@ -25,12 +25,10 @@ RUN_DEPENDS =	devel/libtool \
 
 AUTOMAKE_VERSION =	1.9
 AUTOCONF_VERSION =	2.61
-SUBST_VARS+=	AUTOCONF_VERSION AUTOMAKE_VERSION
 LIB_DEPENDS =	devel/glib2
 WANTLIB = c glib-2.0 pcre pthread
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/scripts/xdt-autogen.in.in \
-		${WRKSRC}/scripts/xdt-commit
+	${SUBST_CMD} ${WRKSRC}/scripts/xdt-commit
 
 .include <bsd.port.mk>
diff --git a/x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-autogen b/x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-autogen
deleted file mode 100644
index 772ddb56109..00000000000
--- a/x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-autogen
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-scripts_xdt-autogen,v 1.1.1.1 2009/08/20 20:58:14 landry Exp $
---- scripts/xdt-autogen.in.in.orig	Wed Aug 19 03:51:31 2009
-+++ scripts/xdt-autogen.in.in	Thu Aug 20 22:40:37 2009
-@@ -32,6 +32,8 @@ XDT_AUTOGEN_VERSION_MICRO="@VERSION_MICRO@"
- XDT_AUTOGEN_VERSION_NANO="@VERSION_NANO@"
- XDT_AUTOGEN_VERSION_REVISION="@VERSION_REVISION@"
- 
-+export AUTOCONF_VERSION=2.61
-+export AUTOMAKE_VERSION=1.9
- 
- parse_configure_subdirs()
- {
diff --git a/x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-commit b/x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-commit
index b44209fc4b3..e84a09317e4 100644
--- a/x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-commit
+++ b/x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-commit
@@ -1,9 +1,9 @@
-$OpenBSD: patch-scripts_xdt-commit,v 1.1.1.1 2009/08/20 20:58:14 landry Exp $
+$OpenBSD: patch-scripts_xdt-commit,v 1.2 2012/12/30 16:09:33 landry Exp $
 --- scripts/xdt-commit.orig	Thu Aug 20 22:50:06 2009
 +++ scripts/xdt-commit	Thu Aug 20 22:50:34 2009
 @@ -1,4 +1,4 @@
 -#!/bin/bash
-+#!${PREFIX}/bin/bash
++#!${TRUEPREFIX}/bin/bash
  #
- # $Id: patch-scripts_xdt-commit,v 1.1.1.1 2009/08/20 20:58:14 landry Exp $
+ # $Id: patch-scripts_xdt-commit,v 1.2 2012/12/30 16:09:33 landry Exp $
  #