summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deskutils/kdepim3/Makefile31
-rw-r--r--deskutils/kdepim4/Makefile31
-rw-r--r--deskutils/kdepim44/Makefile31
-rw-r--r--graphics/kdegraphics3/Makefile55
-rw-r--r--graphics/kdegraphics4/Makefile55
-rw-r--r--multimedia/kdemultimedia3/Makefile42
-rw-r--r--multimedia/kdemultimedia4/Makefile42
-rw-r--r--x11/kde4-baseapps/Makefile19
-rw-r--r--x11/kde4-runtime/Makefile19
-rw-r--r--x11/kde4-workspace/Makefile19
-rw-r--r--x11/kdebase3/Makefile19
-rw-r--r--x11/kdebase4-runtime/Makefile19
-rw-r--r--x11/kdebase4-workspace/Makefile19
-rw-r--r--x11/kdebase4/Makefile19
14 files changed, 68 insertions, 352 deletions
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 5ad99ec..bd4b471 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -36,13 +36,6 @@ OPTIONS= KPILOT "Build KPilot, hotsync software for KDE" off \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/bin/pilot-xfer)
-. if !defined(WITH_KPILOT)
-KPILOT_OVERRIDE=yes
-WITH_KPILOT= yes
-. endif
-.endif
-
.if exists(${LOCALBASE}/bin/gnokii)
. if !defined(WITH_GNOKII)
GNOKII_OVERRIDE=yes
@@ -58,23 +51,21 @@ LIB_DEPENDS+= gnokii:${PORTSDIR}/comms/gnokii
LIB_DEPENDS+= mal:${PORTSDIR}/palm/libmal \
pisock:${PORTSDIR}/palm/pilot-link
PLIST_APPEND+= plist.kpilot
-.endif # defined ($(WITH_KPILOT))
+.elseif defined(WITHOUT_KPILOT)
+DO_NOT_COMPILE+=kpilot
+.endif
+
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif # defined(DO_NOT_COMPILE)
pre-everything::
-.if defined(KPILOT_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* pilot-link is installed but WITH_KPILOT is not set! *"
- @${ECHO_MSG} "* WITH_KPILOT has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
.if defined(GNOKII_OVERRIDE)
@${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* gnokii is installed but WITH_GNOKII is not set! *"
- @${ECHO_MSG} "* WITH_GNOKII has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
+ @${ECHO_MSG} "**********************************************************"
+ @${ECHO_MSG} "* gnokii is installed and support has been enabled *"
+ @${ECHO_MSG} "* automatically (no additional files will be installed). *"
+ @${ECHO_MSG} "**********************************************************"
@${ECHO_MSG}
.endif
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 5ad99ec..bd4b471 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -36,13 +36,6 @@ OPTIONS= KPILOT "Build KPilot, hotsync software for KDE" off \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/bin/pilot-xfer)
-. if !defined(WITH_KPILOT)
-KPILOT_OVERRIDE=yes
-WITH_KPILOT= yes
-. endif
-.endif
-
.if exists(${LOCALBASE}/bin/gnokii)
. if !defined(WITH_GNOKII)
GNOKII_OVERRIDE=yes
@@ -58,23 +51,21 @@ LIB_DEPENDS+= gnokii:${PORTSDIR}/comms/gnokii
LIB_DEPENDS+= mal:${PORTSDIR}/palm/libmal \
pisock:${PORTSDIR}/palm/pilot-link
PLIST_APPEND+= plist.kpilot
-.endif # defined ($(WITH_KPILOT))
+.elseif defined(WITHOUT_KPILOT)
+DO_NOT_COMPILE+=kpilot
+.endif
+
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif # defined(DO_NOT_COMPILE)
pre-everything::
-.if defined(KPILOT_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* pilot-link is installed but WITH_KPILOT is not set! *"
- @${ECHO_MSG} "* WITH_KPILOT has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
.if defined(GNOKII_OVERRIDE)
@${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* gnokii is installed but WITH_GNOKII is not set! *"
- @${ECHO_MSG} "* WITH_GNOKII has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
+ @${ECHO_MSG} "**********************************************************"
+ @${ECHO_MSG} "* gnokii is installed and support has been enabled *"
+ @${ECHO_MSG} "* automatically (no additional files will be installed). *"
+ @${ECHO_MSG} "**********************************************************"
@${ECHO_MSG}
.endif
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 5ad99ec..bd4b471 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -36,13 +36,6 @@ OPTIONS= KPILOT "Build KPilot, hotsync software for KDE" off \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/bin/pilot-xfer)
-. if !defined(WITH_KPILOT)
-KPILOT_OVERRIDE=yes
-WITH_KPILOT= yes
-. endif
-.endif
-
.if exists(${LOCALBASE}/bin/gnokii)
. if !defined(WITH_GNOKII)
GNOKII_OVERRIDE=yes
@@ -58,23 +51,21 @@ LIB_DEPENDS+= gnokii:${PORTSDIR}/comms/gnokii
LIB_DEPENDS+= mal:${PORTSDIR}/palm/libmal \
pisock:${PORTSDIR}/palm/pilot-link
PLIST_APPEND+= plist.kpilot
-.endif # defined ($(WITH_KPILOT))
+.elseif defined(WITHOUT_KPILOT)
+DO_NOT_COMPILE+=kpilot
+.endif
+
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif # defined(DO_NOT_COMPILE)
pre-everything::
-.if defined(KPILOT_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* pilot-link is installed but WITH_KPILOT is not set! *"
- @${ECHO_MSG} "* WITH_KPILOT has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
.if defined(GNOKII_OVERRIDE)
@${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* gnokii is installed but WITH_GNOKII is not set! *"
- @${ECHO_MSG} "* WITH_GNOKII has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
+ @${ECHO_MSG} "**********************************************************"
+ @${ECHO_MSG} "* gnokii is installed and support has been enabled *"
+ @${ECHO_MSG} "* automatically (no additional files will be installed). *"
+ @${ECHO_MSG} "**********************************************************"
@${ECHO_MSG}
.endif
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index b5af061..6fe18ea 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -44,32 +44,11 @@ OPTIONS= IMLIB "Build Kuickshow, a fast and versatile image viewer" off \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists (${X11BASE}/bin/imlib-config)
-. if !defined(WITH_IMLIB)
-IMLIB_OVERRIDE= yes
-WITH_IMLIB= yes
-. endif
-.endif
-
-.if exists(${LOCALBASE}/bin/gphoto2-config)
-. if !defined(WITH_GPHOTO2)
-GPHOTO2_OVERRIDE= yes
-WITH_GPHOTO2= yes
-. endif
-.endif
-
-.if exists (${LOCALBASE}/bin/sane-config)
-. if !defined(WITH_SANE)
-SANE_OVERRIDE= yes
-WITH_SANE= yes
-. endif
-.endif
-
.if defined(WITH_IMLIB)
USE_GNOME= imlib
PLIST_APPEND+= plist.imlib
CONFIGURE_ARGS+=--with-imlib-config=${X11BASE}/bin
-.else
+.elseif defined(WITHOUT_IMLIB)
WITHOUT_IMLIB= yes
CONFIGURE_ARGS+=--without-imlib-config
.endif
@@ -77,38 +56,20 @@ CONFIGURE_ARGS+=--without-imlib-config
.if defined(WITH_GPHOTO2)
LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
PLIST_APPEND+= plist.gphoto2
+.elseif defined(WITHOUT_GPHOTO2)
+CONFIGURE_ARGS+=--without-kamera
.endif
.if defined(WITH_SANE)
LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends
PLIST_APPEND+= plist.sane
RUN_DEPENDS+= ${LOCALBASE}/bin/gocr:${PORTSDIR}/graphics/gocr
+.elseif defined(WITHOUT_SANE)
+DO_NOT_COMPILE+=kooka
.endif
-pre-everything::
-.if defined(IMLIB_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* imlib is installed but WITH_IMLIB is not set! *"
- @${ECHO_MSG} "* WITH_IMLIB has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-.if defined(GPHOTO2_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* gphoto2 is installed but WITH_GPHOTO2 is not set! *"
- @${ECHO_MSG} "* WITH_GPHOTO2 has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-.if defined(SANE_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* sane-backends is installed but WITH_SANE is not set! *"
- @${ECHO_MSG} "* WITH_SANE has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif # defined(DO_NOT_COMPILE)
.include <bsd.port.post.mk>
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index b5af061..6fe18ea 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -44,32 +44,11 @@ OPTIONS= IMLIB "Build Kuickshow, a fast and versatile image viewer" off \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists (${X11BASE}/bin/imlib-config)
-. if !defined(WITH_IMLIB)
-IMLIB_OVERRIDE= yes
-WITH_IMLIB= yes
-. endif
-.endif
-
-.if exists(${LOCALBASE}/bin/gphoto2-config)
-. if !defined(WITH_GPHOTO2)
-GPHOTO2_OVERRIDE= yes
-WITH_GPHOTO2= yes
-. endif
-.endif
-
-.if exists (${LOCALBASE}/bin/sane-config)
-. if !defined(WITH_SANE)
-SANE_OVERRIDE= yes
-WITH_SANE= yes
-. endif
-.endif
-
.if defined(WITH_IMLIB)
USE_GNOME= imlib
PLIST_APPEND+= plist.imlib
CONFIGURE_ARGS+=--with-imlib-config=${X11BASE}/bin
-.else
+.elseif defined(WITHOUT_IMLIB)
WITHOUT_IMLIB= yes
CONFIGURE_ARGS+=--without-imlib-config
.endif
@@ -77,38 +56,20 @@ CONFIGURE_ARGS+=--without-imlib-config
.if defined(WITH_GPHOTO2)
LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
PLIST_APPEND+= plist.gphoto2
+.elseif defined(WITHOUT_GPHOTO2)
+CONFIGURE_ARGS+=--without-kamera
.endif
.if defined(WITH_SANE)
LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends
PLIST_APPEND+= plist.sane
RUN_DEPENDS+= ${LOCALBASE}/bin/gocr:${PORTSDIR}/graphics/gocr
+.elseif defined(WITHOUT_SANE)
+DO_NOT_COMPILE+=kooka
.endif
-pre-everything::
-.if defined(IMLIB_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* imlib is installed but WITH_IMLIB is not set! *"
- @${ECHO_MSG} "* WITH_IMLIB has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-.if defined(GPHOTO2_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* gphoto2 is installed but WITH_GPHOTO2 is not set! *"
- @${ECHO_MSG} "* WITH_GPHOTO2 has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-.if defined(SANE_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* sane-backends is installed but WITH_SANE is not set! *"
- @${ECHO_MSG} "* WITH_SANE has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif # defined(DO_NOT_COMPILE)
.include <bsd.port.post.mk>
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index bc17c09..32e4a5b0 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -25,8 +25,8 @@ LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \
ogg:${PORTSDIR}/audio/libogg \
tag:${PORTSDIR}/audio/taglib \
vorbis.3:${PORTSDIR}/audio/libvorbis
-BUILD_DEPENDS= trm:${PORTSDIR}/audio/trm
-RUN_DEPENDS= trm:${PORTSDIR}/audio/trm
+BUILD_DEPENDS+= trm:${PORTSDIR}/audio/trm
+RUN_DEPENDS+= trm:${PORTSDIR}/audio/trm
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
@@ -50,23 +50,11 @@ OPTIONS= LAME "Enable support for mp3 encoding using LAME" off \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/bin/lame)
-. if !defined(WITH_LAME)
-LAME_OVERRIDE= yes
-WITH_LAME= yes
-. endif
-.endif
-
-.if exists(${X11BASE}/bin/xine-config)
-. if !defined(WITH_XINE)
-XINE_OVERRIDE= yes
-WITH_XINE= yes
-. endif
-.endif
-
.if defined(WITH_LAME)
PLIST_APPEND+= plist.lame
LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame
+.elseif defined(WITHOUT_LAME)
+CONFIGURE_ARGS+= --without-lame --disable-lametest
.endif
.if defined(WITH_XINE)
@@ -74,14 +62,14 @@ PLIST_APPEND+= plist.xine
LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine
BUILD_DEPENDS+= xine-config:${PORTSDIR}/multimedia/libxine
CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
-.else
+.elseif defined(WITHOUT_XINE)
DO_NOT_COMPILE+= xine_artsplugin
CONFIGURE_ARGS+= --disable-xinetest
.endif
.if defined(WITH_MPEGLIB)
PLIST_APPEND+= plist.mpeglib
-.else
+.elseif defined(WITHOUT_MPEGLIB)
PLIST_APPEND+= plist.no-mpeglib
.endif
@@ -89,24 +77,6 @@ PLIST_APPEND+= plist.no-mpeglib
CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
.endif # defined(DO_NOT_COMPILE)
-pre-everything::
-.if defined(LAME_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* LAME is installed but WITH_LAME is not set! *"
- @${ECHO_MSG} "* WITH_LAME has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-.if defined(XINE_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* libxine is installed but WITH_XINE is not set! *"
- @${ECHO_MSG} "* WITH_XINE has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-
pre-configure:
.if !defined(WITH_MPEGLIB)
${REINPLACE_CMD} -e \
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index bc17c09..32e4a5b0 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -25,8 +25,8 @@ LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \
ogg:${PORTSDIR}/audio/libogg \
tag:${PORTSDIR}/audio/taglib \
vorbis.3:${PORTSDIR}/audio/libvorbis
-BUILD_DEPENDS= trm:${PORTSDIR}/audio/trm
-RUN_DEPENDS= trm:${PORTSDIR}/audio/trm
+BUILD_DEPENDS+= trm:${PORTSDIR}/audio/trm
+RUN_DEPENDS+= trm:${PORTSDIR}/audio/trm
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
@@ -50,23 +50,11 @@ OPTIONS= LAME "Enable support for mp3 encoding using LAME" off \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/bin/lame)
-. if !defined(WITH_LAME)
-LAME_OVERRIDE= yes
-WITH_LAME= yes
-. endif
-.endif
-
-.if exists(${X11BASE}/bin/xine-config)
-. if !defined(WITH_XINE)
-XINE_OVERRIDE= yes
-WITH_XINE= yes
-. endif
-.endif
-
.if defined(WITH_LAME)
PLIST_APPEND+= plist.lame
LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame
+.elseif defined(WITHOUT_LAME)
+CONFIGURE_ARGS+= --without-lame --disable-lametest
.endif
.if defined(WITH_XINE)
@@ -74,14 +62,14 @@ PLIST_APPEND+= plist.xine
LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine
BUILD_DEPENDS+= xine-config:${PORTSDIR}/multimedia/libxine
CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
-.else
+.elseif defined(WITHOUT_XINE)
DO_NOT_COMPILE+= xine_artsplugin
CONFIGURE_ARGS+= --disable-xinetest
.endif
.if defined(WITH_MPEGLIB)
PLIST_APPEND+= plist.mpeglib
-.else
+.elseif defined(WITHOUT_MPEGLIB)
PLIST_APPEND+= plist.no-mpeglib
.endif
@@ -89,24 +77,6 @@ PLIST_APPEND+= plist.no-mpeglib
CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
.endif # defined(DO_NOT_COMPILE)
-pre-everything::
-.if defined(LAME_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* LAME is installed but WITH_LAME is not set! *"
- @${ECHO_MSG} "* WITH_LAME has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-.if defined(XINE_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG} "* libxine is installed but WITH_XINE is not set! *"
- @${ECHO_MSG} "* WITH_XINE has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-
pre-configure:
.if !defined(WITH_MPEGLIB)
${REINPLACE_CMD} -e \
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 595550d..dc57e18 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -44,13 +44,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mwm)
-. if !defined(WITH_MOTIF)
-MOTIF_OVERRIDE= yes
-WITH_MOTIF= yes
-. endif
-.endif
-
.if defined(WITH_ARTSWRAPPER)
RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.endif
@@ -58,20 +51,10 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
-.else
+.elseif defined(WITHOUT_MOTIF)
CONFIGURE_ARGS+= --without-motif
.endif
-pre-everything::
-.if defined(MOTIF_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* openmotif is installed but WITH_MOTIF is not set! *"
- @${ECHO_MSG} "* WITH_MOTIF has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 595550d..dc57e18 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -44,13 +44,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mwm)
-. if !defined(WITH_MOTIF)
-MOTIF_OVERRIDE= yes
-WITH_MOTIF= yes
-. endif
-.endif
-
.if defined(WITH_ARTSWRAPPER)
RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.endif
@@ -58,20 +51,10 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
-.else
+.elseif defined(WITHOUT_MOTIF)
CONFIGURE_ARGS+= --without-motif
.endif
-pre-everything::
-.if defined(MOTIF_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* openmotif is installed but WITH_MOTIF is not set! *"
- @${ECHO_MSG} "* WITH_MOTIF has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 595550d..dc57e18 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -44,13 +44,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mwm)
-. if !defined(WITH_MOTIF)
-MOTIF_OVERRIDE= yes
-WITH_MOTIF= yes
-. endif
-.endif
-
.if defined(WITH_ARTSWRAPPER)
RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.endif
@@ -58,20 +51,10 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
-.else
+.elseif defined(WITHOUT_MOTIF)
CONFIGURE_ARGS+= --without-motif
.endif
-pre-everything::
-.if defined(MOTIF_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* openmotif is installed but WITH_MOTIF is not set! *"
- @${ECHO_MSG} "* WITH_MOTIF has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 595550d..dc57e18 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -44,13 +44,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mwm)
-. if !defined(WITH_MOTIF)
-MOTIF_OVERRIDE= yes
-WITH_MOTIF= yes
-. endif
-.endif
-
.if defined(WITH_ARTSWRAPPER)
RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.endif
@@ -58,20 +51,10 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
-.else
+.elseif defined(WITHOUT_MOTIF)
CONFIGURE_ARGS+= --without-motif
.endif
-pre-everything::
-.if defined(MOTIF_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* openmotif is installed but WITH_MOTIF is not set! *"
- @${ECHO_MSG} "* WITH_MOTIF has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 595550d..dc57e18 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -44,13 +44,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mwm)
-. if !defined(WITH_MOTIF)
-MOTIF_OVERRIDE= yes
-WITH_MOTIF= yes
-. endif
-.endif
-
.if defined(WITH_ARTSWRAPPER)
RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.endif
@@ -58,20 +51,10 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
-.else
+.elseif defined(WITHOUT_MOTIF)
CONFIGURE_ARGS+= --without-motif
.endif
-pre-everything::
-.if defined(MOTIF_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* openmotif is installed but WITH_MOTIF is not set! *"
- @${ECHO_MSG} "* WITH_MOTIF has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 595550d..dc57e18 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -44,13 +44,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mwm)
-. if !defined(WITH_MOTIF)
-MOTIF_OVERRIDE= yes
-WITH_MOTIF= yes
-. endif
-.endif
-
.if defined(WITH_ARTSWRAPPER)
RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.endif
@@ -58,20 +51,10 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
-.else
+.elseif defined(WITHOUT_MOTIF)
CONFIGURE_ARGS+= --without-motif
.endif
-pre-everything::
-.if defined(MOTIF_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* openmotif is installed but WITH_MOTIF is not set! *"
- @${ECHO_MSG} "* WITH_MOTIF has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 595550d..dc57e18 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -44,13 +44,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mwm)
-. if !defined(WITH_MOTIF)
-MOTIF_OVERRIDE= yes
-WITH_MOTIF= yes
-. endif
-.endif
-
.if defined(WITH_ARTSWRAPPER)
RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.endif
@@ -58,20 +51,10 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
-.else
+.elseif defined(WITHOUT_MOTIF)
CONFIGURE_ARGS+= --without-motif
.endif
-pre-everything::
-.if defined(MOTIF_OVERRIDE)
- @${ECHO_MSG}
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG} "* openmotif is installed but WITH_MOTIF is not set! *"
- @${ECHO_MSG} "* WITH_MOTIF has been enabled automatically. *"
- @${ECHO_MSG} "*******************************************************"
- @${ECHO_MSG}
-.endif
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
OpenPOWER on IntegriCloud