From 6dc74612e1950dc9bbfe9bf1c51add0b62ea1e16 Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 28 Apr 1998 22:52:32 +0000 Subject: Update to KDE Beta 4 'Kirkland'. --- x11/kde/Makefile | 14 +- x11/kdebase/Makefile | 38 ++-- x11/kdebase/files/md5 | 2 +- x11/kdebase/patches/patch-aa | 44 +++- x11/kdebase/pkg/PLIST | 499 ++++++++++++++++++++----------------------- x11/kdelibs/Makefile | 23 +- x11/kdelibs/files/md5 | 2 +- x11/kdelibs/pkg/PLIST | 32 ++- 8 files changed, 339 insertions(+), 315 deletions(-) (limited to 'x11') diff --git a/x11/kde/Makefile b/x11/kde/Makefile index 98e76aa3d10..78c22a5bde1 100644 --- a/x11/kde/Makefile +++ b/x11/kde/Makefile @@ -1,19 +1,17 @@ -# $NetBSD: Makefile,v 1.9 1998/04/24 09:20:38 agc Exp $ +# $NetBSD: Makefile,v 1.10 1998/04/28 22:56:22 tron Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp # -DISTNAME= kde-3.1b +DISTNAME= kde-4.1b CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # empty -MAINTAINER= packages@netbsd.org +MAINTAINER= tron@netbsd.org -DEPENDS+= kdelibs-3.1b:../../x11/kdelibs -RUN_DEPENDS= kwm:../../x11/kdebase \ - kcalc:../../misc/kdeutils \ - kmahjongg:../../games/kdegames \ - kmail:../../net/kdenetwork +DEPENDS+= kdeutils-4.1b:../../misc/kdeutils +DEPENDS+= kdegames-4.1b:../../games/kdegames +DEPENDS+= kdenetwork-4.1b:../../net/kdenetwork EXTRACT_ONLY= # empty NO_CHECKSUM= yes diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 3878c8eaf6c..eda50934d38 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,22 +1,27 @@ -# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:38 agc Exp $ +# $NetBSD: Makefile,v 1.11 1998/04/28 22:53:23 tron Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp # -DISTNAME= kdebase-Beta3-1 -PKGNAME= kdebase-3.1b +DISTNAME= kdebase-beta4-1 +PKGNAME= kdebase-4.1b CATEGORIES= x11 kde -MASTER_SITES= ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \ - ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \ - ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/ -EXTRACT_SUFX= .src.tar.gz +MASTER_SITES= ftp://ftp.appl-opt.physik.uni-essen.de/pub/linux/kde/stable/Beta4/distribution/tgz/source/ \ + ftp://ftp.net.lut.ac.uk/kde/stable/Beta4/distribution/tgz/source/ \ + ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta4/distribution/tgz/source/ +EXTRACT_SUFX= .src.tar.bz2 -MAINTAINER= packages@netbsd.org +MAINTAINER= tron@netbsd.org -BUILD_DEPENDS= moc:../../x11/qt +BUILD_DEPENDS= bzip2:../../archivers/bzip2 \ + moc:../../x11/qt +DEPENDS+= giflib-3.0:../../graphics/giflib DEPENDS+= jpeg-6a:../../graphics/jpeg DEPENDS+= qt-1.33:../../x11/qt -DEPENDS+= kdelibs-3.1b:../../x11/kdelibs -DEPENDS+= giflib-3.0:../../graphics/giflib +DEPENDS+= kdelibs-4.1b:../../x11/kdelibs + +EXTRACT_CMD= bzip2 +EXTRACT_BEFORE_ARGS= -d < +EXTRACT_AFTER_ARGS= | pax -r USE_X11= yes HAS_CONFIGURE= yes @@ -33,15 +38,12 @@ CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" \ WRKSRC= ${WRKDIR}/kdebase PLIST_SRC= ${WRKDIR}/PLIST.tmp -PLIST_DIRS= ${PREFIX}/share/applnk \ - ${PREFIX}/share/apps/kappfinder \ - ${PREFIX}/share/mimelnk +PLIST_DIRS= share/applnk share/apps/kappfinder share/icons share/mimelnk post-install: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - @find ${PLIST_DIRS} -type f | \ - ${SED} "s/${PREFIX:S/\//\\\//g}\///g" >>${PLIST_SRC} - @find ${PLIST_DIRS} -type d | sort -r | \ - ${SED} "s/${PREFIX:S/\//\\\//g}\//\@dirrm /g" >>${PLIST_SRC} + @(cd ${PREFIX}; find ${PLIST_DIRS} -type f >>${PLIST_SRC}) + @(cd ${PREFIX}; find ${PLIST_DIRS} -type d | sort -r | \ + ${SED} "s/^/\@dirrm /" >>${PLIST_SRC}) .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase/files/md5 b/x11/kdebase/files/md5 index 9c3e423627b..c24b5157f23 100644 --- a/x11/kdebase/files/md5 +++ b/x11/kdebase/files/md5 @@ -1 +1 @@ -MD5 (kdebase-Beta3-1.src.tar.gz) = 4afd429364c745a57d46841967bb7159 +MD5 (kdebase-beta4-1.src.tar.bz2) = 52de2751b0e227f96fe48881982cda44 diff --git a/x11/kdebase/patches/patch-aa b/x11/kdebase/patches/patch-aa index 7209132c79b..ec52c71febd 100644 --- a/x11/kdebase/patches/patch-aa +++ b/x11/kdebase/patches/patch-aa @@ -1,10 +1,38 @@ ---- kscreensaver/main.cpp.orig Sat Jan 10 01:13:31 1998 -+++ kscreensaver/main.cpp Wed Mar 18 22:19:20 1998 -@@ -288,6 +288,7 @@ - } +--- configure.orig Sun Apr 19 01:22:26 1998 ++++ configure Mon Apr 27 20:00:47 1998 +@@ -3842,7 +3842,7 @@ - initPasswd(); -+ setuid (getuid ()); - if ( mode == MODE_INSTALL ) - { + ac_save_LIBS=$LIBS +- LIBS="$LIBS -ldl" ++ LIBS="$LIBS" + echo $ac_n "checking for main in -lpam_misc""... $ac_c" 1>&6 + echo "configure:3848: checking for main in -lpam_misc" >&5 + ac_lib_var=`echo pam_misc'_'main | sed 'y%./+-%__p_%'` +@@ -3968,7 +3968,7 @@ + test "x$pam_libraries" = xNONE && pam_libraries=$ac_pam_libraries + + if test ! "x$pam_includes" = xNONE && test ! "x$pam_libraries" = xNONE; then +- ac_pam_libs="-lpam $PAM_MISC_LIB -ldl" ++ ac_pam_libs="-lpam $PAM_MISC_LIB" + ac_cv_path_pam="no_pam= ac_pam_includes=$ac_pam_includes ac_pam_libraries=$ac_pam_libraries ac_pam_libs=\"$ac_pam_libs\"" + else + ac_cv_path_pam="no_pam=yes" +@@ -4039,7 +4039,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lpam -ldl $LIBS" ++LIBS="-lpam $LIBS" + cat > conftest.$ac_ext <&6 +- PASSWDLIB="-lpam -ldl" ++ PASSWDLIB="-lpam" + cat >> confdefs.h <