From 5b08f9683b58edd3e655b46998ef5428091ed393 Mon Sep 17 00:00:00 2001 From: espie Date: Wed, 10 Apr 2002 01:24:38 +0000 Subject: [PATCH] Use a common Makefile.inc to remove lots of common parts in all kde dirs. Remove lame stuff in base3, since run-time auto-detection is working now. --- x11/kde/Makefile.inc | 52 +++++++ x11/kde/addons3/Makefile | 55 +------ x11/kde/arts3/Makefile | 51 +------ x11/kde/artwork2/Makefile | 52 +------ x11/kde/artwork3/Makefile | 54 +------ x11/kde/base2/Makefile | 57 +------- x11/kde/base3/Makefile | 66 +-------- x11/kde/base3/files/lame.c | 173 ----------------------- x11/kde/base3/pkg/PFRAG.shared | 3 +- x11/kde/edu3/Makefile | 55 +------ x11/kde/games2/Makefile | 43 +----- x11/kde/games3/Makefile | 46 +----- x11/kde/graphics2/Makefile | 42 +----- x11/kde/graphics3/Makefile | 55 +------ x11/kde/i18n3/Makefile | 45 +----- x11/kde/kdoc2/Makefile | 19 +-- x11/kde/libs2-doc/Makefile | 16 +-- x11/kde/libs2/Makefile | 51 +------ x11/kde/libs2/patches/p-aclocal_m4 | 10 +- x11/kde/libs2/patches/patch-configure_in | 8 +- x11/kde/libs2/pkg/PFRAG.shared | 3 +- x11/kde/libs3/Makefile | 56 +------- x11/kde/mosfet-liquid/Makefile | 20 +-- x11/kde/network2/Makefile | 46 +----- x11/kde/network3/Makefile | 56 +------- x11/kde/office2/Makefile | 36 +---- x11/kde/office3/Makefile | 36 +---- x11/kde/toys2/Makefile | 37 +---- x11/kde/toys3/Makefile | 57 +------- x11/kde/utils3/Makefile | 56 +------- 30 files changed, 100 insertions(+), 1256 deletions(-) create mode 100644 x11/kde/Makefile.inc delete mode 100644 x11/kde/base3/files/lame.c diff --git a/x11/kde/Makefile.inc b/x11/kde/Makefile.inc new file mode 100644 index 00000000000..985d8ce952f --- /dev/null +++ b/x11/kde/Makefile.inc @@ -0,0 +1,52 @@ +# $OpenBSD: Makefile.inc,v 1.1 2002/04/10 01:24:38 espie Exp $ +NEED_VERSION+= 1.504 +DIST_SUBDIR= kde +HOMEPAGE?= http://www.kde.org +MASTER_SITES?= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR?= stable/${VERSION}/src +EXTRACT_SUFX?= .tar.bz2 + +# Parts of kde want shared libraries to work, as some symbols are +# duplicated over the place. +NOT_FOR_ARCHS?= ${NO_SHARED_ARCHS} +.if ${VERSION:M2*} +MODULES?= qt2 +PATCH_LIST?= ${PORTSDIR}/x11/kde/libs2/patches/p-* patch-* +.elif ${VERSION:M3*} +# our linker is insane, at least on some arches +VMEM_WARNING?=Yes +MODULES?= qt3 +PATCH_LIST?= ${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* +.endif + +MODGNU_CONFIG_GUESS_DIRS?= ${WRKSRC} ${WRKSRC}/admin + +CONFIGURE_STYLE?= autoconf +AUTOCONF_NEW= Yes +CONFIGURE_ARGS+= ${MODQT_CONFIGURE_ARGS} +CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib +CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include +CONFIGURE_ARGS+= --disable-threading +CONFIGURE_ARGS+= --disable-mt +CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm +CONFIGURE_ARGS+= --enable-mitshm +CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --enable-final +.if !${CONFIGURE_ARGS:M--with-motif} +CONFIGURE_ARGS+= --without-motif +.endif +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +USE_GMAKE?= Yes + +PORTHOME?=${WRKDIR} + +CONFIGURE_ENV+= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} +MAKE_ENV= ${CONFIGURE_ENV} + +MAKE_FLAGS+=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' +FAKE_FLAGS?= TAR=tar DESTDIR=${WRKINST} +# GPL +PERMIT_DISTFILES_CDROM?= Yes +PERMIT_DISTFILES_FTP?= Yes +PERMIT_PACKAGE_CDROM?= Yes +PERMIT_PACKAGE_FTP?= Yes diff --git a/x11/kde/addons3/Makefile b/x11/kde/addons3/Makefile index ae0668d47ab..8bdf7b4cf68 100644 --- a/x11/kde/addons3/Makefile +++ b/x11/kde/addons3/Makefile @@ -1,66 +1,13 @@ -# $OpenBSD: Makefile,v 1.3 2002/04/04 12:13:01 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, addons" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdeaddons-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES= qt3 LIB_DEPENDS= kdecore.4,DCOP,artskde,kdeui,khtml,kio,kparts::x11/kde/libs3 \ kateinterfaces,konq,konqsidebarplugin::x11/kde/base3 \ kmedia2_idl,qtmcop,soundserver_idl::x11/kde/arts3 -# glib2.0 -# qt docs -# CUPS - -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin - -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --enable-mitshm -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -PATCH_LIST= ${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -#CONFIGURE_ARGS+= --enable-static --disable-shared - -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes - -# you don't want to know... -CONFIGURE_ENV+= ac_aux_files='' - -MAKE_ENV= ${CONFIGURE_ENV} -PORTHOME=${WRKDIR} - -# Ensure qt will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - - .include diff --git a/x11/kde/arts3/Makefile b/x11/kde/arts3/Makefile index e991c81c1a8..2c059ada2c5 100644 --- a/x11/kde/arts3/Makefile +++ b/x11/kde/arts3/Makefile @@ -1,57 +1,13 @@ -# $OpenBSD: Makefile,v 1.5 2002/04/04 12:13:02 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, multimedia hub" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= arts-1.0.0 -DIST_SUBDIR= kde -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES= qt3 LIB_DEPENDS= audiofile::devel/libaudiofile -# glib2.0 -# qt docs -# CUPS - -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin - -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --enable-mitshm -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -PATCH_LIST= p-* patch-* -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -#CONFIGURE_ARGS+= --enable-static --disable-shared - -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes - -# you don't want to know... -CONFIGURE_ENV+= ac_aux_files='' - -MAKE_ENV= ${CONFIGURE_ENV} - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - pre-build: @if pkg dependencies check kdelibs-\*; then \ if pkg dependencies check ${DISTNAME}; then \ @@ -61,10 +17,5 @@ pre-build: exit 1; \ fi; \ fi -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes .include diff --git a/x11/kde/artwork2/Makefile b/x11/kde/artwork2/Makefile index 68c868542bc..1aadb17afd0 100644 --- a/x11/kde/artwork2/Makefile +++ b/x11/kde/artwork2/Makefile @@ -1,65 +1,15 @@ -# $OpenBSD: Makefile,v 1.10 2002/04/03 02:25:06 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, additional artwork" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 2.2.2 DISTNAME= kdeartwork-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src/ -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES=qt2 LIB_DEPENDS= kdecore.3,kdeui::x11/kde/libs2 BUILD_DEPENDS+= ::x11/qt2-designer -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+= --without-motif -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} - - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' -FAKE_FLAGS=TAR=${TAR} DESTDIR=${WRKINST} - -# GPL -# Note that lame is not a problem, since kdebase is packaged with a -# stub lame library which does nothing, and can be overriden with a -# live one later. -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - pre-fake: ${INSTALL_DATA_DIR} ${PREFIX}/share/apps/kthememgr/Themes diff --git a/x11/kde/artwork3/Makefile b/x11/kde/artwork3/Makefile index 8a1a1196a30..a7b4bc0284e 100644 --- a/x11/kde/artwork3/Makefile +++ b/x11/kde/artwork3/Makefile @@ -1,66 +1,14 @@ -# $OpenBSD: Makefile,v 1.5 2002/04/07 01:47:11 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, additional artwork" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdeartwork-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES=qt3 LIB_DEPENDS=kdecore.4,DCOP,kdefx,kdesu,kdeui,kio,kscreensaver::x11/kde/libs3 \ kwin::x11/kde/base3 -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --disable-mt -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+= --without-motif -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -PATCH_LIST=${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} - - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' -FAKE_FLAGS=TAR=${TAR} DESTDIR=${WRKINST} - -# GPL -# Note that lame is not a problem, since kdebase is packaged with a -# stub lame library which does nothing, and can be overriden with a -# live one later. -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - pre-fake: ${INSTALL_DATA_DIR} ${PREFIX}/share/apps/kthememgr/Themes diff --git a/x11/kde/base2/Makefile b/x11/kde/base2/Makefile index 57d00efba30..d2bdbad4835 100644 --- a/x11/kde/base2/Makefile +++ b/x11/kde/base2/Makefile @@ -1,30 +1,10 @@ -# $OpenBSD: Makefile,v 1.35 2002/04/03 02:25:06 espie Exp $ +# $OpenBSD: Makefile,v 1.36 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, basic applications" -COMMENT-plugins= "X11 toolkit, netscape plugins" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 2.2.2 DISTNAME= kdebase-${VERSION} -PKGNAME-plugins= kdebase-ns-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src/ -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -#MULTI_PACKAGES=-plugins -MODULES=qt2 - -#SUBPACKAGE?= -#.if !defined(PACKAGING) || ${SUBPACKAGE} == "-plugins" -#USE_MOTIF= any -#.endif LIB_DEPENDS= kdecore.3,kdeui,DCOP,artskde,kab,kdefakes,kdeprint,kdeprint_management,kdesu,kfile,khtml,kio,kjava,kmid,kparts,kscreensaver,kspell,kssl,ksycoca,ktexteditor,soundserver_idl::x11/kde/libs2 \ ldap.2,lber:openldap-client-2.*:databases/openldap \ @@ -33,30 +13,6 @@ LIB_DEPENDS= kdecore.3,kdeui,DCOP,artskde,kab,kdefakes,kdeprint,kdeprint_managem BUILD_DEPENDS= ::x11/qt2-designer ::audio/lame -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+= --enable-debug -CONFIGURE_ARGS+= --without-motif -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} - LAMEDIR=${WRKDIR}/lamestub post-patch: @@ -67,19 +23,8 @@ pre-build: cd ${LAMEDIR} && ${CC} -I${LOCALBASE}/include -o libmp3lame.so.0.0 -shared -fpic -O2 lame.c -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' MAKE_FLAGS+=LAMEDIR='${LAMEDIR}' -# GPL -# Note that lame is not a problem, since kdebase is packaged with a -# stub lame library which does nothing, and can be overriden with a -# live one later. -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - post-install: rm -rf ${PREFIX}/share/config/kdm ${INSTALL_PROGRAM} ${WRKSRC}/kdm/kfrontend/genkdmconf ${PREFIX}/libexec diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile index 9290dcbef54..be1d99dd03f 100644 --- a/x11/kde/base3/Makefile +++ b/x11/kde/base3/Makefile @@ -1,22 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2002/04/04 12:13:02 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, basic applications" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdebase-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES=qt3 LIB_DEPENDS= kdecore.4,DCOP,artskde,kabc,katepartinterfaces,kdefakes,kdefx,kdeprint,kdeprint_management,kdesasl,kdesu,kdeui,khtml,kio,kjava,kmid,kparts,kscreensaver,kscript,kspell,ktexteditor,vcard::x11/kde/libs3 \ ldap.2,lber:openldap-client-2.*:databases/openldap \ @@ -25,60 +13,8 @@ LIB_DEPENDS= kdecore.4,DCOP,artskde,kabc,katepartinterfaces,kdefakes,kdefx,kdepr BUILD_DEPENDS= ::audio/lame -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm -CONFIGURE_ARGS+= --disable-mt -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+= --enable-debug -CONFIGURE_ARGS+= --without-motif -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -PATCH_LIST=${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} -PORTHOME=${WRKDIR} - -LAMEDIR=${WRKDIR}/lamestub - -post-patch: - mkdir -p ${LAMEDIR} - cp ${FILESDIR}/lame.c ${LAMEDIR} - -pre-build: - cd ${LAMEDIR} && ${CC} -I${LOCALBASE}/include -o libmp3lame.so.0.0 -shared -fpic -O2 lame.c - - -# Ensure qt will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' -MAKE_FLAGS+=LAMEDIR='${LAMEDIR}' -FAKE_FLAGS=DESTDIR=${WRKINST} TAR=tar - -# GPL -# Note that lame is not a problem, since kdebase is packaged with a -# stub lame library which does nothing, and can be overriden with a -# live one later. -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - post-install: rm -rf ${PREFIX}/share/config/kdm ${INSTALL_PROGRAM} ${WRKSRC}/kdm/kfrontend/genkdmconf ${PREFIX}/libexec - ${INSTALL_DATA} ${LAMEDIR}/libmp3lame.so.0.0 ${PREFIX}/lib .include diff --git a/x11/kde/base3/files/lame.c b/x11/kde/base3/files/lame.c deleted file mode 100644 index 1063d6496a7..00000000000 --- a/x11/kde/base3/files/lame.c +++ /dev/null @@ -1,173 +0,0 @@ -#include - -lame_global_flags * -lame_init() -{ - return NULL; -} - -void -id3tag_init(lame_global_flags *f) -{ -} - -void -id3tag_set_album(lame_global_flags *f, const char *s) -{ -} - -void -id3tag_set_artist(lame_global_flags *f, const char *s) -{ -} - -void -id3tag_set_title(lame_global_flags *f, const char *s) -{ -} - -int -lame_init_params(lame_global_flags *f) -{ - return -1; -} - -int -lame_encode_buffer_interleaved(lame_global_flags *f, short int pcm[], - int num_samples, unsigned char *mp3buf, int bufsize) -{ - return -1; -} - -int -lame_encode_finish(lame_global_flags *f, unsigned char *mp3buf, int sz) -{ - return -1; -} - -int -lame_set_VBR(lame_global_flags *f, vbr_mode m) -{ - return 0; -} - -int -lame_set_brate(lame_global_flags *f, int z) -{ - return 0; -} - -int -lame_get_brate(const lame_global_flags *f) -{ - return 0; -} - -int -lame_set_quality(lame_global_flags *f, int z) -{ - return 0; -} - -int -lame_set_VBR_mean_bitrate_kbps(lame_global_flags *f, int z) -{ - return 0; -} - -int -lame_get_VBR_mean_bitrate_kbps(const lame_global_flags *f) -{ - return 0; -} - -vbr_mode -lame_get_VBR(const lame_global_flags *f) -{ - return 0; -} - -int -lame_set_VBR_min_bitrate_kbps(lame_global_flags *f, int z) -{ - return 0; -} - -int -lame_set_VBR_hard_min(lame_global_flags *f, int z) -{ - return 0; -} - -int -lame_set_VBR_max_bitrate_kbps(lame_global_flags *f, int z) -{ - return 0; -} - -int -lame_set_VBR_q(lame_global_flags *f, int z) -{ - return 0; -} - -int -lame_set_mode(lame_global_flags *f, MPEG_mode m) -{ - return 0; -} - -int -lame_set_copyright(lame_global_flags *f, int c) -{ - return 0; -} - -int -lame_set_original(lame_global_flags *f, int c) -{ - return 0; -} - -int -lame_set_strict_ISO(lame_global_flags *f, int s) -{ - return 0; -} - -int -lame_set_error_protection(lame_global_flags *f, int s) -{ - return 0; -} - -int -lame_set_lowpassfreq(lame_global_flags *f, int s) -{ - return 0; -} - -int -lame_set_lowpasswidth(lame_global_flags *f, int s) -{ - return 0; -} - -int -lame_set_highpassfreq(lame_global_flags *f, int s) -{ - return 0; -} - -int -lame_set_highpasswidth(lame_global_flags *f, int s) -{ - return 0; -} - -int -lame_set_bWriteVbrTag(lame_global_flags *f, int s) -{ - return 0; -} - diff --git a/x11/kde/base3/pkg/PFRAG.shared b/x11/kde/base3/pkg/PFRAG.shared index d6cb1222d73..789c7064d16 100644 --- a/x11/kde/base3/pkg/PFRAG.shared +++ b/x11/kde/base3/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2002/04/04 18:29:21 espie Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.5 2002/04/10 01:24:39 espie Exp $ lib/kde3/libchildpanel_panelextension.so.1.0 lib/kde3/libclock_panelapplet.so.1.0 lib/kde3/libdockbar_panelextension.so.1.0 @@ -146,7 +146,6 @@ lib/libkwin.so.0.0 lib/libkwrite.so.0.0 lib/libkwrited.so.0.0 lib/libkxkb.so.0.0 -lib/libmp3lame.so.0.0 lib/libsensordisplays.so.0.0 lib/libtaskbar.so.1.0 lib/libtaskmanager.so.1.0 diff --git a/x11/kde/edu3/Makefile b/x11/kde/edu3/Makefile index c81809512b4..30d2ad5fd11 100644 --- a/x11/kde/edu3/Makefile +++ b/x11/kde/edu3/Makefile @@ -1,64 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2002/04/04 14:07:48 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, addons" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdeedu-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES= qt3 LIB_DEPENDS= kdecore.4,DCOP,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kparts::x11/kde/libs3 -# glib2.0 -# qt docs -# CUPS - -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin - -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --enable-mitshm -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -PATCH_LIST= ${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -#CONFIGURE_ARGS+= --enable-static --disable-shared - -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes - -# you don't want to know... -CONFIGURE_ENV+= ac_aux_files='' - -MAKE_ENV= ${CONFIGURE_ENV} -PORTHOME=${WRKDIR} - -# Ensure qt will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - - .include diff --git a/x11/kde/games2/Makefile b/x11/kde/games2/Makefile index 3f2364fe038..47f0a8844a9 100644 --- a/x11/kde/games2/Makefile +++ b/x11/kde/games2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2002/04/03 02:25:06 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2002/04/10 01:24:39 espie Exp $ COMMENT= games for KDE COMMENT-cards= faces for kde card games @@ -32,31 +32,10 @@ CATEGORIES= x11 x11/kde games NEED_VERSION= 1.504 VERSION= 2.2.2 DISTNAME= kdegames-${VERSION} -DIST_SUBDIR= kde - -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src/ -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} LIB_DEPENDS= kdecore.3,DCOP,artsflow,artsflow_idl,kdeprint,kdesu,kdeui,kfile,kio,kmedia2_idl,kparts,kssl,ksycoca,mcop,qtmcop,soundserver_idl::x11/kde/libs2 BUILD_DEPENDS= ::x11/qt2-designer -MODULES=qt2 - -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --without-motif - -PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* patch-* - .for i in kabalone kasteroids katomic kbackgammon kblackbox kfouleggs \ kjezz kjumpingcube kmahjongg kmines konquest kpat kpoker kreversi ksame \ kshisen ksirtet ksmiletris ksnake ksokoban kspaceduel ktron ktuberling \ @@ -74,24 +53,4 @@ RUN_DEPENDS+= ::x11/kde/games2,-cards . endif .endif -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --disable-debug - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} - -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include diff --git a/x11/kde/games3/Makefile b/x11/kde/games3/Makefile index 9aa42a6871f..3f18095a8b1 100644 --- a/x11/kde/games3/Makefile +++ b/x11/kde/games3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/04/04 12:13:02 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2002/04/10 01:24:39 espie Exp $ COMMENT= games for KDE @@ -6,51 +6,7 @@ CATEGORIES= x11 x11/kde games NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdegames-${VERSION} -DIST_SUBDIR= kde -MODULES=qt3 - -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} LIB_DEPENDS= kdecore.4::x11/kde/libs3 -MODULES=qt3 - -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --disable-mt -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --without-motif - -PATCH_LIST=${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* - -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --disable-debug - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} - -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} -PORTHOME=${WRKDIR} - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MOQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include diff --git a/x11/kde/graphics2/Makefile b/x11/kde/graphics2/Makefile index 86e1371b25d..dd01507948f 100644 --- a/x11/kde/graphics2/Makefile +++ b/x11/kde/graphics2/Makefile @@ -1,53 +1,13 @@ -# $OpenBSD: Makefile,v 1.17 2002/04/03 02:25:07 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, graphics applications" CATEGORIES= x11 x11/kde NEED_VERSION= 1.461 VERSION= 2.2.2 DISTNAME= kdegraphics-${VERSION} -DIST_SUBDIR= kde -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src/ -EXTRACT_SUFX= .tar.bz2 - -MODULES= qt2 LIB_DEPENDS= kdecore.3,DCOP,kdeprint,kdesu,kdeui,kfile,kio,kparts,kssl,ksycoca::x11/kde/libs2 BUILD_DEPENDS= ::x11/qt2-designer -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm -#CONFIGURE_ARGS+= --without-motif -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared -PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} - -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} - - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include diff --git a/x11/kde/graphics3/Makefile b/x11/kde/graphics3/Makefile index 6c3cd216ad7..d7e638339fc 100644 --- a/x11/kde/graphics3/Makefile +++ b/x11/kde/graphics3/Makefile @@ -1,22 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2002/04/04 12:13:02 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, graphic applications" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdegraphics-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES= qt3 #LIB_DEPENDS= kdecore.4,DCOP,artskde,kdeui,khtml,kio,kparts::x11/kde/libs3 \ # kateinterfaces,konq,konqsidebarplugin::x11/kde/base3 \ @@ -25,45 +13,4 @@ LIB_DEPENDS=Imlib::graphics/imlib \ ungif::graphics/libungif \ kdecore.4,DCOP,kdefx,kdeprint,kdesu,kdeui,kio,kparts::x11/kde/libs3 -# glib2.0 -# qt docs -# CUPS - -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin - -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --enable-mitshm -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -PATCH_LIST= ${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -#CONFIGURE_ARGS+= --enable-static --disable-shared - -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes - -# you don't want to know... -CONFIGURE_ENV+= ac_aux_files='' - -MAKE_ENV= ${CONFIGURE_ENV} -PORTHOME=${WRKDIR} - -# Ensure qt will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - - .include diff --git a/x11/kde/i18n3/Makefile b/x11/kde/i18n3/Makefile index 85f1d5cfcdf..816fb06259c 100644 --- a/x11/kde/i18n3/Makefile +++ b/x11/kde/i18n3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2002/04/04 22:10:28 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2002/04/10 01:24:39 espie Exp $ FLAVORS=af ar az bg bs ca cs da de el en_GB eo es et fi fr he hr hu id is \ it ja ko lt lv mt nb nl nn pl pt pt_BR ro ru sk sl sv ta th tr uk ven \ @@ -13,12 +13,7 @@ CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kde-i18n-${FLAVOR}-${VERSION} -DIST_SUBDIR= kde -MODULES=qt3 - -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} SUPDISTFILES= .for i in ${FLAVORS} @@ -26,45 +21,9 @@ SUPDISTFILES+= kde-i18n-$i-${VERSION}${EXTRACT_SUFX} .endfor WRKDIST=${WRKDIR}/kde-i18n-${FLAVOR} -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - BUILD_DEPENDS = ::x11/kde/libs3 -MODULES=qt3 - -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --disable-mt -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --without-motif - -PATCH_LIST=${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* - -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --disable-debug - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} - -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} -PORTHOME=${WRKDIR} - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MOQT_LIBDIR}' - PLIST=${PKGDIR}/PLIST.${FLAVOR} -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes # some extra vars to compact PLISTs DOC=share/doc/HTML/${FLAVOR}/ diff --git a/x11/kde/kdoc2/Makefile b/x11/kde/kdoc2/Makefile index 727e4f6cd24..4916b2421be 100644 --- a/x11/kde/kdoc2/Makefile +++ b/x11/kde/kdoc2/Makefile @@ -1,24 +1,13 @@ -# $OpenBSD: Makefile,v 1.6 2002/04/04 22:52:12 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2002/04/10 01:24:39 espie Exp $ COMMENT= "embedded documentation in C++" CATEGORIES= x11 x11/kde devel NEED_VERSION= 1.458 VERSION= 2.2.2 DISTNAME= kdoc-${VERSION} -DIST_SUBDIR= kde -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src/ -EXTRACT_SUFX= .tar.bz2 - -CONFIGURE_STYLE= gnu -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes +PATCH_LIST= p-* +MODULES= +USE_GMAKE= No .include diff --git a/x11/kde/libs2-doc/Makefile b/x11/kde/libs2-doc/Makefile index 894351e2fdb..1d3b696e24f 100644 --- a/x11/kde/libs2-doc/Makefile +++ b/x11/kde/libs2-doc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2002/04/08 20:50:40 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, libraries documentation" CATEGORIES= x11 x11/kde devel @@ -7,11 +7,6 @@ VERSION= 2.2.2 PKGNAME= kdelibs-doc-${VERSION} DISTNAME= kdelibs-${VERSION} -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 -DIST_SUBDIR= kde BUILD_DEPENDS= ::x11/kde/kdoc2 ::x11/qt2,-html @@ -19,6 +14,8 @@ MAINTAINER= Marc Espie DDIR= ${PREFIX}/share/doc/html/kdelibs PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/{p,patch}-* +CONFIGURE_STYLE= +MODULES= post-patch: mkdir -p ${WRKDIST}/qt @@ -33,11 +30,4 @@ do-install: --url "file:${TRUEPREFIX}/share/doc/html/kdelibs" \ --srcdir ${WRKDIST} -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - - .include diff --git a/x11/kde/libs2/Makefile b/x11/kde/libs2/Makefile index 885dab237a3..d4046b3a38c 100644 --- a/x11/kde/libs2/Makefile +++ b/x11/kde/libs2/Makefile @@ -1,22 +1,11 @@ -# $OpenBSD: Makefile,v 1.37 2002/04/03 16:38:21 espie Exp $ +# $OpenBSD: Makefile,v 1.38 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, libraries" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 2.2.2 DISTNAME= kdelibs-${VERSION} -DIST_SUBDIR= kde -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES= qt2 LIB_DEPENDS= png.2::graphics/png \ jpeg.62::graphics/jpeg \ tiff.35::graphics/tiff \ @@ -28,37 +17,8 @@ LIB_DEPENDS= png.2::graphics/png \ BUILD_DEPENDS= :qt2-html-*:x11/qt2,-html -# glib2.0 -# qt docs -# CUPS - -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin - -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --enable-mitshm -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -PATCH_LIST= p-* patch-* -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -#CONFIGURE_ARGS+= --enable-static --disable-shared - -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes CONFIGURE_ENV= QTDOCDIR=${LOCALBASE}/share/doc/qt2/html -# you don't want to know... -CONFIGURE_ENV+= ac_aux_files='' - -MAKE_ENV= ${CONFIGURE_ENV} - pre-build: @if pkg dependencies check kdelibs-\*; then \ if pkg dependencies check ${DISTNAME}; then \ @@ -69,15 +29,6 @@ pre-build: fi; \ fi -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - # These are necessary because of packages dependent on kde2 that don't # really `own' the dir. Creating it in kdelibs is the easiest way. diff --git a/x11/kde/libs2/patches/p-aclocal_m4 b/x11/kde/libs2/patches/p-aclocal_m4 index 742b30ee877..67855d843f4 100644 --- a/x11/kde/libs2/patches/p-aclocal_m4 +++ b/x11/kde/libs2/patches/p-aclocal_m4 @@ -1,7 +1,7 @@ -$OpenBSD: p-aclocal_m4,v 1.5 2002/03/30 02:24:18 espie Exp $ ---- aclocal.m4.orig Sun Jan 27 19:33:25 2002 -+++ aclocal.m4 Sun Mar 17 01:23:21 2002 -@@ -3361,6 +3361,11 @@ LIBDL="-ldl" +$OpenBSD: p-aclocal_m4,v 1.6 2002/04/10 01:24:39 espie Exp $ +--- aclocal.m4.orig Tue Nov 13 21:55:41 2001 ++++ aclocal.m4 Mon Apr 8 19:48:58 2002 +@@ -3121,6 +3121,11 @@ LIBDL="-ldl" ac_cv_have_dlfcn=yes ]) @@ -13,7 +13,7 @@ $OpenBSD: p-aclocal_m4,v 1.5 2002/03/30 02:24:18 espie Exp $ AC_CHECK_LIB(dld, shl_unload, [ LIBDL="-ldld" ac_cv_have_shload=yes -@@ -5249,19 +5254,7 @@ netbsd*) +@@ -4876,19 +4881,7 @@ netbsd*) ;; openbsd* ) diff --git a/x11/kde/libs2/patches/patch-configure_in b/x11/kde/libs2/patches/patch-configure_in index 8147708cbde..9dc5af117ca 100644 --- a/x11/kde/libs2/patches/patch-configure_in +++ b/x11/kde/libs2/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.5 2001/08/22 19:56:32 espie Exp $ ---- configure.in.orig Mon Aug 6 03:26:30 2001 -+++ configure.in Wed Aug 22 15:34:12 2001 -@@ -629,7 +629,9 @@ if test "${with_qt_dir+set}" = set; then +$OpenBSD: patch-configure_in,v 1.6 2002/04/10 01:24:39 espie Exp $ +--- configure.in.orig Tue Nov 13 21:55:38 2001 ++++ configure.in Mon Apr 8 19:48:59 2002 +@@ -688,7 +688,9 @@ if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi diff --git a/x11/kde/libs2/pkg/PFRAG.shared b/x11/kde/libs2/pkg/PFRAG.shared index e9a1da683cb..4e1935ca90a 100644 --- a/x11/kde/libs2/pkg/PFRAG.shared +++ b/x11/kde/libs2/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.12 2002/04/03 16:38:21 espie Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.13 2002/04/10 01:24:39 espie Exp $ lib/kde2/libkbzip2filter.so.0.0 lib/kde2/libkded_kdeprintd.so.0.0 lib/kde2/libkdeprint_ext.so.0.0 @@ -71,4 +71,3 @@ lib/libsoundserver_idl.so.0.0 lib/libwebstyle.so.0.0 lib/libx11globalcomm.so.0.0 DYNLIBDIR(%D/lib) -NEWDYNLIBDIR(%D/lib/kde2) diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile index 413dbc67836..3a85eaeabe3 100644 --- a/x11/kde/libs3/Makefile +++ b/x11/kde/libs3/Makefile @@ -1,25 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2002/04/04 18:29:21 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, libraries" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdelibs-${VERSION} -DIST_SUBDIR= kde -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -# our linker is insane, at least on some arches -VMEM_WARNING=Yes - -MODULES= qt3 LIB_DEPENDS= png.2::graphics/png \ jpeg.62::graphics/jpeg \ tiff.35::graphics/tiff \ @@ -32,46 +18,6 @@ LIB_DEPENDS= png.2::graphics/png \ BUILD_DEPENDS= :qt3-html-*:x11/qt3,-html -# glib2.0 -# qt docs -# CUPS - -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin - -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --enable-mitshm -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -PATCH_LIST= ${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -#CONFIGURE_ARGS+= --enable-static --disable-shared - -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= QTDOCDIR=${LOCALBASE}/share/doc/qt2/html - -# you don't want to know... -CONFIGURE_ENV+= ac_aux_files='' - -MAKE_ENV= ${CONFIGURE_ENV} - -# Ensure qt will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - EXTRA_DIRECTORIES= \ share/applnk/Editors \ share/applnk/Edutainment \ diff --git a/x11/kde/mosfet-liquid/Makefile b/x11/kde/mosfet-liquid/Makefile index 6883015a603..4660909977d 100644 --- a/x11/kde/mosfet-liquid/Makefile +++ b/x11/kde/mosfet-liquid/Makefile @@ -1,25 +1,27 @@ -# $OpenBSD: Makefile,v 1.10 2001/11/13 14:10:06 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2002/04/10 01:24:39 espie Exp $ V=0.7 CATEGORIES= x11 x11/kde NEED_VERSION= 1.483 COMMENT= "KDE style engine" + HOMEPAGE= http://www.mosfet.org/liquid.html MASTER_SITES= http://www.mosfet.org/ DISTNAME= mosfet-liquid$V PKGNAME= mosfet-liquid-$V +DIST_SUBDIR= +EXTRACT_SUFX= .tar.gz + MAINTAINER= Marc Espie BUILD_DEPENDS= ::devel/autoconf ::devel/automake -MODULES= qt2 +VERSION=2 LIB_DEPENDS= png.2::graphics/png \ jpeg.62::graphics/jpeg \ tiff.35::graphics/tiff \ kdecore.3::x11/kde/libs2 \ kwin::x11/kde/base2 -USE_GMAKE= Yes - # QPL PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_FTP= Yes @@ -28,18 +30,8 @@ PERMIT_PACKAGE_CDROM= "Not without the source" CONFIGURE_STYLE= gnu -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --enable-mitshm - -PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* patch-* CONFIGURE_ENV= UIC_NOT_NEEDED=true -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} pre-configure: cd ${WRKDIST} && ${MAKE_PROGRAM} -f Makefile.cvs diff --git a/x11/kde/network2/Makefile b/x11/kde/network2/Makefile index 784e9140a7e..e32513cf9a9 100644 --- a/x11/kde/network2/Makefile +++ b/x11/kde/network2/Makefile @@ -1,22 +1,10 @@ -# $OpenBSD: Makefile,v 1.6 2002/04/03 02:25:07 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, network applications" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 2.2.2 DISTNAME= kdenetwork-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src/ -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES=qt2 LIB_DEPENDS= kdecore.3,kdeui::x11/kde/libs2 @@ -25,36 +13,4 @@ BUILD_DEPENDS= ::x11/qt2-designer # for kaddressbook RUN_DEPENDS+= ::x11/kde/base2 -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+= --without-motif -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared -PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -MAKE_ENV= ${CONFIGURE_ENV} - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -# Note that lame is not a problem, since kdebase is packaged with a -# stub lame library which does nothing, and can be overriden with a -# live one later. -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include diff --git a/x11/kde/network3/Makefile b/x11/kde/network3/Makefile index 3889aefb6cd..32ebaeca8c3 100644 --- a/x11/kde/network3/Makefile +++ b/x11/kde/network3/Makefile @@ -1,23 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2002/04/04 14:07:48 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2002/04/10 01:24:39 espie Exp $ COMMENT= "X11 toolkit, network applications" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdenetwork-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES=qt3 - LIB_DEPENDS= kdecore.4,DCOP,kabc,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kparts,kspell,vcard::x11/kde/libs3 #BUILD_DEPENDS= ::audio/lame @@ -25,45 +12,4 @@ LIB_DEPENDS= kdecore.4,DCOP,kabc,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kpar # for kaddressbook RUN_DEPENDS+= ::x11/kde/base3 -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm -CONFIGURE_ARGS+= --disable-mt -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+= --without-motif -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -PATCH_LIST=${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} -PORTHOME=${WRKDIR} - -# Ensure qt will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' -MAKE_FLAGS+=LAMEDIR='${LAMEDIR}' -FAKE_FLAGS=DESTDIR=${WRKINST} TAR=tar - -# GPL -# Note that lame is not a problem, since kdebase is packaged with a -# stub lame library which does nothing, and can be overriden with a -# live one later. -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include diff --git a/x11/kde/office2/Makefile b/x11/kde/office2/Makefile index bc45b97b787..b00ce0acafa 100644 --- a/x11/kde/office2/Makefile +++ b/x11/kde/office2/Makefile @@ -1,48 +1,16 @@ -# $OpenBSD: Makefile,v 1.19 2002/04/04 22:49:51 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2002/04/10 01:24:39 espie Exp $ COMMENT= "office applications for kde" CATEGORIES= x11 x11/kde productivity NEED_VERSION= 1.483 VERSION= 1.1.1 -DISTNAME= koffice-${VERSION} -DIST_SUBDIR= kde - -MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${VERSION}/src/ -EXTRACT_SUFX= .tar.bz2 - -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} +DISTNAME= koffice-${VERSION} BUILD_DEPENDS= ::x11/qt2-designer LIB_DEPENDS= kdecore.3,DCOP,kdeprint,kdesu,kdeui,kfile,kio,kparts,kspell,kssl,ksycoca::x11/kde/libs2 python2.2.0.0:python-2.2*:lang/python/2.2 MODULES= qt2 -CONFIGURE_STYLE= autoconf -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared PATCH_LIST= p-* patch-* -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV+= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include diff --git a/x11/kde/office3/Makefile b/x11/kde/office3/Makefile index 3a5f69cd27e..786c44cc5cc 100644 --- a/x11/kde/office3/Makefile +++ b/x11/kde/office3/Makefile @@ -1,52 +1,20 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $ +# $OpenBSD: Makefile,v 1.2 2002/04/10 01:24:40 espie Exp $ COMMENT= "office applications for kde" CATEGORIES= x11 x11/kde productivity NEED_VERSION= 1.483 VERSION= 1.1.1 DISTNAME= koffice-${VERSION} -DIST_SUBDIR= kde FULLPKGNAME= koffice-${VERSION}-kde3 -MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/3.0/src/ DISTFILES= koffice-${VERSION}-kde3.tar.bz2 -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - #BUILD_DEPENDS= ::x11/qt2-designer LIB_DEPENDS= kdecore.3,DCOP,kdefx,kdeprint,kdesu,kdeui,kio,kparts,kspell::x11/kde/libs3 python2.2.0.0:python-2.2*:lang/python/2.2 -PATCHORIG=.bsdorig +PATCHORIG= .bsdorig MODULES= qt3 -CONFIGURE_STYLE= autoconf -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-mt -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared PATCH_LIST= p-* patch-* -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV+= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} - -# Ensure qt will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include diff --git a/x11/kde/toys2/Makefile b/x11/kde/toys2/Makefile index b2cf3ad3e0a..06e6965a1df 100644 --- a/x11/kde/toys2/Makefile +++ b/x11/kde/toys2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2002/04/03 02:25:07 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2002/04/10 01:24:40 espie Exp $ COMMENT= "some useless kde applications" @@ -6,42 +6,7 @@ CATEGORIES= x11 x11/kde games NEED_VERSION= 1.483 VERSION= 2.2.2 DISTNAME= kdetoys-${VERSION} -DIST_SUBDIR= kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src/ -EXTRACT_SUFX= .tar.bz2 - -MODULES= qt2 LIB_DEPENDS= kdecore.3,DCOP,kdesu,kdeui,kio,kscreensaver,kssl,ksycoca::x11/kde/libs2 -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared -PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} - -# Ensure qt2 will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' - -# GPL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include diff --git a/x11/kde/toys3/Makefile b/x11/kde/toys3/Makefile index 017fc730a60..36fec716911 100644 --- a/x11/kde/toys3/Makefile +++ b/x11/kde/toys3/Makefile @@ -1,65 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2002/04/04 16:10:35 espie Exp $ +# $OpenBSD: Makefile,v 1.2 2002/04/10 01:24:40 espie Exp $ COMMENT= "some useless kde applications" CATEGORIES= x11 x11/kde games NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdetoys-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES=qt3 - - LIB_DEPENDS= kdecore.4,DCOP,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kparts,kscreensaver::x11/kde/libs3 -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm -CONFIGURE_ARGS+= --disable-mt -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+= --without-motif -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -PATCH_LIST=${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} -PORTHOME=${WRKDIR} - -# Ensure qt will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' -MAKE_FLAGS+=LAMEDIR='${LAMEDIR}' -FAKE_FLAGS=DESTDIR=${WRKINST} TAR=tar - -# GPL -# Note that lame is not a problem, since kdebase is packaged with a -# stub lame library which does nothing, and can be overriden with a -# live one later. -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include diff --git a/x11/kde/utils3/Makefile b/x11/kde/utils3/Makefile index d90bc073a0a..c6526c324b4 100644 --- a/x11/kde/utils3/Makefile +++ b/x11/kde/utils3/Makefile @@ -1,65 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2002/04/04 14:27:32 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2002/04/10 01:24:40 espie Exp $ COMMENT= "X11 toolkit, utilities" CATEGORIES= x11 x11/kde NEED_VERSION= 1.504 VERSION= 3.0 DISTNAME= kdeutils-${VERSION} -DIST_SUBDIR= kde - -HOMEPAGE= http://www.kde.org -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${VERSION}/src -EXTRACT_SUFX= .tar.bz2 - -# Parts of kde want shared libraries to work, as some symbols are -# duplicated over the place. -NOT_FOR_ARCHS=${NO_SHARED_ARCHS} - -MODULES=qt3 - LIB_DEPENDS= kdecore.4,DCOP,kabc,kdefakes,kdefx,kdeprint,kdesu,kdeui,kio,kparts,kspell,vcard::x11/kde/libs3 -CONFIGURE_STYLE= autoconf -AUTOCONF_NEW= Yes -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin -CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} -CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm -CONFIGURE_ARGS+= --disable-mt -CONFIGURE_ARGS+= --disable-threading -CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --enable-final -#CONFIGURE_ARGS+= --enable-debug -#CONFIGURE_ARGS+= --without-motif -#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared - -PATCH_LIST=${PORTSDIR}/x11/kde/arts3/patches/p-* patch-* - -# Not yet, too much time to compile -#CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} - -USE_GMAKE= Yes -CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} -CONFIGURE_ENV+= ac_aux_files='' -MAKE_ENV= ${CONFIGURE_ENV} -PORTHOME=${WRKDIR} - -# Ensure qt will always be at the front -MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' -MAKE_FLAGS+=LAMEDIR='${LAMEDIR}' -FAKE_FLAGS=DESTDIR=${WRKINST} TAR=tar - -# GPL -# Note that lame is not a problem, since kdebase is packaged with a -# stub lame library which does nothing, and can be overriden with a -# live one later. -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes - .include