Re-enable Xinerama support and remove Java support by default. The former

never broke anything according to our records and the latter breaks builds
when (specific?) JDKs are installed.

7 files changed, 42 insertions, 42 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index ae01a351e0da..9229fcfd5f07 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install		\
 		--without-ldap			\
 		--disable-closure		\
 		${XINERAMA}			\
+		--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
 
@@ -69,15 +70,14 @@ WITH_FONTCONFIG=yes
 LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 .endif
 
-.if defined(WITH_XINERAMA)
-XINERAMA=	-with-xinerama
-PKGNAMESUFFIX=	-xinerama
+.if defined(WITHOUT_XINERAMA)
+XINERAMA=	--without-xinerama
 .else
-XINERAMA=	-without-xinerama
+XINERAMA=	--with-xinerama
 pre-extract::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Xinerama support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XINERAMA=yes\""
+	@${ECHO_MSG} "If you don't want to compile with Xinerama support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
 	@${ECHO_MSG}
 .endif # defined(WITH_XINERAMA)
 
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index ae01a351e0da..9229fcfd5f07 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install		\
 		--without-ldap			\
 		--disable-closure		\
 		${XINERAMA}			\
+		--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
 
@@ -69,15 +70,14 @@ WITH_FONTCONFIG=yes
 LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 .endif
 
-.if defined(WITH_XINERAMA)
-XINERAMA=	-with-xinerama
-PKGNAMESUFFIX=	-xinerama
+.if defined(WITHOUT_XINERAMA)
+XINERAMA=	--without-xinerama
 .else
-XINERAMA=	-without-xinerama
+XINERAMA=	--with-xinerama
 pre-extract::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Xinerama support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XINERAMA=yes\""
+	@${ECHO_MSG} "If you don't want to compile with Xinerama support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
 	@${ECHO_MSG}
 .endif # defined(WITH_XINERAMA)
 
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index ae01a351e0da..9229fcfd5f07 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install		\
 		--without-ldap			\
 		--disable-closure		\
 		${XINERAMA}			\
+		--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
 
@@ -69,15 +70,14 @@ WITH_FONTCONFIG=yes
 LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 .endif
 
-.if defined(WITH_XINERAMA)
-XINERAMA=	-with-xinerama
-PKGNAMESUFFIX=	-xinerama
+.if defined(WITHOUT_XINERAMA)
+XINERAMA=	--without-xinerama
 .else
-XINERAMA=	-without-xinerama
+XINERAMA=	--with-xinerama
 pre-extract::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Xinerama support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XINERAMA=yes\""
+	@${ECHO_MSG} "If you don't want to compile with Xinerama support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
 	@${ECHO_MSG}
 .endif # defined(WITH_XINERAMA)
 
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index ae01a351e0da..9229fcfd5f07 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install		\
 		--without-ldap			\
 		--disable-closure		\
 		${XINERAMA}			\
+		--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
 
@@ -69,15 +70,14 @@ WITH_FONTCONFIG=yes
 LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 .endif
 
-.if defined(WITH_XINERAMA)
-XINERAMA=	-with-xinerama
-PKGNAMESUFFIX=	-xinerama
+.if defined(WITHOUT_XINERAMA)
+XINERAMA=	--without-xinerama
 .else
-XINERAMA=	-without-xinerama
+XINERAMA=	--with-xinerama
 pre-extract::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Xinerama support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XINERAMA=yes\""
+	@${ECHO_MSG} "If you don't want to compile with Xinerama support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
 	@${ECHO_MSG}
 .endif # defined(WITH_XINERAMA)
 
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index ae01a351e0da..9229fcfd5f07 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install		\
 		--without-ldap			\
 		--disable-closure		\
 		${XINERAMA}			\
+		--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
 
@@ -69,15 +70,14 @@ WITH_FONTCONFIG=yes
 LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 .endif
 
-.if defined(WITH_XINERAMA)
-XINERAMA=	-with-xinerama
-PKGNAMESUFFIX=	-xinerama
+.if defined(WITHOUT_XINERAMA)
+XINERAMA=	--without-xinerama
 .else
-XINERAMA=	-without-xinerama
+XINERAMA=	--with-xinerama
 pre-extract::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Xinerama support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XINERAMA=yes\""
+	@${ECHO_MSG} "If you don't want to compile with Xinerama support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
 	@${ECHO_MSG}
 .endif # defined(WITH_XINERAMA)
 
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index ae01a351e0da..9229fcfd5f07 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install		\
 		--without-ldap			\
 		--disable-closure		\
 		${XINERAMA}			\
+		--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
 
@@ -69,15 +70,14 @@ WITH_FONTCONFIG=yes
 LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 .endif
 
-.if defined(WITH_XINERAMA)
-XINERAMA=	-with-xinerama
-PKGNAMESUFFIX=	-xinerama
+.if defined(WITHOUT_XINERAMA)
+XINERAMA=	--without-xinerama
 .else
-XINERAMA=	-without-xinerama
+XINERAMA=	--with-xinerama
 pre-extract::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Xinerama support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XINERAMA=yes\""
+	@${ECHO_MSG} "If you don't want to compile with Xinerama support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
 	@${ECHO_MSG}
 .endif # defined(WITH_XINERAMA)
 
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index ae01a351e0da..9229fcfd5f07 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install		\
 		--without-ldap			\
 		--disable-closure		\
 		${XINERAMA}			\
+		--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
 
@@ -69,15 +70,14 @@ WITH_FONTCONFIG=yes
 LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 .endif
 
-.if defined(WITH_XINERAMA)
-XINERAMA=	-with-xinerama
-PKGNAMESUFFIX=	-xinerama
+.if defined(WITHOUT_XINERAMA)
+XINERAMA=	--without-xinerama
 .else
-XINERAMA=	-without-xinerama
+XINERAMA=	--with-xinerama
 pre-extract::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Xinerama support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XINERAMA=yes\""
+	@${ECHO_MSG} "If you don't want to compile with Xinerama support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
 	@${ECHO_MSG}
 .endif # defined(WITH_XINERAMA)