cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring some sanity, dont hardcode AUTOMAKE/AUTOCONF_VERSION in

Browse Source 
xdt-autogen, the script respect env vars since bug #8683 was fixed.
Replace a bogus ${PREFIX} by ${TRUEPREFIX} while here.
This commit is contained in:
landry 2012-12-30 16:09:33 +00:00
parent c7ff61e356
commit 49733cfa6c
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/xfce4/xfce4-dev-tools/Makefile
View File

@ -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 COMMENT = Xfce4 developer tools and macros
XFCE_PROJECT = xfce4-dev-tools XFCE_PROJECT = xfce4-dev-tools
HOMEPAGE = http://foo-projects.org/~benny/projects/xfce4-dev-tools/ HOMEPAGE = http://foo-projects.org/~benny/projects/xfce4-dev-tools/
REVISION= 0 REVISION= 1
# GPLv2 # GPLv2
PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_CDROM = Yes
@ -25,12 +25,10 @@ RUN_DEPENDS = devel/libtool \
AUTOMAKE_VERSION = 1.9 AUTOMAKE_VERSION = 1.9
AUTOCONF_VERSION = 2.61 AUTOCONF_VERSION = 2.61
SUBST_VARS+= AUTOCONF_VERSION AUTOMAKE_VERSION
LIB_DEPENDS = devel/glib2 LIB_DEPENDS = devel/glib2
WANTLIB = c glib-2.0 pcre pthread WANTLIB = c glib-2.0 pcre pthread
pre-configure: pre-configure:
${SUBST_CMD} ${WRKSRC}/scripts/xdt-autogen.in.in \ ${SUBST_CMD} ${WRKSRC}/scripts/xdt-commit
${WRKSRC}/scripts/xdt-commit
.include <bsd.port.mk> .include <bsd.port.mk>

12
x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-autogen
View File

@ -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()
{

6
x11/xfce4/xfce4-dev-tools/patches/patch-scripts_xdt-commit
View File

@ -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.orig Thu Aug 20 22:50:06 2009
+++ scripts/xdt-commit Thu Aug 20 22:50:34 2009 +++ scripts/xdt-commit Thu Aug 20 22:50:34 2009
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/bin/bash -#!/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 $
# #