summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2008-08-21 06:18:49 +0000
committerRong-En Fan <rafan@FreeBSD.org>2008-08-21 06:18:49 +0000
commit741aa714833b9bb1e9afaaf5124d3f5c60b5e49c (patch)
treee9b79b363f2fc4a63535a25c71491fa49a79b556 /editors
parentUpgrade to 1.4. (diff)
Update CONFIGURE_ARGS for how we pass CONFIGURE_TARGET to configure script.
Specifically, newer autoconf (> 2.13) has different semantic of the configure target. In short, one should use --build=CONFIGURE_TARGET instead of CONFIGURE_TARGET directly. Otherwise, you will get a warning and the old semantic may be removed in later autoconf releases. To workaround this issue, many ports hack the CONFIGURE_TARGET variable so that it contains the ``--build='' prefix. To solve this issue, under the fact that some ports still have configure script generated by the old autoconf, we use runtime detection in the do-configure target so that the proper argument can be used. Changes to Mk/*: - Add runtime detection magic in bsd.port.mk - Remove CONFIGURE_TARGET hack in various bsd.*.mk - USE_GNOME=gnometarget is now an no-op Changes to individual ports, other than removing the CONFIGURE_TARGET hack: = pkg-plist changed (due to the ugly CONFIGURE_TARGET prefix in * executables) - comms/gnuradio - science/abinit - science/elmer-fem - science/elmer-matc - science/elmer-meshgen2d - science/elmerfront - science/elmerpost = use x86_64 as ARCH - devel/g-wrap = other changes - print/magicfilter GNU_CONFIGURE -> HAS_CONFIGURE since it's not generated by autoconf Total # of ports modified: 1,027 Total # of ports affected: ~7,000 (set GNU_CONFIGURE to yes) PR: 126524 (obsoletes 52917) Submitted by: rafan Tested on: two pointyhat 7-amd64 exp runs (by pav) Approved by: portmgr (pav)
Notes
Notes: svn path=/head/; revision=218938
Diffstat (limited to 'editors')
-rw-r--r--editors/MathPlanner/Makefile1
-rw-r--r--editors/bvi/Makefile1
-rw-r--r--editors/cooledit/Makefile1
-rw-r--r--editors/emacs/Makefile1
-rw-r--r--editors/emacs22/Makefile1
-rw-r--r--editors/emacs23/Makefile1
-rw-r--r--editors/hexcurse/Makefile1
-rw-r--r--editors/hte/Makefile1
-rw-r--r--editors/jed/Makefile1
-rw-r--r--editors/joe/Makefile1
-rw-r--r--editors/joe2/Makefile1
-rw-r--r--editors/nano/Makefile1
-rw-r--r--editors/ssed/Makefile1
-rw-r--r--editors/ted/Makefile1
-rw-r--r--editors/tetradraw/Makefile1
-rw-r--r--editors/texmacs/Makefile1
-rw-r--r--editors/xemacs-devel-mule/Makefile2
-rw-r--r--editors/xmlcopyeditor/Makefile1
18 files changed, 1 insertions, 18 deletions
diff --git a/editors/MathPlanner/Makefile b/editors/MathPlanner/Makefile
index e2f4d7211a33..c2151ea9c0fa 100644
--- a/editors/MathPlanner/Makefile
+++ b/editors/MathPlanner/Makefile
@@ -18,7 +18,6 @@ COMMENT= A mathematical design and publishing application
USE_QT_VER= 3
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
QTCPPFLAGS+= ${PTHREAD_CFLAGS}
QTCFGLIBS+= ${PTHREAD_LIBS}
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index 01a1eb87aa9b..80c3690aea17 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= vd@FreeBSD.org
COMMENT= A vi-like binary file (hex)editor
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --datadir=${DATADIR}
MAN1= bvi.1 bmore.1
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 054453070ede..f081d079e4ee 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -21,7 +21,6 @@ USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_XORG= x11 xt
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 9480b786b65f..79cc9cedab6a 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -42,7 +42,6 @@ USE_XORG= x11
USE_XORG= xpm xft
.endif
-CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd
.if defined(WITHOUT_X11)
CONFIGURE_ARGS= --with-x=no
.else
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 9480b786b65f..79cc9cedab6a 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -42,7 +42,6 @@ USE_XORG= x11
USE_XORG= xpm xft
.endif
-CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd
.if defined(WITHOUT_X11)
CONFIGURE_ARGS= --with-x=no
.else
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 9480b786b65f..79cc9cedab6a 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -42,7 +42,6 @@ USE_XORG= x11
USE_XORG= xpm xft
.endif
-CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd
.if defined(WITHOUT_X11)
CONFIGURE_ARGS= --with-x=no
.else
diff --git a/editors/hexcurse/Makefile b/editors/hexcurse/Makefile
index 0ac84a07aa9a..cb8039b44626 100644
--- a/editors/hexcurse/Makefile
+++ b/editors/hexcurse/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= jadawin@FreeBSD.org
COMMENT= A versatile ncurses-based hex editor
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= hexcurse.1
PLIST_FILES= bin/hexcurse
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index 9e7a8b9a4c1b..ef8f0735f11d 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -17,7 +17,6 @@ COMMENT= A file editor/viewer/analyzer for executables
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PLIST_FILES= bin/ht
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 08481e8a5634..5e1d8f785bf4 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -28,7 +28,6 @@ USE_BZIP2= yes
DIST_SUBDIR= jed
GNU_CONFIGURE= yes
CONFIGURE_ENV+= JED_ROOT=${PREFIX}/lib/jed
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PORTDOCS= *
MAKE_ENV+= DEST_DOC_DIR=${DOCSDIR}
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 3da7d1afd14d..2dffa8b6dbfa 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -25,7 +25,6 @@ CONFLICTS= joe-2.*
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -liconv"
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index 467116d3191c..96967add1493 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -22,7 +22,6 @@ CONFLICTS= joe-3*
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_ICONV= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -liconv"
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index ef00a41c75cd..f9e3872b6029 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -19,7 +19,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-all
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/editors/ssed/Makefile b/editors/ssed/Makefile
index 1226f7aa33e8..76a63d2cea16 100644
--- a/editors/ssed/Makefile
+++ b/editors/ssed/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Super-sed - a heavily enhanced version of sed
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --program-prefix=s
MAN1= ssed.1
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 060865919a05..3d27f76504ce 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -25,7 +25,6 @@ USE_MOTIF= yes
USE_XORG= xpm xp xmu xt xext sm ice x11
USE_GHOSTSCRIPT_RUN= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAKE_ENV+= DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}\\\"\"" \
DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}\\\"\"" \
DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\""
diff --git a/editors/tetradraw/Makefile b/editors/tetradraw/Makefile
index 18d0e4540131..5b9e9db6cc58 100644
--- a/editors/tetradraw/Makefile
+++ b/editors/tetradraw/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Fully featured ANSI art editor/viewer with TCP/IP multidraw support
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PLIST_FILES= bin/tetradraw bin/tetraview
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index 26407937e691..5d823051b04e 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -29,7 +29,6 @@ USE_ICONV= yes
REINPLACE_ARGS= -i ""
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-optimize="${CXXFLAGS}" \
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index c3e2e1faa81d..e3d2daf6cdec 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -54,7 +54,7 @@ XEMACS_ARCH= ${MACHINE_ARCH}--freebsd
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
STRIP=
USE_AUTOTOOLS= autoconf:262
-CONFIGURE_TARGET=--build=${XEMACS_ARCH}
+CONFIGURE_TARGET=${XEMACS_ARCH}
CONFIGURE_ARGS+= --enable-mule \
--with-site-libraries='${SITE_LIBRARIES}' \
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index f31fd64f596a..8c50cf672624 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -46,7 +46,6 @@ ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
USE_AUTOTOOLS= aclocal:110 autoconf:262 automake:110 libtool:15
GNU_CONFIGURE= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"