diff options
63 files changed, 252 insertions, 922 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index bc4659359877..16e24185ebe4 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 @@ -27,15 +24,9 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index bc4659359877..16e24185ebe4 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 @@ -27,15 +24,9 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile index 875c0386e052..2cdf49b1a756 100644 --- a/deskutils/kdepim/Makefile +++ b/deskutils/kdepim/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_KDELIBS_VER=2 @@ -26,18 +23,9 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index 875c0386e052..2cdf49b1a756 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_KDELIBS_VER=2 @@ -26,18 +23,9 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 875c0386e052..2cdf49b1a756 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_KDELIBS_VER=2 @@ -26,18 +23,9 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index 875c0386e052..2cdf49b1a756 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_KDELIBS_VER=2 @@ -26,18 +23,9 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile index c868afb51829..a9785ad8cca5 100644 --- a/devel/kdesdk/Makefile +++ b/devel/kdesdk/Makefile @@ -16,27 +16,14 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db USE_KDEBASE_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + USE_GMAKE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde2 diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index c868afb51829..a9785ad8cca5 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -16,27 +16,14 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db USE_KDEBASE_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + USE_GMAKE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde2 diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index c868afb51829..a9785ad8cca5 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -16,27 +16,14 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db USE_KDEBASE_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + USE_GMAKE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde2 diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 1616c61e78e6..5b141e827a02 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \ autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake .if defined(WITH_OPTIONAL_DEPENDS) RUN_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf \ @@ -40,18 +37,8 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-everything:: .if !defined(WITH_OPTIONAL_DEPENDS) diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 69f321887c99..03fa731054c6 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -21,21 +21,14 @@ LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv USE_KDELIBS_VER=2 USE_PYTHON= yes -PYTHON_VERSION= python2.1 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +_NO_KDE_OBJPRELINK= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + post-patch: @${PERL} -pi -e "s@Icon=killustrator@Icon=kontour@g" \ ${WRKSRC}/templates/Illustration.desktop diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 69f321887c99..03fa731054c6 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -21,21 +21,14 @@ LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv USE_KDELIBS_VER=2 USE_PYTHON= yes -PYTHON_VERSION= python2.1 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +_NO_KDE_OBJPRELINK= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + post-patch: @${PERL} -pi -e "s@Icon=killustrator@Icon=kontour@g" \ ${WRKSRC}/templates/Illustration.desktop diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 69f321887c99..03fa731054c6 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -21,21 +21,14 @@ LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv USE_KDELIBS_VER=2 USE_PYTHON= yes -PYTHON_VERSION= python2.1 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +_NO_KDE_OBJPRELINK= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + post-patch: @${PERL} -pi -e "s@Icon=killustrator@Icon=kontour@g" \ ${WRKSRC}/templates/Illustration.desktop diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile index 69f321887c99..03fa731054c6 100644 --- a/editors/koffice/Makefile +++ b/editors/koffice/Makefile @@ -21,21 +21,14 @@ LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv USE_KDELIBS_VER=2 USE_PYTHON= yes -PYTHON_VERSION= python2.1 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +_NO_KDE_OBJPRELINK= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + post-patch: @${PERL} -pi -e "s@Icon=killustrator@Icon=kontour@g" \ ${WRKSRC}/templates/Illustration.desktop diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile index 6d2c67c38547..4235dae7298b 100644 --- a/games/kdegames2/Makefile +++ b/games/kdegames2/Makefile @@ -16,28 +16,14 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 6d2c67c38547..4235dae7298b 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -16,28 +16,14 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 6d2c67c38547..4235dae7298b 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -16,28 +16,14 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index e39dc48cf44b..29147602fc45 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdegraphics PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,14 +15,9 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX \ - autoconf213:${PORTSDIR}/devel/autoconf213 \ +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif -RUN_DEPENDS= dvips:${PORTSDIR}/print/teTeX \ - gs:${PORTSDIR}/print/ghostscript-gnu +RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu USE_KDELIBS_VER=2 USE_BZIP2= yes @@ -30,18 +25,8 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+=--without-kamera -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" .include <bsd.port.pre.mk> diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index e39dc48cf44b..29147602fc45 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdegraphics PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,14 +15,9 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX \ - autoconf213:${PORTSDIR}/devel/autoconf213 \ +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif -RUN_DEPENDS= dvips:${PORTSDIR}/print/teTeX \ - gs:${PORTSDIR}/print/ghostscript-gnu +RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu USE_KDELIBS_VER=2 USE_BZIP2= yes @@ -30,18 +25,8 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+=--without-kamera -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" .include <bsd.port.pre.mk> diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index e39dc48cf44b..29147602fc45 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdegraphics PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,14 +15,9 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX \ - autoconf213:${PORTSDIR}/devel/autoconf213 \ +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif -RUN_DEPENDS= dvips:${PORTSDIR}/print/teTeX \ - gs:${PORTSDIR}/print/ghostscript-gnu +RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu USE_KDELIBS_VER=2 USE_BZIP2= yes @@ -30,18 +25,8 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+=--without-kamera -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" .include <bsd.port.pre.mk> diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/misc/kdeaddons/Makefile b/misc/kdeaddons/Makefile index 0d2d517b904c..28daacabb888 100644 --- a/misc/kdeaddons/Makefile +++ b/misc/kdeaddons/Makefile @@ -16,9 +16,6 @@ MAINTAINER?= ports@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS+= noatun.0:${PORTSDIR}/audio/kdemultimedia2 \ SDL-1.1.3:${PORTSDIR}/devel/sdl12 @@ -29,19 +26,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes PLIST_SUB+= RM=${RM} CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" .include <bsd.port.pre.mk> diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile index 0d2d517b904c..28daacabb888 100644 --- a/misc/kdeaddons3/Makefile +++ b/misc/kdeaddons3/Makefile @@ -16,9 +16,6 @@ MAINTAINER?= ports@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS+= noatun.0:${PORTSDIR}/audio/kdemultimedia2 \ SDL-1.1.3:${PORTSDIR}/devel/sdl12 @@ -29,19 +26,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes PLIST_SUB+= RM=${RM} CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" .include <bsd.port.pre.mk> diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index bc4659359877..16e24185ebe4 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 @@ -27,15 +24,9 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index bc4659359877..16e24185ebe4 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 @@ -27,15 +24,9 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index ac64d1379e48..10308ce38b47 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -17,32 +17,18 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes CONFIGURE_ENV+= PATH=${WRKSRC}/auto-bin:$$PATH MAKE_ENV= ${CONFIGURE_ENV} +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index ac64d1379e48..10308ce38b47 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -17,32 +17,18 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes CONFIGURE_ENV+= PATH=${WRKSRC}/auto-bin:$$PATH MAKE_ENV= ${CONFIGURE_ENV} +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index ac64d1379e48..10308ce38b47 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -17,32 +17,18 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes CONFIGURE_ENV+= PATH=${WRKSRC}/auto-bin:$$PATH MAKE_ENV= ${CONFIGURE_ENV} +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/security/kwallet/Makefile +++ b/security/kwallet/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/sysutils/kdeadmin/Makefile b/sysutils/kdeadmin/Makefile index e86ea502b1c2..cf8832c0e7d3 100644 --- a/sysutils/kdeadmin/Makefile +++ b/sysutils/kdeadmin/Makefile @@ -16,28 +16,14 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: ${MKDIR} ${WRKSRC}/auto-bin diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile index e86ea502b1c2..cf8832c0e7d3 100644 --- a/sysutils/kdeadmin3/Makefile +++ b/sysutils/kdeadmin3/Makefile @@ -16,28 +16,14 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: ${MKDIR} ${WRKSRC}/auto-bin diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index e86ea502b1c2..cf8832c0e7d3 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -16,28 +16,14 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: ${MKDIR} ${WRKSRC}/auto-bin diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -16,30 +16,16 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile index 0694c7cf96c9..20ed0ce76568 100644 --- a/x11-clocks/kdetoys2/Makefile +++ b/x11-clocks/kdetoys2/Makefile @@ -16,29 +16,16 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index 0694c7cf96c9..20ed0ce76568 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -16,29 +16,16 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index 0694c7cf96c9..20ed0ce76568 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -16,29 +16,16 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile index 593c3c9319f2..e7e9a4803a79 100644 --- a/x11-themes/kdeartwork3/Makefile +++ b/x11-themes/kdeartwork3/Makefile @@ -16,29 +16,15 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes INSTALLS_SHLIB= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile index 593c3c9319f2..e7e9a4803a79 100644 --- a/x11-themes/kdeartwork4/Makefile +++ b/x11-themes/kdeartwork4/Makefile @@ -16,29 +16,15 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes INSTALLS_SHLIB= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/x11-wm/kdeartwork/Makefile b/x11-wm/kdeartwork/Makefile index 593c3c9319f2..e7e9a4803a79 100644 --- a/x11-wm/kdeartwork/Makefile +++ b/x11-wm/kdeartwork/Makefile @@ -16,29 +16,15 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes INSTALLS_SHLIB= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/x11-wm/kdeartwork3/Makefile b/x11-wm/kdeartwork3/Makefile index 593c3c9319f2..e7e9a4803a79 100644 --- a/x11-wm/kdeartwork3/Makefile +++ b/x11-wm/kdeartwork3/Makefile @@ -16,29 +16,15 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes INSTALLS_SHLIB= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/x11/kde2/Makefile.kde b/x11/kde2/Makefile.kde new file mode 100644 index 000000000000..58fe75a64083 --- /dev/null +++ b/x11/kde2/Makefile.kde @@ -0,0 +1,37 @@ +# This is a simple set of Makefile macros which allow the core kde ports to +# bring these in automatically since it's tiring to modify all of them to +# add more of these. These don't belong in bsd.kde.mk because they aren't +# very likely to apply outside of KDE core modules. Nonetheless, also +# provide variables to remove one or more of these. +# +# $FreeBSD$ + +CONFIGURE_ARGS?= + +.if !defined(_NO_KDE_OBJPRELINK) +.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) +BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink +CONFIGURE_ARGS+=--enable-objprelink +.endif +.endif + +.if !defined(_NO_KDE_FINAL) +.if defined(PARALLEL_PACKAGE_BUILD) || !defined(NO_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.endif + +.if !defined(_NO_KDE_NDEBUG) +.if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG) +CONFIGURE_ARGS+=--disable-debug +.else +CONFIGURE_ARGS+=--enable-debug +STRIP='' +.endif +.endif + +.if !defined(_NO_KDE_NON_I386_OPTS) +.if ${MACHINE_ARCH} == "alpha" +CFLAGS= -O0 ${KDE_CFLAGS} +.endif +.endif diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde new file mode 100644 index 000000000000..58fe75a64083 --- /dev/null +++ b/x11/kde3/Makefile.kde @@ -0,0 +1,37 @@ +# This is a simple set of Makefile macros which allow the core kde ports to +# bring these in automatically since it's tiring to modify all of them to +# add more of these. These don't belong in bsd.kde.mk because they aren't +# very likely to apply outside of KDE core modules. Nonetheless, also +# provide variables to remove one or more of these. +# +# $FreeBSD$ + +CONFIGURE_ARGS?= + +.if !defined(_NO_KDE_OBJPRELINK) +.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) +BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink +CONFIGURE_ARGS+=--enable-objprelink +.endif +.endif + +.if !defined(_NO_KDE_FINAL) +.if defined(PARALLEL_PACKAGE_BUILD) || !defined(NO_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.endif + +.if !defined(_NO_KDE_NDEBUG) +.if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG) +CONFIGURE_ARGS+=--disable-debug +.else +CONFIGURE_ARGS+=--enable-debug +STRIP='' +.endif +.endif + +.if !defined(_NO_KDE_NON_I386_OPTS) +.if ${MACHINE_ARCH} == "alpha" +CFLAGS= -O0 ${KDE_CFLAGS} +.endif +.endif diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 20a23b1b6eaa..1173bb45a718 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -33,20 +30,10 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ --without-ldap --disable-closure -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .include <bsd.port.pre.mk> .if exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 20a23b1b6eaa..1173bb45a718 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -33,20 +30,10 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ --without-ldap --disable-closure -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .include <bsd.port.pre.mk> .if exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 20a23b1b6eaa..1173bb45a718 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -33,20 +30,10 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ --without-ldap --disable-closure -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .include <bsd.port.pre.mk> .if exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde new file mode 100644 index 000000000000..58fe75a64083 --- /dev/null +++ b/x11/kde4/Makefile.kde @@ -0,0 +1,37 @@ +# This is a simple set of Makefile macros which allow the core kde ports to +# bring these in automatically since it's tiring to modify all of them to +# add more of these. These don't belong in bsd.kde.mk because they aren't +# very likely to apply outside of KDE core modules. Nonetheless, also +# provide variables to remove one or more of these. +# +# $FreeBSD$ + +CONFIGURE_ARGS?= + +.if !defined(_NO_KDE_OBJPRELINK) +.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) +BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink +CONFIGURE_ARGS+=--enable-objprelink +.endif +.endif + +.if !defined(_NO_KDE_FINAL) +.if defined(PARALLEL_PACKAGE_BUILD) || !defined(NO_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.endif + +.if !defined(_NO_KDE_NDEBUG) +.if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG) +CONFIGURE_ARGS+=--disable-debug +.else +CONFIGURE_ARGS+=--enable-debug +STRIP='' +.endif +.endif + +.if !defined(_NO_KDE_NON_I386_OPTS) +.if ${MACHINE_ARCH} == "alpha" +CFLAGS= -O0 ${KDE_CFLAGS} +.endif +.endif diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 20a23b1b6eaa..1173bb45a718 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -33,20 +30,10 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ --without-ldap --disable-closure -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .include <bsd.port.pre.mk> .if exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 20a23b1b6eaa..1173bb45a718 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -33,20 +30,10 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ --without-ldap --disable-closure -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .include <bsd.port.pre.mk> .if exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 20a23b1b6eaa..1173bb45a718 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -33,20 +30,10 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ --without-ldap --disable-closure -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .include <bsd.port.pre.mk> .if exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 20a23b1b6eaa..1173bb45a718 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -33,20 +30,10 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ --without-ldap --disable-closure -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .include <bsd.port.pre.mk> .if exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 20a23b1b6eaa..1173bb45a718 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -33,20 +30,10 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ --without-ldap --disable-closure -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + .include <bsd.port.pre.mk> .if exists(${X11BASE}/include/Xm/Xm.h) diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index bbfd19d1fbbc..51a2c7d8f2be 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 \ autoconf213:${PORTSDIR}/devel/autoconf213 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ fam.0:${PORTSDIR}/devel/fam \ @@ -39,22 +36,8 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif -.if ${MACHINE_ARCH} == "alpha" -CFLAGS= -O0 ${KDE_CFLAGS} -D__PATH_SU=/usr/bin/su -.endif +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index bbfd19d1fbbc..51a2c7d8f2be 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 \ autoconf213:${PORTSDIR}/devel/autoconf213 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ fam.0:${PORTSDIR}/devel/fam \ @@ -39,22 +36,8 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif -.if ${MACHINE_ARCH} == "alpha" -CFLAGS= -O0 ${KDE_CFLAGS} -D__PATH_SU=/usr/bin/su -.endif +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index bbfd19d1fbbc..51a2c7d8f2be 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -17,9 +17,6 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 \ autoconf213:${PORTSDIR}/devel/autoconf213 -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink -.endif LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ fam.0:${PORTSDIR}/devel/fam \ @@ -39,22 +36,8 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.else -CONFIGURE_ARGS+=--enable-debug -STRIP='' -.endif -.if ${MACHINE_ARCH} == "alpha" -CFLAGS= -O0 ${KDE_CFLAGS} -D__PATH_SU=/usr/bin/su -.endif +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" |