Basic bump to kde 2.01, more pending.

This commit is contained in:
espie 2000-12-17 11:27:55 +00:00
parent 535f6c5ba1
commit fa5530af9b
12 changed files with 98 additions and 117 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2000/11/02 00:02:34 espie Exp $
# $OpenBSD: Makefile,v 1.8 2000/12/17 11:27:58 espie Exp $
CATEGORIES= x11 x11/kde
NEED_VERSION= 1.305
VERSION= 2.0
VERSION= 2.0.1
DISTNAME= kdebase-${VERSION}
DIST_SUBDIR= kde
@ -10,14 +10,17 @@ MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${VERSION}/distribution/tar/generic/src/
EXTRACT_SUFX= .tar.bz2
LIB_DEPENDS= kdecore.3.::x11/kde/libs2
LIB_DEPENDS= kdecore.3.::x11/kde/libs2 \
Xm.1.2::x11/lesstif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-qt-includes=${LOCALBASE}/include/X11/qt2
CONFIGURE_ARGS+= --with-qt-libraries=${LOCALBASE}/lib/qt2
CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
CONFIGURE_ARGS+= --without-motif
CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm
#CONFIGURE_ARGS+= --without-motif
#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared
# Not yet, too much time to compile
#CONFIGURE_ARGS+= --enable-static
@ -33,5 +36,8 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
pre-fake:
${SUDO} /usr/sbin/mtree -U -e -d -n -p ${PREFIX} \
-f ${PORTSDIR}/x11/kde/libs2/files/mtree >/dev/null
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (kde/kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269
RMD160 (kde/kdebase-2.0.tar.bz2) = 8fa754ce592a58ae762b096837c3a0ef12a55ae5
SHA1 (kde/kdebase-2.0.tar.bz2) = 37454517d9027689105116bf1308bff66acbb2b4
MD5 (kde/kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66
RMD160 (kde/kdebase-2.0.1.tar.bz2) = c8e61f2ecc31eed3cd5797eca50153a410bd93d3
SHA1 (kde/kdebase-2.0.1.tar.bz2) = 7542e55d95f46d0df147c6b183420abee26da843

View File

@ -1,5 +1,5 @@
--- admin/ltconfig.orig Thu Aug 10 23:58:04 2000
+++ admin/ltconfig Fri Sep 29 15:26:38 2000
--- admin/ltconfig.orig Fri Sep 22 13:10:22 2000
+++ admin/ltconfig Sun Dec 17 03:41:16 2000
@@ -620,6 +620,12 @@ old_archive_cmds='$AR $AR_FLAGS $oldlib$
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
@ -13,7 +13,7 @@
# Source the script associated with the $tagname tag configuration.
if test -n "$tagname"; then
. $ltmain
@@ -1133,6 +1139,15 @@ openbsd*)
@@ -1135,6 +1141,15 @@ openbsd*)
need_lib_prefix=no
need_version=no
fi

View File

@ -1,13 +0,0 @@
--- kcontrol/background/Makefile.in.orig Thu Oct 5 18:22:29 2000
+++ kcontrol/background/Makefile.in Thu Oct 5 18:25:14 2000
@@ -419,6 +419,10 @@ maintainer-clean-libtool:
$(CXXCOMPILE) -c `cygpath -w $<`
.cc.lo:
$(LTCXXCOMPILE) -c $<
+
+bgsettings.lo: bgsettings.cc
+ $(LTCXXCOMPILE) -O0 -c bgsettings.cc
+
.cpp.o:
$(CXXCOMPILE) -c $<
.cpp.obj:

View File

