mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
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.
This commit is contained in:
parent
687739ba7c
commit
a5106188a1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=75130
7 changed files with 42 additions and 42 deletions
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue