Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Oct 2014 11:55:24 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r369719 - in head/www/rt42: . files
Message-ID:  <201410011155.s91BtOu0045519@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Wed Oct  1 11:55:23 2014
New Revision: 369719
URL: https://svnweb.freebsd.org/changeset/ports/369719
QAT: https://qat.redports.org/buildarchive/r369719/

Log:
  Patch configure instead of aclocal.m4 to avoid USE_AUTOTOOLS

Added:
  head/www/rt42/files/patch-configure   (contents, props changed)
Deleted:
  head/www/rt42/files/patch-aclocal.m4
Modified:
  head/www/rt42/Makefile

Modified: head/www/rt42/Makefile
==============================================================================
--- head/www/rt42/Makefile	Wed Oct  1 11:54:48 2014	(r369718)
+++ head/www/rt42/Makefile	Wed Oct  1 11:55:23 2014	(r369719)
@@ -56,7 +56,6 @@ RUN_DEPENDS+=	${CLI_DEPS}        \
 
 USES=		cpe perl5
 CPE_VENDOR=	bestpractical
-USE_AUTOTOOLS=	autoconf
 
 RT_LAYOUT=	FreeBSD
 RT_ETC_DIR?=	etc/${PORTNAME}${PKGNAMESUFFIX}
@@ -173,8 +172,6 @@ SUB_FILES=	pkg-message
 SUB_LIST=	RT_ETC_PATH=${RT_ETC_PATH}
 PLIST_SUB=	RT_ETC_DIR=${RT_ETC_DIR}
 
-run-autotools:	run-autotools-autoconf
-
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "Additional database related settings you can use:"

Added: head/www/rt42/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/rt42/files/patch-configure	Wed Oct  1 11:55:23 2014	(r369719)
@@ -0,0 +1,11 @@
+--- configure.orig	2014-09-11 19:03:07 UTC
++++ configure
+@@ -2088,7 +2088,7 @@
+ 		s/^#.*$//m;
+ 		s/^\s+//gim;
+ 		s/\s+$/\n/gim;
+-		s/\+$/\/rt3/gim;
++		s/\+$/\/rt42/gim;
+ 		# m4 will not let us just use $srcdir/config.layout, we need $1
+ 		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man|html)dir)\s*:\s*(.*)$/$1=$2/gim;
+ 		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\$$1" = "xNONE" || test "x\$$1" = "x") && $1=$2/gim;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410011155.s91BtOu0045519>