@ -1,12 +0,0 @@
--- kcontrol/fonts/Makefile.in.orig Thu Oct 5 21:40:40 2000
+++ kcontrol/fonts/Makefile.in Thu Oct 5 21:41:02 2000
@@ -390,6 +390,9 @@ maintainer-clean-libtool:
.cpp.lo:
$(LTCXXCOMPILE) -c $<
+fonts.lo: fonts.cpp
+ $(LTCXXCOMPILE) -O0 -c fonts.cpp
+
install-lnfDATA: $(lnf_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(lnfdir)

View File

@ -1,5 +1,5 @@
--- kdm/kgreeter.cpp.orig Thu Sep 28 13:09:20 2000
+++ kdm/kgreeter.cpp Thu Sep 28 13:52:18 2000
--- kdm/kgreeter.cpp.orig Tue Oct 10 22:48:40 2000
+++ kdm/kgreeter.cpp Sun Dec 17 03:41:16 2000
@@ -77,9 +77,11 @@ extern "C" {
#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
#define USE_LOGIN_CAP 1
@ -13,7 +13,7 @@
#else
struct login_cap *lc;
#endif
@@ -524,7 +526,7 @@ KGreeter::restrict()
@@ -523,7 +525,7 @@ KGreeter::restrict()
#endif
#ifdef USE_LOGIN_CAP
@ -22,7 +22,7 @@
lc = login_getclass(pwd->pw_class);
#else
lc = login_getpwclass(pwd);
@@ -552,10 +554,12 @@ KGreeter::restrict_time()
@@ -551,10 +553,12 @@ KGreeter::restrict_time()
// don't deny a root log in
if (!pwd->pw_uid) return false;

View File

@ -1,5 +1,5 @@
--- konsole/src/TEPty.C.orig Tue Oct 3 21:57:30 2000
+++ konsole/src/TEPty.C Fri Nov 24 17:52:38 2000
--- konsole/src/TEPty.C.orig Sun Nov 26 17:33:51 2000
+++ konsole/src/TEPty.C Sun Dec 17 03:41:16 2000
@@ -180,9 +180,14 @@ int chownpty(int fd, int grant)
// param grant: 1 to grant, 0 to revoke
// returns 1 on success 0 on fail
@ -23,30 +23,3 @@
return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
}
return 0; //dummy.
@@ -227,7 +233,11 @@ void TEPty::donePty()
#elif defined(USE_LOGIN)
char *tty_name=ttyname(0);
if (tty_name)
+ {
+ if (strncmp(tty_name, "/dev/", 5) == 0)
+ tty_name += 5;
logout(tty_name);
+ }
#endif
if (needGrantPty) chownpty(fd,FALSE);
emit done(status);
@@ -435,10 +445,13 @@ void TEPty::makePty(const char* dev, con
l_struct.ut_host[UT_HOSTSIZE]=0;
}
- if (! (str_ptr=ttyname(0)) ) {
+ if (! (str_ptr=ttyname(tt)) ) {
abort();
}
+ if (strncmp(str_ptr, "/dev/", 5) == 0)
+ str_ptr += 5;
strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE);
+ time(&l_struct.ut_time);
login(&l_struct);
#endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2000/11/27 20:45:17 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.6 2000/12/17 11:28:01 espie Exp $
lib/libappletproxy.so.0.0
lib/libclockapplet.so.1.0
lib/libhtmlsearch.so.0.0

View File

@ -1,15 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2000/11/27 20:45:17 espie Exp $
@mode u+s
@owner root
bin/konsole_grantpty
bin/kcheckpass
@mode
@owner
@group utmp
@mode g+s
bin/konsole
@group
@mode
@comment $OpenBSD: PLIST,v 1.8 2000/12/17 11:28:02 espie Exp $
bin/appletproxy
bin/chooser
bin/conttest
@ -21,6 +10,7 @@ bin/kblankscrn.kss
bin/kblob.kss
bin/kbouboule.kss
bin/kbsod.kss
bin/kcheckpass
bin/kcminit
bin/kcmshell
bin/kcontrol
@ -48,6 +38,8 @@ bin/kman2html
bin/kmatrix.kss
bin/kmenuedit
bin/konqueror
bin/konsole
bin/konsole_grantpty
bin/kpager
bin/kpolygon.kss
bin/kpyro.kss
@ -866,7 +858,6 @@ share/doc/HTML/en/kcontrol/action.html
share/doc/HTML/en/kcontrol/background.html
share/doc/HTML/en/kcontrol/batmon.html
share/doc/HTML/en/kcontrol/bell.html
share/doc/HTML/en/kcontrol/blockdev.html
share/doc/HTML/en/kcontrol/borders.html
share/doc/HTML/en/kcontrol/color.html
share/doc/HTML/en/kcontrol/common
@ -960,6 +951,8 @@ share/doc/HTML/en/kcontrol/kcmuseragent.docbook
share/doc/HTML/en/kcontrol/kcmwinshare.docbook
share/doc/HTML/en/kcontrol/kcmxservinfo.docbook
share/doc/HTML/en/kcontrol/key-bindings.html
share/doc/HTML/en/kcontrol/kfileman1.png
share/doc/HTML/en/kcontrol/kfileman2.png
share/doc/HTML/en/kcontrol/konq-browsing.html
share/doc/HTML/en/kcontrol/laptop.html
share/doc/HTML/en/kcontrol/locale.html
@ -1038,9 +1031,26 @@ share/doc/HTML/en/khelpcenter/contact.docbook
share/doc/HTML/en/khelpcenter/credits.html
share/doc/HTML/en/khelpcenter/faq/.anchors
share/doc/HTML/en/khelpcenter/faq/TODO
share/doc/HTML/en/khelpcenter/faq/about.html
share/doc/HTML/en/khelpcenter/faq/applications.html
share/doc/HTML/en/khelpcenter/faq/common
share/doc/HTML/en/khelpcenter/faq/configure.html
share/doc/HTML/en/khelpcenter/faq/contribute.html
share/doc/HTML/en/khelpcenter/faq/credits.html
share/doc/HTML/en/khelpcenter/faq/desktop.html
share/doc/HTML/en/khelpcenter/faq/filemanager.html
share/doc/HTML/en/khelpcenter/faq/getting-kde.html
share/doc/HTML/en/khelpcenter/faq/index.docbook
share/doc/HTML/en/khelpcenter/faq/index.html
share/doc/HTML/en/khelpcenter/faq/install.html
share/doc/HTML/en/khelpcenter/faq/introduction.html
share/doc/HTML/en/khelpcenter/faq/misc.html
share/doc/HTML/en/khelpcenter/faq/more-info.html
share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html
share/doc/HTML/en/khelpcenter/faq/not-kde.html
share/doc/HTML/en/khelpcenter/faq/panel.html
share/doc/HTML/en/khelpcenter/faq/tips.html
share/doc/HTML/en/khelpcenter/faq/windowmanager.html
share/doc/HTML/en/khelpcenter/help-system-user-manual.html
share/doc/HTML/en/khelpcenter/help.docbook
share/doc/HTML/en/khelpcenter/index.docbook
@ -1083,13 +1093,13 @@ share/doc/HTML/en/khelpcenter/userguide/common
share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
share/doc/HTML/en/khelpcenter/userguide/desktop-components.html
share/doc/HTML/en/khelpcenter/userguide/docu-staff.html
share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html
share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html
share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
share/doc/HTML/en/khelpcenter/userguide/first-impressions.html
share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
share/doc/HTML/en/khelpcenter/userguide/getting-kde.html
share/doc/HTML/en/khelpcenter/userguide/getting-started.html
share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html
share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html
share/doc/HTML/en/khelpcenter/userguide/index.docbook
share/doc/HTML/en/khelpcenter/userguide/index.html
share/doc/HTML/en/khelpcenter/userguide/installation.html
@ -1105,8 +1115,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
share/doc/HTML/en/khelpcenter/userguide/more-help.html
share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html
share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html
share/doc/HTML/en/khelpcenter/userguide/networkapplications.html
share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html
share/doc/HTML/en/khelpcenter/userguide/network-applications.html
share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html
share/doc/HTML/en/khelpcenter/userguide/shortcuts.html
share/doc/HTML/en/khelpcenter/userguide/source-distribution.html
@ -1224,6 +1234,7 @@ share/doc/HTML/en/kmenuedit/introduction.html
share/doc/HTML/en/kmenuedit/menu-reference.html
share/doc/HTML/en/kmenuedit/using-kmenuedit.html
share/doc/HTML/en/konqueror/.anchors
share/doc/HTML/en/konqueror/autocomplete.html
share/doc/HTML/en/konqueror/basics.html
share/doc/HTML/en/konqueror/bookmarks.html
share/doc/HTML/en/konqueror/browser.html
@ -1235,10 +1246,13 @@ share/doc/HTML/en/konqueror/common
share/doc/HTML/en/konqueror/config-prox.html
share/doc/HTML/en/konqueror/config.html
share/doc/HTML/en/konqueror/configure-bars.html
share/doc/HTML/en/konqueror/cook.html
share/doc/HTML/en/konqueror/credits.html
share/doc/HTML/en/konqueror/crypto.html
share/doc/HTML/en/konqueror/deleting.html
share/doc/HTML/en/konqueror/dirtree.png
share/doc/HTML/en/konqueror/dragdrop.png
share/doc/HTML/en/konqueror/faq.html
share/doc/HTML/en/konqueror/fileassoc.html
share/doc/HTML/en/konqueror/filemanager.html
share/doc/HTML/en/konqueror/filetype1.png
@ -1249,9 +1263,6 @@ share/doc/HTML/en/konqueror/index.docbook
share/doc/HTML/en/konqueror/index.html
share/doc/HTML/en/konqueror/installation.html
share/doc/HTML/en/konqueror/introduction.html
share/doc/HTML/en/konqueror/kfind.png
share/doc/HTML/en/konqueror/konqdoc5.png
share/doc/HTML/en/konqueror/konqdoc9.png
share/doc/HTML/en/konqueror/konqorg.png
share/doc/HTML/en/konqueror/lmbmmb.html
share/doc/HTML/en/konqueror/making.html
@ -1267,6 +1278,7 @@ share/doc/HTML/en/konqueror/rmb-menus.html
share/doc/HTML/en/konqueror/samba.html
share/doc/HTML/en/konqueror/samba.png
share/doc/HTML/en/konqueror/save-print-web.html
share/doc/HTML/en/konqueror/saveset.html
share/doc/HTML/en/konqueror/surf.html
share/doc/HTML/en/konsole/.anchors
share/doc/HTML/en/konsole/command-line-options.html
@ -1277,6 +1289,7 @@ share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/konsole/index.html
share/doc/HTML/en/konsole/installation.html
share/doc/HTML/en/konsole/introduction.html
share/doc/HTML/en/konsole/konsole.png
share/doc/HTML/en/konsole/konsole1.gif
share/doc/HTML/en/konsole/konsole2.gif
share/doc/HTML/en/konsole/menubar.html
@ -1324,9 +1337,9 @@ share/doc/HTML/en/kwrite/index.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
share/doc/HTML/en/kwrite/on-screen-fundamentals.html
share/doc/HTML/en/kwrite/other-preferences.html
share/doc/HTML/en/kwrite/pref-dialog.html
share/doc/HTML/en/kwrite/pref-edit.html
share/doc/HTML/en/kwrite/pref-highlighting.html
share/doc/HTML/en/kwrite/pref-indent.html
share/doc/HTML/en/kwrite/pref-select.html
share/doc/HTML/en/kwrite/prefspellchecker.html
@ -2068,7 +2081,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/sounds
@dirrm share/services
@dirrm share/mimelnk/application
@dirrm share/mimelnk
@dirrm share/locale/l10n/za
@dirrm share/locale/l10n/ve
@dirrm share/locale/l10n/vc
@ -2143,23 +2155,37 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/locale
@dirrm share/icons/locolor/32x32/devices
@dirrm share/icons/locolor/32x32/apps
@dirrm share/icons/locolor/32x32
@dirrm share/icons/locolor/16x16/devices
@dirrm share/icons/locolor/16x16/apps
@dirrm share/icons/locolor/16x16/actions
@dirrm share/icons/locolor/16x16
@dirrm share/icons/locolor
@exec mkdir -p %D/share/icons/hicolor/48x48/mimetypes
@dirrm share/icons/hicolor/48x48/mimetypes
@exec mkdir -p %D/share/icons/hicolor/48x48/filesystems
@dirrm share/icons/hicolor/48x48/filesystems
@dirrm share/icons/hicolor/48x48/devices
@dirrm share/icons/hicolor/48x48/apps
@exec mkdir -p %D/share/icons/hicolor/48x48/actions/kde
@dirrm share/icons/hicolor/48x48/actions/kde
@dirrm share/icons/hicolor/48x48/actions
@dirrm share/icons/hicolor/48x48
@exec mkdir -p %D/share/icons/hicolor/32x32/mimetypes
@dirrm share/icons/hicolor/32x32/mimetypes
@exec mkdir -p %D/share/icons/hicolor/32x32/filesystems
@dirrm share/icons/hicolor/32x32/filesystems
@dirrm share/icons/hicolor/32x32/devices
@dirrm share/icons/hicolor/32x32/apps
@exec mkdir -p %D/share/icons/hicolor/32x32/actions/kde
@dirrm share/icons/hicolor/32x32/actions/kde
@dirrm share/icons/hicolor/32x32/actions
@dirrm share/icons/hicolor/32x32
@exec mkdir -p %D/share/icons/hicolor/22x22/mimetypes
@dirrm share/icons/hicolor/22x22/mimetypes
@exec mkdir -p %D/share/icons/hicolor/22x22/filesystems
@dirrm share/icons/hicolor/22x22/filesystems
@exec mkdir -p %D/share/icons/hicolor/22x22/actions/kde
@dirrm share/icons/hicolor/22x22/actions/kde
@dirrm share/icons/hicolor/22x22/actions
@dirrm share/icons/hicolor/22x22
@dirrm share/icons/hicolor
@dirrm share/icons
@dirrm share/fonts/override
@dirrm share/fonts
@dirrm share/doc/HTML/en/kwrite

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2000/11/29 00:46:38 espie Exp $
# $OpenBSD: Makefile,v 1.7 2000/12/17 11:27:55 espie Exp $
CATEGORIES= x11 x11/kde
NEED_VERSION= 1.305
VERSION= 2.0
VERSION= 2.0.1
DISTNAME= kdelibs-${VERSION}
DIST_SUBDIR= kde

View File

@ -1,3 +1,3 @@
MD5 (kde/kdelibs-2.0.tar.bz2) = 7376ddd726b8f77223bf08a7de2dfb3d
RMD160 (kde/kdelibs-2.0.tar.bz2) = 428bed972dbe898857c23f4da61315d4b5713cfe
SHA1 (kde/kdelibs-2.0.tar.bz2) = dca00340f99d492d2c5b0305084315452eae1da4
MD5 (kde/kdelibs-2.0.1.tar.bz2) = 563d6b24a216a32be2f55f5b1c14e14c
RMD160 (kde/kdelibs-2.0.1.tar.bz2) = f6739f28b3e80a260a2da6d91dc7018d7c155f19
SHA1 (kde/kdelibs-2.0.1.tar.bz2) = 231b17033024763cde292460ff9b0123d8fbf23e

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2000/10/25 10:38:11 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2000/12/17 11:27:57 espie Exp $
bin/artsc-config
bin/artscat
bin/artsd
@ -385,20 +385,6 @@ include/progressbase.h
include/qconfigDB.h
include/qxembed.h
include/statusbarprogress.h
lib/Arts/Synth_ADD.mcopclass
lib/Arts/Synth_AMAN_PLAY.mcopclass
lib/Arts/Synth_AMAN_RECORD.mcopclass
lib/Arts/Synth_BUS_DOWNLINK.mcopclass
lib/Arts/Synth_BUS_UPLINK.mcopclass
lib/Arts/Synth_FREQUENCY.mcopclass
lib/Arts/Synth_MUL.mcopclass
lib/Arts/Synth_MULTI_ADD.mcopclass
lib/Arts/Synth_PLAY.mcopclass
lib/Arts/Synth_PLAY_WAV.mcopclass
lib/Arts/Synth_RECORD.mcopclass
lib/Arts/Synth_WAVE_SIN.mcopclass
lib/Arts/WavPlayObject.mcopclass
lib/Arts/X11GlobalComm.mcopclass
lib/b3style.la
lib/basicstyle.la
lib/dcopserver.la
@ -450,6 +436,20 @@ lib/libmcop.la
lib/libqtmcop.la
lib/libsoundserver_idl.la
lib/libx11globalcomm.la
lib/mcop/Arts/Synth_ADD.mcopclass
lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass
lib/mcop/Arts/Synth_FREQUENCY.mcopclass
lib/mcop/Arts/Synth_MUL.mcopclass
lib/mcop/Arts/Synth_MULTI_ADD.mcopclass
lib/mcop/Arts/Synth_PLAY.mcopclass
lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
lib/mcop/Arts/Synth_RECORD.mcopclass
lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
lib/mcop/Arts/WavPlayObject.mcopclass
lib/mcop/Arts/X11GlobalComm.mcopclass
share/apps/LICENSES/ARTISTIC
share/apps/LICENSES/BSD
share/apps/LICENSES/GPL_V2
@ -2147,7 +2147,8 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/kab
@dirrm share/apps/LICENSES
@dirrm share/apps
@dirrm lib/Arts
@dirrm lib/mcop/Arts
@dirrm lib/mcop
@dirrm include/libkmid
@dirrm include/kparts
@dirrm include/kjs