diff options
56 files changed, 365 insertions, 77 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index ddaa492bc2ef..d67ccbedea49 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -28,14 +28,17 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -_NO_KDE_FINAL= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} .include <bsd.port.pre.mk> +_NO_KDE_FINAL= yes +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \ ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index ddaa492bc2ef..d67ccbedea49 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -28,14 +28,17 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -_NO_KDE_FINAL= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} .include <bsd.port.pre.mk> +_NO_KDE_FINAL= yes +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \ ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile index 4185e7a41cd3..7d9c3d4d4f47 100644 --- a/deskutils/kdepim/Makefile +++ b/deskutils/kdepim/Makefile @@ -24,6 +24,11 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib @@ -55,4 +60,4 @@ pre-configure: find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \ "s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index 4185e7a41cd3..7d9c3d4d4f47 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -24,6 +24,11 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib @@ -55,4 +60,4 @@ pre-configure: find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \ "s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 4185e7a41cd3..7d9c3d4d4f47 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -24,6 +24,11 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib @@ -55,4 +60,4 @@ pre-configure: find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \ "s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index 4185e7a41cd3..7d9c3d4d4f47 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -24,6 +24,11 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib @@ -55,4 +60,4 @@ pre-configure: find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \ "s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile index a9785ad8cca5..5b5180b3222f 100644 --- a/devel/kdesdk/Makefile +++ b/devel/kdesdk/Makefile @@ -22,6 +22,11 @@ USE_KDEBASE_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes @@ -41,4 +46,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index a9785ad8cca5..5b5180b3222f 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -22,6 +22,11 @@ USE_KDEBASE_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes @@ -41,4 +46,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index a9785ad8cca5..5b5180b3222f 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -22,6 +22,11 @@ USE_KDEBASE_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes @@ -41,4 +46,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 89fd4472b804..8adaed121227 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -38,6 +38,12 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-everything:: @@ -62,4 +68,4 @@ pre-configure: pre-build: ${PERL} -pi -e "s@libkdeui.so.3@libkdeui.so@g" ${WRKSRC}/kdevelop/main.cpp -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile index 4235dae7298b..0426e734bb8f 100644 --- a/games/kdegames2/Makefile +++ b/games/kdegames2/Makefile @@ -22,6 +22,12 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -35,4 +41,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 4235dae7298b..0426e734bb8f 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -22,6 +22,12 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -35,4 +41,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 4235dae7298b..0426e734bb8f 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -22,6 +22,12 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -35,4 +41,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index 29147602fc45..7e907f21dd23 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -26,10 +26,15 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+=--without-kamera -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + # temporarily disable kamera, it requires gphoto2 PLIST_SUB+= KAMERA="@comment " diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 29147602fc45..7e907f21dd23 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -26,10 +26,15 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+=--without-kamera -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + # temporarily disable kamera, it requires gphoto2 PLIST_SUB+= KAMERA="@comment " diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 29147602fc45..7e907f21dd23 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -26,10 +26,15 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+=--without-kamera -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + # temporarily disable kamera, it requires gphoto2 PLIST_SUB+= KAMERA="@comment " diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/misc/kdeaddons/Makefile b/misc/kdeaddons/Makefile index 28daacabb888..626bc9737e1f 100644 --- a/misc/kdeaddons/Makefile +++ b/misc/kdeaddons/Makefile @@ -27,10 +27,14 @@ USE_GMAKE= yes PLIST_SUB+= RM=${RM} CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile index 28daacabb888..626bc9737e1f 100644 --- a/misc/kdeaddons3/Makefile +++ b/misc/kdeaddons3/Makefile @@ -27,10 +27,14 @@ USE_GMAKE= yes PLIST_SUB+= RM=${RM} CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index ddaa492bc2ef..d67ccbedea49 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -28,14 +28,17 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -_NO_KDE_FINAL= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} .include <bsd.port.pre.mk> +_NO_KDE_FINAL= yes +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \ ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index ddaa492bc2ef..d67ccbedea49 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -28,14 +28,17 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -_NO_KDE_FINAL= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} .include <bsd.port.pre.mk> +_NO_KDE_FINAL= yes +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \ ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index 10308ce38b47..1e2163b2dd07 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -27,6 +27,12 @@ USE_GMAKE= yes CONFIGURE_ENV+= PATH=${WRKSRC}/auto-bin:$$PATH MAKE_ENV= ${CONFIGURE_ENV} +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -43,4 +49,4 @@ pre-configure: ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${PERL} -pi -e "s@^AC_CHECK_UTMP_FILE@# AC_CHECK_UTMP_FILE@g" ${WRKSRC}/configure.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 10308ce38b47..1e2163b2dd07 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -27,6 +27,12 @@ USE_GMAKE= yes CONFIGURE_ENV+= PATH=${WRKSRC}/auto-bin:$$PATH MAKE_ENV= ${CONFIGURE_ENV} +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -43,4 +49,4 @@ pre-configure: ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${PERL} -pi -e "s@^AC_CHECK_UTMP_FILE@# AC_CHECK_UTMP_FILE@g" ${WRKSRC}/configure.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 10308ce38b47..1e2163b2dd07 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -27,6 +27,12 @@ USE_GMAKE= yes CONFIGURE_ENV+= PATH=${WRKSRC}/auto-bin:$$PATH MAKE_ENV= ${CONFIGURE_ENV} +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -43,4 +49,4 @@ pre-configure: ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${PERL} -pi -e "s@^AC_CHECK_UTMP_FILE@# AC_CHECK_UTMP_FILE@g" ${WRKSRC}/configure.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/security/kwallet/Makefile +++ b/security/kwallet/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/kdeadmin/Makefile b/sysutils/kdeadmin/Makefile index cf8832c0e7d3..01435bfaaeef 100644 --- a/sysutils/kdeadmin/Makefile +++ b/sysutils/kdeadmin/Makefile @@ -23,6 +23,12 @@ USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -39,4 +45,4 @@ pre-configure: find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ | xargs ${PERL} -pi -e "s#typedef __off64_t off64_t;##g" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile index cf8832c0e7d3..01435bfaaeef 100644 --- a/sysutils/kdeadmin3/Makefile +++ b/sysutils/kdeadmin3/Makefile @@ -23,6 +23,12 @@ USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -39,4 +45,4 @@ pre-configure: find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ | xargs ${PERL} -pi -e "s#typedef __off64_t off64_t;##g" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index cf8832c0e7d3..01435bfaaeef 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -23,6 +23,12 @@ USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -39,4 +45,4 @@ pre-configure: find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ | xargs ${PERL} -pi -e "s#typedef __off64_t off64_t;##g" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index 858ca8e566a6..fd18c7ac3fb0 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile index 20ed0ce76568..3c55f0e4e6bd 100644 --- a/x11-clocks/kdetoys2/Makefile +++ b/x11-clocks/kdetoys2/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} USE_GMAKE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index 20ed0ce76568..3c55f0e4e6bd 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} USE_GMAKE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index 20ed0ce76568..3c55f0e4e6bd 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -24,6 +24,12 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} USE_GMAKE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +43,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile index e7e9a4803a79..4e672bc89eae 100644 --- a/x11-themes/kdeartwork3/Makefile +++ b/x11-themes/kdeartwork3/Makefile @@ -23,6 +23,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_SHLIB= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -36,4 +42,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile index e7e9a4803a79..4e672bc89eae 100644 --- a/x11-themes/kdeartwork4/Makefile +++ b/x11-themes/kdeartwork4/Makefile @@ -23,6 +23,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_SHLIB= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -36,4 +42,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/kdeartwork/Makefile b/x11-wm/kdeartwork/Makefile index e7e9a4803a79..4e672bc89eae 100644 --- a/x11-wm/kdeartwork/Makefile +++ b/x11-wm/kdeartwork/Makefile @@ -23,6 +23,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_SHLIB= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -36,4 +42,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/kdeartwork3/Makefile b/x11-wm/kdeartwork3/Makefile index e7e9a4803a79..4e672bc89eae 100644 --- a/x11-wm/kdeartwork3/Makefile +++ b/x11-wm/kdeartwork3/Makefile @@ -23,6 +23,12 @@ GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_SHLIB= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -36,4 +42,4 @@ pre-configure: cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 66e26fa7ceeb..042ef81f0608 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 66e26fa7ceeb..042ef81f0608 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 66e26fa7ceeb..042ef81f0608 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 66e26fa7ceeb..042ef81f0608 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 66e26fa7ceeb..042ef81f0608 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 66e26fa7ceeb..042ef81f0608 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 66e26fa7ceeb..042ef81f0608 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 66e26fa7ceeb..042ef81f0608 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure USE_GMAKE= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 48a1f7455feb..1a1de25b5580 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -37,14 +37,18 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" LDCONFIG="${LDCONFIG}" -.include <bsd.port.pre.mk> - pre-fetch: .if ${OSVERSION} <= 410002 @${ECHO} diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 48a1f7455feb..1a1de25b5580 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -37,14 +37,18 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" LDCONFIG="${LDCONFIG}" -.include <bsd.port.pre.mk> - pre-fetch: .if ${OSVERSION} <= 410002 @${ECHO} diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 48a1f7455feb..1a1de25b5580 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -37,14 +37,18 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" LDCONFIG="${LDCONFIG}" -.include <bsd.port.pre.mk> - pre-fetch: .if ${OSVERSION} <= 410002 @${ECHO} |