diff options
author | Ade Lovett <ade@FreeBSD.org> | 2005-11-15 06:52:12 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2005-11-15 06:52:12 +0000 |
commit | 54a0b86543e9ffa811825f0afecea56e89aac2a5 (patch) | |
tree | f56fb969c6a70f5e63287a4f791d035ab1ef0ddc /editors | |
parent | Remove full path in patch (diff) |
Mass-conversion to the USE_AUTOTOOLS New World Order. The code present
in bsd.autotools.mk essentially makes this a no-op given that all the
old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in
exactly the same way as USE_AUTOTOOLS itself.
Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME
team -- all GNOME 2.12.x ports use it.
Preliminary documentation can be found at:
http://people.FreeBSD.org/~ade/autotools.txt
which is in the process of being SGMLized before introduction into the
Porters Handbook.
Light blue touch-paper. Run.
Notes
Notes:
svn path=/head/; revision=148323
Diffstat (limited to 'editors')
-rw-r--r-- | editors/abiword-plugins/Makefile | 2 | ||||
-rw-r--r-- | editors/beaver/Makefile | 2 | ||||
-rw-r--r-- | editors/conglomerate/Makefile | 2 | ||||
-rw-r--r-- | editors/cooledit/Makefile | 2 | ||||
-rw-r--r-- | editors/emacs/Makefile | 2 | ||||
-rw-r--r-- | editors/emacs20-dl/Makefile | 2 | ||||
-rw-r--r-- | editors/emacs20-mule-devel/Makefile | 2 | ||||
-rw-r--r-- | editors/emacs20/Makefile | 2 | ||||
-rw-r--r-- | editors/emacs22/Makefile | 2 | ||||
-rw-r--r-- | editors/emacs23/Makefile | 2 | ||||
-rw-r--r-- | editors/ghex/Makefile | 2 | ||||
-rw-r--r-- | editors/gnotepad+/Makefile | 2 | ||||
-rw-r--r-- | editors/gphpedit/Makefile | 2 | ||||
-rw-r--r-- | editors/lpe/Makefile | 2 | ||||
-rw-r--r-- | editors/mlview/Makefile | 3 | ||||
-rw-r--r-- | editors/openoffice.org-1.0/Makefile | 2 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/Makefile | 2 | ||||
-rw-r--r-- | editors/xemacs-devel/Makefile | 2 | ||||
-rw-r--r-- | editors/xemacs/Makefile | 2 | ||||
-rw-r--r-- | editors/xemacs21-mule/Makefile | 2 | ||||
-rw-r--r-- | editors/xmleditor/Makefile | 2 |
21 files changed, 21 insertions, 22 deletions
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile index 614747c5e44d..657c9193cbc4 100644 --- a/editors/abiword-plugins/Makefile +++ b/editors/abiword-plugins/Makefile @@ -26,7 +26,7 @@ USE_GNOME= gnometarget gtk20 WANT_GNOME= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-all diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile index b17b2d1a744a..6c3c8239893d 100644 --- a/editors/beaver/Makefile +++ b/editors/beaver/Makefile @@ -17,7 +17,7 @@ COMMENT= A programmer's text editor for GTK+ 2.0 USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_AUTOTOOLS= libtool:13 USE_REINPLACE= yes USE_GNOME= gnomehack gnomeprefix gtk20 gtksourceview lthack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile index 60146a200290..38084bff0f4d 100644 --- a/editors/conglomerate/Makefile +++ b/editors/conglomerate/Makefile @@ -18,7 +18,7 @@ USE_X_PREFIX= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= libgnomeui gtksourceview gnomeprefix gnomehack intlhack -USE_LIBTOOL_VER= 15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index 4501c55e8f80..8e105eb04fa7 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -19,7 +19,7 @@ USE_PYTHON= yes USE_GETTEXT= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index b12417cff6eb..4e035ab5c90b 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -35,7 +35,7 @@ PATCHFILES= emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch PATCH_DIST_STRIP= -p1 .endif -USE_AUTOCONF_VER=213 +USE_AUTOTOOLS= autoconf:213 USE_GMAKE= yes CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile index 26772a08a628..621c5e669f26 100644 --- a/editors/emacs20-dl/Makefile +++ b/editors/emacs20-dl/Makefile @@ -28,7 +28,7 @@ RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20 WRKSRC= ${WRKDIR}/emacs-${EMACS_VER} -USE_AUTOCONF_VER= 213 +USE_AUTOTOOLS= autoconf:213 USE_GMAKE= yes MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" EMACS_VER= 20.7 diff --git a/editors/emacs20-mule-devel/Makefile b/editors/emacs20-mule-devel/Makefile index f47ed88fa1cd..011bc7e8f699 100644 --- a/editors/emacs20-mule-devel/Makefile +++ b/editors/emacs20-mule-devel/Makefile @@ -29,7 +29,7 @@ RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20 WRKSRC= ${WRKDIR}/emacs-${EMACS_VER} -USE_AUTOCONF_VER= 213 +USE_AUTOTOOLS= autoconf:213 USE_GMAKE= yes MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" EMACS_VER= 20.7 diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 53133624f1a6..c4ceb55129c2 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -27,7 +27,7 @@ CONFLICTS= emacs-19.* emacs-21.* \ ONLY_FOR_ARCHS= i386 alpha DEPRECATED= "editors/emacs is recommended instead for new installations" -USE_AUTOCONF_VER=213 +USE_AUTOTOOLS= autoconf:213 USE_GMAKE= yes EMACS_VER= 20.7 LATEST_LINK?= ${PKGNAMEPREFIX}emacs20 diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index b12417cff6eb..4e035ab5c90b 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -35,7 +35,7 @@ PATCHFILES= emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch PATCH_DIST_STRIP= -p1 .endif -USE_AUTOCONF_VER=213 +USE_AUTOTOOLS= autoconf:213 USE_GMAKE= yes CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index b12417cff6eb..4e035ab5c90b 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -35,7 +35,7 @@ PATCHFILES= emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch PATCH_DIST_STRIP= -p1 .endif -USE_AUTOCONF_VER=213 +USE_AUTOTOOLS= autoconf:213 USE_GMAKE= yes CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile index f6d1dce88e42..36c721da1c7b 100644 --- a/editors/ghex/Makefile +++ b/editors/ghex/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeprintui libgnomeui -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_OMF= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile index 1baf6ec4b648..67d98b0be45b 100644 --- a/editors/gnotepad+/Makefile +++ b/editors/gnotepad+/Makefile @@ -26,7 +26,7 @@ USE_REINPLACE= yes USE_XPM= yes WANT_GNOME= yes USE_GNOME= gtk12 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile index b3249280a550..8b0840d614ee 100644 --- a/editors/gphpedit/Makefile +++ b/editors/gphpedit/Makefile @@ -19,7 +19,7 @@ COMMENT= PHP, HTML and CSS development environment for GNOME 2.x USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml USE_X_PREFIX= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile index 05a799f2c0c8..143898877347 100644 --- a/editors/lpe/Makefile +++ b/editors/lpe/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang USE_GETTEXT= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_AUTOTOOLS= libtool:13 CONFIGURE_ENV= LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \ CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include" \ LIBS="-ltermcap" diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index 4daacce95459..9e833bcd086c 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -18,10 +18,9 @@ COMMENT= A tree oriented XML editor for Gnome USE_BZIP2= yes USE_X_PREFIX= yes -USE_AUTOCONF_VER= 259 +USE_AUTOTOOLS= autoconf:259 libtool:15 USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview USE_GMAKE= yes -USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" USE_REINPLACE= yes diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 7e496e4ac1e3..59ad7de75977 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -109,7 +109,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ Xvfb:${X_VFBSERVER_PORT} \ ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT} GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOTOOLS= autoconf:253 WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile index d5f4f97671fb..6d0d51decd3d 100644 --- a/editors/xemacs-devel-mule/Makefile +++ b/editors/xemacs-devel-mule/Makefile @@ -53,7 +53,7 @@ XEMACS_ARCH= ${MACHINE_ARCH}--freebsd WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./} STRIP= -USE_AUTOCONF_VER=259 +USE_AUTOTOOLS= autoconf:259 CONFIGURE_TARGET=--build=${XEMACS_ARCH} CONFIGURE_ARGS= --enable-mule \ diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 1bb237a098bd..6e8769dac093 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -39,7 +39,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET} WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./} STRIP= -USE_AUTOCONF_VER=259 +USE_AUTOTOOLS= autoconf:259 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd CONFIGURE_ARGS?=--enable-clash-detection \ diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index f91e8535b327..e5d352cc7729 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -28,7 +28,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET} USE_BZIP2= yes WANT_GNOME= yes STRIP= -USE_AUTOCONF_VER=213 +USE_AUTOTOOLS= autoconf:213 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd CONFIGURE_ARGS?=--with-clash-detection \ diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index 3fb92a61a8a5..f9b64a94aa09 100644 --- a/editors/xemacs21-mule/Makefile +++ b/editors/xemacs21-mule/Makefile @@ -51,7 +51,7 @@ USE_GETTEXT= yes USE_XLIB= yes USE_XPM= yes STRIP= -USE_AUTOCONF_VER= 213 +USE_AUTOTOOLS= autoconf:213 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd CONFIGURE_ARGS= --with-x11 \ diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile index e18592d9acc1..bcecf0838988 100644 --- a/editors/xmleditor/Makefile +++ b/editors/xmleditor/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_BISON= yes USE_GNOME= gnomehack libglade USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ |