Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Oct 2014 11:54:49 +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: r369718 - in head/www/rt40: . files
Message-ID:  <201410011154.s91BsnjF045255@svn.freebsd.org>

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

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

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

Modified: head/www/rt40/Makefile
==============================================================================
--- head/www/rt40/Makefile	Wed Oct  1 11:28:44 2014	(r369717)
+++ head/www/rt40/Makefile	Wed Oct  1 11:54:48 2014	(r369718)
@@ -58,7 +58,6 @@ RUN_DEPENDS+=	${CORE_DEPS}       \
 		${HTML_DOC_DEPS}
 
 USES=		cpe perl5
-USE_AUTOTOOLS=	autoconf
 CPE_VENDOR=	bestpractical
 
 RT_ETC_PATH?=	${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX}
@@ -174,8 +173,6 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 SUB_LIST=	RT_ETC_PATH=${RT_ETC_PATH}
 
-run-autotools:	run-autotools-autoconf
-
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "      DB_TYPE=type                    mysql, Oracle, Pg or SQLite (mysql)"

Added: head/www/rt40/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/rt40/files/patch-configure	Wed Oct  1 11:54:48 2014	(r369718)
@@ -0,0 +1,11 @@
+--- configure.orig	2014-09-11 18:55:07 UTC
++++ configure
+@@ -2082,7 +2082,7 @@
+ 		s/^#.*$//m;
+ 		s/^\s+//gim;
+ 		s/\s+$/\n/gim;
+-		s/\+$/\/rt3/gim;
++		s/\+$/\/rt40/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?201410011154.s91BsnjF045255>