Do not set AUTOCONF/AUTOMAKE_VERSION. They're set in xenocara.port.mk

13 files changed, 2 insertions, 42 deletions

diff --git a/devel/xcb-proto/Makefile b/devel/xcb-proto/Makefile
index 77afb2f..352b1bc 100644
--- a/devel/xcb-proto/Makefile
+++ b/devel/xcb-proto/Makefile
@@ -18,11 +18,6 @@ MODULES=                lang/python xenocara
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	autoreconf
 
-# for gnu stuff
-AUTOCONF_VERSION =	2.69
-AUTOMAKE_VERSION =	1.12
-
-
 NO_BUILD =		Yes
 NO_TEST =		Yes
 MODPY_BUILDDEP =	Yes
diff --git a/x11/bdftopcf/Makefile b/x11/bdftopcf/Makefile
index 6939ab2..1fd7742 100644
--- a/x11/bdftopcf/Makefile
+++ b/x11/bdftopcf/Makefile
@@ -22,9 +22,6 @@ BUILD_DEPENDS =		devel/xorgproto \
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	autoreconf
 
-AUTOCONF_VERSION =      2.69
-AUTOMAKE_VERSION =      1.12
-
 NO_TEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/x11/fonttosfnt/Makefile b/x11/fonttosfnt/Makefile
index 2688974..a16323c 100644
--- a/x11/fonttosfnt/Makefile
+++ b/x11/fonttosfnt/Makefile
@@ -23,9 +23,6 @@ LIB_DEPENDS =		print/freetype2 \
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
 
-AUTOCONF_VERSION =      2.69
-AUTOMAKE_VERSION =      1.12
-
 NO_TEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index f28e7ff..8c16eb8 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -31,9 +31,6 @@ CONFIGURE_ARGS= --enable-tcp-transport --enable-unix-transport --enable-ipv6 \
         --disable-composecache \
         --without-xmlto --without-fop --without-xsltproc
 
-AUTOCONF_VERSION =	2.69
-AUTOMAKE_VERSION =	1.12
-
 NO_TEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index c423b5c..3a88abc 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -51,7 +51,4 @@ LIB_DEPENDS =		x11/libXau \
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	autoreconf
 
-AUTOCONF_VERSION =	2.69
-AUTOMAKE_VERSION =	1.12
-
 .include <bsd.port.mk>
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index a44b1f4..e8d35b5 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -24,10 +24,6 @@ CONFIGURE_STYLE =	autoreconf
 
 CONFIGURE_ARGS =	--with-shared-memory-dir=/tmp
 
-# for gnu stuff
-AUTOCONF_VERSION =	2.69
-AUTOMAKE_VERSION =	1.12
-
 #NO_BUILD =		Yes
 NO_TEST =		Yes
 
diff --git a/x11/xcb-util-xrm/Makefile b/x11/xcb-util-xrm/Makefile
index 879ad95..61b0f2a 100644
--- a/x11/xcb-util-xrm/Makefile
+++ b/x11/xcb-util-xrm/Makefile
@@ -27,9 +27,6 @@ SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	autoreconf
 CONFIGURE_ARGS =	--without-doxygen
 
-AUTOCONF_VERSION =      2.69
-AUTOMAKE_VERSION =      1.12
-
 post-extract:
 	@cp ${FILESDIR}/*.m4 ${WRKSRC}/m4
 
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index a3498f2..37d791f 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -1,3 +1,4 @@
+
 COMMENT =	the X protocol library
 
 DISTNAME =	xcb-util-0.4.0
@@ -22,8 +23,6 @@ LIB_DEPENDS =		x11/libxcb
 
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
-AUTOCONF_VERSION =	2.69
-AUTOMAKE_VERSION =	1.12
 
 NO_TEST =		Yes
 
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index 7f59e11..de332cc 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -24,9 +24,6 @@ LIB_DEPENDS =		x11/libX11 \
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	autoreconf
 
-AUTOCONF_VERSION =      2.69
-AUTOMAKE_VERSION =      1.12
-
 CONFIGURE_ARGS =	--enable-privsep
 
 NO_TEST =		Yes
diff --git a/x11/xf86-video-amdgpu/Makefile b/x11/xf86-video-amdgpu/Makefile
index 0a8207c..05edd4d 100644
--- a/x11/xf86-video-amdgpu/Makefile
+++ b/x11/xf86-video-amdgpu/Makefile
@@ -21,9 +21,6 @@ SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	autoreconf
 CONFIGURE_ARGS = 	--with-xorg-module-dir=${X11BASE}/lib/modules \
 
-AUTOCONF_VERSION =      2.69
-AUTOMAKE_VERSION =      1.12
-
 NO_TEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index d466706..47a5dad 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -21,9 +21,6 @@ SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	autoreconf
 CONFIGURE_ARGS = 	--with-xorg-module-dir=${X11BASE}/lib/modules \
 
-AUTOCONF_VERSION =      2.69
-AUTOMAKE_VERSION =      1.12
-
 NO_TEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index 1977c26..073d8ea 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -24,9 +24,6 @@ CONFIGURE_ARGS = 	--with-xorg-module-dir=${X11BASE}/lib/modules \
 
 SHARED_LIBS = 		IntelXvMC 3.0 I810XvMC 3.0
 
-AUTOCONF_VERSION =      2.69
-AUTOMAKE_VERSION =      1.12
-
 NO_TEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 5846bef..d8e2bf5 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -47,7 +47,7 @@ LIB_DEPENDS =		graphics/pixman \
 			x11/xcb-util-renderutil \
 			x11/xcb-util-wm
 
-SEPARATE_BUILD =	no
+SEPARATE_BUILD =	yes
 CONFIGURE_STYLE =	autoreconf
 
 GLX_OPTION=     --enable-glamor
@@ -70,9 +70,6 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
                 --disable-unit-tests \
                 ${DRI_OPTION}
 
-AUTOCONF_VERSION =	2.69
-AUTOMAKE_VERSION =	1.12
-
 NO_TEST =		Yes
 
 .include <bsd.port.mk>