Update to kde 2.1
This commit is contained in:
parent
73527c8a87
commit
637e404563
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2001/03/11 16:13:47 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2001/03/12 16:18:33 espie Exp $
|
||||
|
||||
CATEGORIES= x11 x11/kde
|
||||
NEED_VERSION= 1.305
|
||||
VERSION= 2.0.1
|
||||
VERSION= 2.1
|
||||
DISTNAME= kdebase-${VERSION}
|
||||
DIST_SUBDIR= kde
|
||||
|
||||
@ -10,8 +10,9 @@ MASTER_SITES= ${MASTER_SITE_KDE}
|
||||
MASTER_SITE_SUBDIR= stable/${VERSION}/distribution/tar/generic/src/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
USE_MOTIF= Yes
|
||||
LIB_DEPENDS= kdecore.3.::x11/kde/libs2 \
|
||||
Xm.1.2::x11/lesstif
|
||||
ldap.2::databases/openldap
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --with-qt-includes=${LOCALBASE}/include/X11/qt2
|
||||
@ -28,7 +29,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_ENV= MOC=${LOCALBASE}/bin/moc2 \
|
||||
RUN_KAPPFINDER=no KDEDIR=/usr/local
|
||||
RUN_KAPPFINDER=no KDEDIR=${LOCALBASE}
|
||||
MAKE_ENV= ${CONFIGURE_ENV}
|
||||
|
||||
# Ensure qt2 will always be at the front
|
||||
@ -40,8 +41,6 @@ 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
|
||||
MTREE_FILE=${PORTSDIR}/x11/kde/libs2/files/mtree
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
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
|
||||
MD5 (kde/kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f
|
||||
RMD160 (kde/kdebase-2.1.tar.bz2) = 5c9127ee3ac33e472448b5fb2187c7ee62f93e0a
|
||||
SHA1 (kde/kdebase-2.1.tar.bz2) = 08c1e42b5f7616c5d9b8fbe9f26f2b98a7c77a1f
|
||||
|
@ -1,40 +1,21 @@
|
||||
--- admin/ltcf-cxx.sh.orig Sat Sep 9 18:59:52 2000
|
||||
+++ admin/ltcf-cxx.sh Thu Oct 26 23:26:15 2000
|
||||
@@ -107,13 +107,13 @@ if { ac_try='${CC-c++} -E conftest.$ac_e
|
||||
# linker, instead of GNU ld. If possible, this setting should
|
||||
# overridden to take advantage of the native linker features on
|
||||
# the platform it is being used on.
|
||||
- archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
fi
|
||||
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
- output_verbose_link_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
|
||||
+ output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
|
||||
|
||||
else
|
||||
with_gcc=no
|
||||
@@ -339,6 +339,12 @@ case "$host_os" in
|
||||
ld_shlibs=no
|
||||
$OpenBSD: patch-admin_ltcf-cxx_sh,v 1.4 2001/03/12 16:18:34 espie Exp $
|
||||
--- admin/ltcf-cxx.sh.orig Mon Feb 19 12:20:49 2001
|
||||
+++ admin/ltcf-cxx.sh Sun Mar 11 15:42:15 2001
|
||||
@@ -355,14 +355,14 @@ case "$host_os" in
|
||||
openbsd*)
|
||||
if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
|
||||
# MM: OpenBSD 2.7 uses G++, but not GNU ld
|
||||
- archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
- archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
|
||||
hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
- whole_archive_flag_spec='${wl}-Bforcearchive'
|
||||
remove_lgcc=yes
|
||||
+ output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
|
||||
fi
|
||||
;;
|
||||
+ openbsd*)
|
||||
+ ld_shlibs=yes
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ hardcode_direct=yes
|
||||
+ hardcode_shlibpath_var=no
|
||||
+ ;;
|
||||
osf3*)
|
||||
if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
|
||||
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
|
||||
@@ -549,7 +555,7 @@ case "$host_os" in
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
- output_verbose_link_cmds="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
|
||||
+ output_verbose_link_cmds="$CC -shared $pic_flag $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
|
||||
else
|
||||
# g++ 2.7 appears to require `-G' NOT `-shared' on this
|
||||
# platform.
|
||||
|
@ -1,31 +1,12 @@
|
||||
--- 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=
|
||||
|
||||
+case "$host_os" in
|
||||
+openbsd*)
|
||||
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
# Source the script associated with the $tagname tag configuration.
|
||||
if test -n "$tagname"; then
|
||||
. $ltmain
|
||||
@@ -1135,6 +1141,15 @@ openbsd*)
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
fi
|
||||
+ file_magic_cmd='/usr/bin/env -i /usr/bin/file'
|
||||
+ if $file_magic_cmd /usr/lib/libc.so.* | grep ELF >/dev/null; then
|
||||
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
||||
+ else
|
||||
+ deplibs_check_method='file_magic OpenBSD/.* demand paged shared library.*'
|
||||
+ fi
|
||||
+ # trust our libraries, as libtool is abysmally stupid with libgcc
|
||||
+ deplibs_check_method=pass_all
|
||||
+ sys_lib_dlsearch_path_spec='/usr/lib /usr/local/lib /usr/X11R6/lib /usr/local/lib/qt2'
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
$OpenBSD: patch-admin_ltconfig,v 1.3 2001/03/12 16:18:34 espie Exp $
|
||||
--- admin/ltconfig.orig Sat Mar 10 15:05:21 2001
|
||||
+++ admin/ltconfig Sat Mar 10 15:07:50 2001
|
||||
@@ -1162,6 +1162,8 @@ openbsd*)
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
# OpenBSD 2.7 the overriding is needed for fast-install
|
||||
shlibpath_overrides_runpath=yes
|
||||
+ deplib_check_method=pass_all
|
||||
+ sys_lib_dlsearch_path_spec='/usr/lib /usr/local/lib /usr/X11R6/lib /usr/local/lib/qt2'
|
||||
;;
|
||||
|
||||
os2*)
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- kcontrol/info/info.cpp.orig Thu Oct 5 22:04:19 2000
|
||||
+++ kcontrol/info/info.cpp Thu Oct 5 22:04:42 2000
|
||||
@@ -435,6 +435,8 @@ void KInfoListWidget::resizeEvent( QResi
|
||||
#include "info_hpux.cpp"
|
||||
#elif __NetBSD__
|
||||
#include "info_netbsd.cpp"
|
||||
+#elif __OpenBSD__
|
||||
+#include "info_openbsd.cpp"
|
||||
#elif __svr4__
|
||||
#include "info_svr4.cpp"
|
||||
#else
|
@ -1,318 +0,0 @@
|
||||
--- kcontrol/info/info_openbsd.cpp.orig Thu Oct 5 22:04:15 2000
|
||||
+++ kcontrol/info/info_openbsd.cpp Fri Oct 6 01:12:09 2000
|
||||
@@ -0,0 +1,315 @@
|
||||
+/*
|
||||
+ * $Id: patch-kcontrol_info_info_openbsd_cpp,v 1.1.1.1 2000/10/09 22:38:34 espie Exp $
|
||||
+ *
|
||||
+ * info_netbsd.cpp is part of the KDE program kcminfo. This displays
|
||||
+ * various information about the NetBSD system it's running on.
|
||||
+ *
|
||||
+ * Originally written by Jaromir Dolecek <dolecek@ics.muni.cz>. CPU info
|
||||
+ * code has been imported from implementation of processor.cpp for KDE 1.0
|
||||
+ * by David Brownlee <abs@NetBSD.org> as found in NetBSD packages collection.
|
||||
+ * Hubert Feyer <hubertf@NetBSD.org> enhanced the sound information printing
|
||||
+ * quite a lot, too.
|
||||
+ *
|
||||
+ * The code is placed into public domain. Do whatever you want with it.
|
||||
+ */
|
||||
+
|
||||
+#define INFO_CPU_AVAILABLE
|
||||
+#define INFO_IRQ_AVAILABLE
|
||||
+#define INFO_DMA_AVAILABLE
|
||||
+#define INFO_PCI_AVAILABLE
|
||||
+#define INFO_IOPORTS_AVAILABLE
|
||||
+#define INFO_SOUND_AVAILABLE
|
||||
+#define INFO_DEVICES_AVAILABLE
|
||||
+#define INFO_SCSI_AVAILABLE
|
||||
+#define INFO_PARTITIONS_AVAILABLE
|
||||
+#define INFO_XSERVER_AVAILABLE
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * all following functions should return TRUE, when the Information
|
||||
+ * was filled into the lBox-Widget. Returning FALSE indicates that
|
||||
+ * information was not available.
|
||||
+ */
|
||||
+
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/param.h>
|
||||
+#include <sys/sysctl.h>
|
||||
+#include <stdio.h> /* for NULL */
|
||||
+#include <stdlib.h> /* for malloc(3) */
|
||||
+
|
||||
+#include <qfile.h>
|
||||
+#include <qfontmetrics.h>
|
||||
+#include <qstrlist.h>
|
||||
+#include <qtextstream.h>
|
||||
+
|
||||
+#include <kdebug.h>
|
||||
+
|
||||
+typedef struct
|
||||
+ {
|
||||
+ int string;
|
||||
+ int name;
|
||||
+ const char *title;
|
||||
+ } hw_info_mib_list_t;
|
||||
+
|
||||
+bool GetInfo_CPU(QListView *lBox)
|
||||
+{
|
||||
+ static hw_info_mib_list_t hw_info_mib_list[]= {
|
||||
+ { 1, HW_MODEL, "Model" },
|
||||
+ { 1, HW_MACHINE, "Machine" },
|
||||
+ { 0, HW_NCPU, "Number of CPUs" },
|
||||
+ { 0, HW_PAGESIZE, "Pagesize" },
|
||||
+ { 0,0,0 }
|
||||
+ };
|
||||
+ hw_info_mib_list_t *hw_info_mib;
|
||||
+
|
||||
+ int mib[2], num;
|
||||
+ char *buf;
|
||||
+ size_t len;
|
||||
+ QString value;
|
||||
+
|
||||
+ lBox->addColumn(i18n("Information"));
|
||||
+ lBox->addColumn(i18n("Value"));
|
||||
+
|
||||
+ for ( hw_info_mib = hw_info_mib_list ; hw_info_mib->title ; ++hw_info_mib )
|
||||
+ {
|
||||
+ mib[0] = CTL_HW;
|
||||
+ mib[1] = hw_info_mib->name;
|
||||
+ if ( hw_info_mib->string ) {
|
||||
+ sysctl(mib,2,NULL,&len,NULL,0);
|
||||
+ if ( (buf = (char*)malloc(len)) ) {
|
||||
+ sysctl(mib,2,buf,&len,NULL,0);
|
||||
+ value = QString(buf);
|
||||
+ free(buf);
|
||||
+ }
|
||||
+ else {
|
||||
+ value = QString("Unknown");
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ len = sizeof(num);
|
||||
+ sysctl(mib,2,&num,&len,NULL,0);
|
||||
+ value.sprintf("%d", num);
|
||||
+ }
|
||||
+ new QListViewItem(lBox, hw_info_mib->title, value);
|
||||
+ }
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+// this is used to find out which devices are currently
|
||||
+// on system
|
||||
+static bool GetDmesgInfo(QListView *lBox, const char *filter,
|
||||
+ void func(QListView *, QString s, void **, bool))
|
||||
+{
|
||||
+ QFile *dmesg = new QFile("/var/run/dmesg.boot");
|
||||
+ bool usepipe=false;
|
||||
+ FILE *pipe=NULL;
|
||||
+ QTextStream *t;
|
||||
+ bool seencpu=false;
|
||||
+ void *opaque=NULL;
|
||||
+ QString s;
|
||||
+ bool found=false;
|
||||
+
|
||||
+ if (dmesg->exists() && dmesg->open(IO_ReadOnly)) {
|
||||
+ t = new QTextStream(dmesg);
|
||||
+ }
|
||||
+ else {
|
||||
+ delete dmesg;
|
||||
+ pipe = popen("/sbin/dmesg", "r");
|
||||
+ if (!pipe) return false;
|
||||
+ usepipe = true;
|
||||
+ t = new QTextStream(pipe, IO_ReadOnly);
|
||||
+ }
|
||||
+
|
||||
+ QListViewItem *olditem = NULL;
|
||||
+ while((s = t->readLine()) != "") {
|
||||
+ if (!seencpu) {
|
||||
+ if (s.contains("cpu"))
|
||||
+ seencpu = true;
|
||||
+ else
|
||||
+ continue;
|
||||
+ }
|
||||
+ if (s.contains("boot device") ||
|
||||
+ s.contains("WARNING: old BSD partition ID!"))
|
||||
+ break;
|
||||
+
|
||||
+ if (!filter || s.contains(filter)) {
|
||||
+ if (func) {
|
||||
+ func(lBox, s, &opaque, false);
|
||||
+ }
|
||||
+ else {
|
||||
+ olditem = new QListViewItem(lBox, olditem, s);
|
||||
+ }
|
||||
+ found = true;
|
||||
+ }
|
||||
+ }
|
||||
+ if (func) {
|
||||
+ func(lBox, s, &opaque, true);
|
||||
+ }
|
||||
+ //lBox->triggerUpdate();
|
||||
+
|
||||
+ delete t;
|
||||
+ if (pipe) {
|
||||
+ pclose(pipe);
|
||||
+ }
|
||||
+ else {
|
||||
+ dmesg->close();
|
||||
+ delete dmesg;
|
||||
+ }
|
||||
+
|
||||
+ return found;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+void AddIRQLine(QListView *lBox, QString s, void **opaque, bool ending)
|
||||
+{
|
||||
+ QStrList *strlist = (QStrList *) *opaque;
|
||||
+ const char *str;
|
||||
+ int pos, irqnum=0;
|
||||
+ const char *p;
|
||||
+ p = s.latin1();
|
||||
+
|
||||
+ if (!strlist) {
|
||||
+ strlist = new QStrList();
|
||||
+ *opaque = (void *) strlist;
|
||||
+ }
|
||||
+ if (ending) {
|
||||
+ str = strlist->first();
|
||||
+ for(;str; str = strlist->next()) {
|
||||
+ new QListViewItem(lBox, str);
|
||||
+ }
|
||||
+ delete strlist;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ pos = s.find(" irq ");
|
||||
+ irqnum = (pos < 0) ? 0 : atoi(&p[pos+5]);
|
||||
+ if (irqnum) {
|
||||
+ s.sprintf("%02d%s", irqnum, p);
|
||||
+ }
|
||||
+ else {
|
||||
+ s.sprintf("??%s", p);
|
||||
+ }
|
||||
+ strlist->inSort(s.latin1());
|
||||
+}
|
||||
+
|
||||
+bool GetInfo_IRQ (QListView *lBox)
|
||||
+{
|
||||
+ lBox->addColumn(i18n("IRQ"));
|
||||
+ lBox->addColumn(i18n("Device"));
|
||||
+ (void) GetDmesgInfo(lBox, " irq ", AddIRQLine);
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool GetInfo_DMA (QListView *)
|
||||
+{
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+bool GetInfo_PCI (QListView *lbox)
|
||||
+{
|
||||
+ if (!GetDmesgInfo(lbox, "at pci", NULL))
|
||||
+ new QListViewItem(lbox, i18n("No PCI devices found."));
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool GetInfo_IO_Ports (QListView *lbox)
|
||||
+{
|
||||
+ if (!GetDmesgInfo(lbox, "port 0x", NULL))
|
||||
+ new QListViewItem(lbox, i18n("No I/O port devices found."));
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool GetInfo_Sound (QListView *lbox)
|
||||
+{
|
||||
+ if (!GetDmesgInfo(lbox, "audio", NULL))
|
||||
+ new QListViewItem(lbox, i18n("No audio devices found."));
|
||||
+
|
||||
+ // append information on any audio devices found
|
||||
+ QListViewItem *lvitem = lbox->firstChild();
|
||||
+ for(; lvitem; lvitem = lvitem->nextSibling()) {
|
||||
+ QString s;
|
||||
+ int pos, len;
|
||||
+ const char *start, *end;
|
||||
+ char *dev;
|
||||
+
|
||||
+ s = lvitem->text(0);
|
||||
+ if ((pos = s.find("at ")) >= 0) {
|
||||
+ pos += 3; // skip "at "
|
||||
+ start = end = s.ascii();
|
||||
+ for(; (*end!=':') && (*end!='\n'); end++);
|
||||
+ len = end - start;
|
||||
+ dev = (char *) malloc(len + 1);
|
||||
+ strncpy(dev, start, len);
|
||||
+ dev[len] = '\0';
|
||||
+
|
||||
+ GetDmesgInfo(lbox, dev, NULL);
|
||||
+
|
||||
+ free(dev);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool GetInfo_Devices (QListView *lBox)
|
||||
+{
|
||||
+ (void) GetDmesgInfo(lBox, NULL, NULL);
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool GetInfo_SCSI (QListView *lbox)
|
||||
+{
|
||||
+ if (!GetDmesgInfo(lbox, "scsibus", NULL))
|
||||
+ new QListViewItem(lbox, i18n("No SCSI devices found."));
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool GetInfo_Partitions (QListView *lbox)
|
||||
+{
|
||||
+ QString s;
|
||||
+ char *line, *orig_line;
|
||||
+ const char *device, *mountpoint, *type, *flags;
|
||||
+ FILE *pipe = popen("/sbin/mount", "r");
|
||||
+ QTextStream *t;
|
||||
+
|
||||
+ if (!pipe) {
|
||||
+ kdError(0) << i18n("Ahh couldn't run /sbin/mount!") << endl;
|
||||
+ return false;
|
||||
+ }
|
||||
+ t = new QTextStream(pipe, IO_ReadOnly);
|
||||
+
|
||||
+ lbox->addColumn(i18n("Device"));
|
||||
+ lbox->addColumn(i18n("Mount Point"));
|
||||
+ lbox->addColumn(i18n("FS Type"));
|
||||
+ lbox->addColumn(i18n("Mount Options"));
|
||||
+
|
||||
+ QListViewItem *olditem = 0;
|
||||
+ while ((s = t->readLine()) != "") {
|
||||
+ orig_line = line = strdup(s.latin1());
|
||||
+
|
||||
+ device = strsep(&line, " ");
|
||||
+
|
||||
+ (void) strsep(&line, " "); // cosume word "on"
|
||||
+ mountpoint = strsep(&line, " ");
|
||||
+
|
||||
+ (void) strsep(&line, " "); // cosume word "type"
|
||||
+ type = strsep(&line, " ");
|
||||
+
|
||||
+ flags = line;
|
||||
+
|
||||
+ olditem = new QListViewItem(lbox, olditem, device, mountpoint,
|
||||
+ type, flags);
|
||||
+
|
||||
+ free(orig_line);
|
||||
+ }
|
||||
+
|
||||
+ delete t;
|
||||
+ pclose(pipe);
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool GetInfo_XServer_and_Video (QListView *lBox)
|
||||
+{
|
||||
+ return GetInfo_XServer_Generic( lBox );
|
||||
+}
|
19
x11/kde/base2/patches/patch-kcontrol_thememgr_Makefile_in
Normal file
19
x11/kde/base2/patches/patch-kcontrol_thememgr_Makefile_in
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-kcontrol_thememgr_Makefile_in,v 1.1 2001/03/12 16:18:34 espie Exp $
|
||||
--- kcontrol/thememgr/Makefile.in.orig Thu Mar 8 20:36:41 2001
|
||||
+++ kcontrol/thememgr/Makefile.in Thu Mar 8 20:38:48 2001
|
||||
@@ -643,10 +643,12 @@ maintainer-clean-generic clean mostlycle
|
||||
|
||||
|
||||
install-data-local:
|
||||
- cd $(srcdir)/Themes; \
|
||||
+ cp -rp $(srcdir)/Themes $(srcdir)/Archive; \
|
||||
+ find $(srcdir)/Archive -type d -name CVS -print -prune|xargs rm -rf; \
|
||||
+ cd $(srcdir)/Archive; \
|
||||
for f in *; do \
|
||||
- if [ -d $$f -a $$f != "CVS" ]; then \
|
||||
- tar --exclude CVS -b 16 -c -f - $$f | gzip -c > $(DESTDIR)$(themesdir)/$$f.ktheme; \
|
||||
+ if [ -d $$f ]; then \
|
||||
+ tar -b 16 -zcf $(DESTDIR)$(themesdir)/$$f.ktheme $$f; \
|
||||
fi; \
|
||||
done
|
||||
|
@ -1,37 +0,0 @@
|
||||
--- 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
|
||||
#include <login_cap.h>
|
||||
-#ifdef __bsdi__
|
||||
+#if defined(__bsdi__)
|
||||
// This only works / is needed on BSDi
|
||||
struct login_cap_t *lc;
|
||||
+#elif defined(__OpenBSD__)
|
||||
+ login_cap_t *lc;
|
||||
#else
|
||||
struct login_cap *lc;
|
||||
#endif
|
||||
@@ -523,7 +525,7 @@ KGreeter::restrict()
|
||||
#endif
|
||||
|
||||
#ifdef USE_LOGIN_CAP
|
||||
-#ifdef __bsdi__
|
||||
+#if defined(__bsdi__) || defined(__OpenBSD__)
|
||||
lc = login_getclass(pwd->pw_class);
|
||||
#else
|
||||
lc = login_getpwclass(pwd);
|
||||
@@ -551,10 +553,12 @@ KGreeter::restrict_time()
|
||||
// don't deny a root log in
|
||||
if (!pwd->pw_uid) return false;
|
||||
|
||||
+#if !defined(__OpenBSD__)
|
||||
if(!auth_timeok(lc, time(NULL))) {
|
||||
KMessageBox::sorry(this, i18n("Logins not available right now."));
|
||||
return true;
|
||||
}
|
||||
+#endif
|
||||
#endif
|
||||
return false;
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
--- kdm/session.c.orig Thu Sep 28 14:01:34 2000
|
||||
+++ kdm/session.c Thu Sep 28 14:01:51 2000
|
||||
@@ -759,7 +759,7 @@ StartClient (verify, d, pidp, name, pass
|
||||
pwd = getpwnam(name);
|
||||
if (pwd)
|
||||
{
|
||||
-#ifdef __bsdi__
|
||||
+#if defined(__bsdi__) || defined(__OpenBSD__)
|
||||
lc = login_getclass(pwd->pw_class);
|
||||
#else
|
||||
lc = login_getpwclass(pwd);
|
20
x11/kde/base2/patches/patch-kioslave_ldap_kldap_h
Normal file
20
x11/kde/base2/patches/patch-kioslave_ldap_kldap_h
Normal file
@ -0,0 +1,20 @@
|
||||
$OpenBSD: patch-kioslave_ldap_kldap_h,v 1.1 2001/03/12 16:18:34 espie Exp $
|
||||
--- kioslave/ldap/kldap.h.orig Tue Mar 6 22:58:00 2001
|
||||
+++ kioslave/ldap/kldap.h Tue Mar 6 22:59:04 2001
|
||||
@@ -8,10 +8,15 @@
|
||||
#include <lber.h>
|
||||
#include <ldap.h>
|
||||
#include <config.h>
|
||||
-#ifndef TIME_WITH_SYS_TIME
|
||||
+#ifdef TIME_WITH_SYS_TIME
|
||||
#include <sys/time.h>
|
||||
+#include <time.h>
|
||||
#else
|
||||
+# ifdef HAVE_SYS_TIME_H
|
||||
+#include <sys/time.h>
|
||||
+# else
|
||||
#include <time.h>
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
namespace KLDAP
|
@ -1,25 +0,0 @@
|
||||
--- 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
|
||||
{
|
||||
+// XXX
|
||||
+ struct sigaction oact;
|
||||
+ sigaction(SIGCHLD, NULL, &oact);
|
||||
+ signal(SIGCHLD, SIG_DFL);
|
||||
pid_t pid = fork();
|
||||
if (pid < 0)
|
||||
{
|
||||
+ sigaction(SIGCHLD, &oact, NULL);
|
||||
return 0;
|
||||
}
|
||||
if (pid == 0)
|
||||
@@ -199,6 +204,7 @@ int chownpty(int fd, int grant)
|
||||
int rc = waitpid (pid, &w, 0);
|
||||
if ((rc == -1) && (errno == EINTR))
|
||||
goto retry;
|
||||
+ sigaction(SIGCHLD, &oact, NULL);
|
||||
return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
|
||||
}
|
||||
return 0; //dummy.
|
@ -1,6 +1,6 @@
|
||||
--- konsole/src/main.C.orig Fri Nov 24 17:06:12 2000
|
||||
+++ konsole/src/main.C Fri Nov 24 17:05:40 2000
|
||||
@@ -46,7 +46,9 @@ static KCmdLineOptions options[] =
|
||||
--- konsole/src/main.C.orig Sun Feb 18 16:28:29 2001
|
||||
+++ konsole/src/main.C Tue Mar 6 21:52:42 2001
|
||||
@@ -67,7 +67,9 @@ public:
|
||||
/* --| main |------------------------------------------------------ */
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
|
@ -1,98 +1,119 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.6 2000/12/17 11:28:01 espie Exp $
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.7 2001/03/12 16:18:34 espie Exp $
|
||||
lib/kde2/libhtmlthumbnail.so.0.0
|
||||
lib/kde2/libimagethumbnail.so.0.0
|
||||
lib/kde2/libkaccess.so.0.0
|
||||
lib/kde2/libkcm_access.so.0.0
|
||||
lib/kde2/libkcm_arts.so.0.0
|
||||
lib/kde2/libkcm_background.so.0.0
|
||||
lib/kde2/libkcm_bell.so.0.0
|
||||
lib/kde2/libkcm_clock.so.0.0
|
||||
lib/kde2/libkcm_colors.so.0.0
|
||||
lib/kde2/libkcm_crypto.so.0.0
|
||||
lib/kde2/libkcm_email.so.0.0
|
||||
lib/kde2/libkcm_energy.so.0.0
|
||||
lib/kde2/libkcm_filetypes.so.0.0
|
||||
lib/kde2/libkcm_fonts.so.0.0
|
||||
lib/kde2/libkcm_icons.so.0.0
|
||||
lib/kde2/libkcm_info.so.0.0
|
||||
lib/kde2/libkcm_input.so.0.0
|
||||
lib/kde2/libkcm_kdm.so.0.0
|
||||
lib/kde2/libkcm_keys.so.0.0
|
||||
lib/kde2/libkcm_khotkeys.so.0.0
|
||||
lib/kde2/libkcm_kicker.so.0.0
|
||||
lib/kde2/libkcm_kio.so.0.0
|
||||
lib/kde2/libkcm_knotify.so.0.0
|
||||
lib/kde2/libkcm_konq.so.0.0
|
||||
lib/kde2/libkcm_konqhtml.so.0.0
|
||||
lib/kde2/libkcm_kurifilt.so.0.0
|
||||
lib/kde2/libkcm_kwinoptions.so.0.0
|
||||
lib/kde2/libkcm_locale.so.0.0
|
||||
lib/kde2/libkcm_midi.so.0.0
|
||||
lib/kde2/libkcm_passwords.so.0.0
|
||||
lib/kde2/libkcm_samba.so.0.0
|
||||
lib/kde2/libkcm_screensaver.so.0.0
|
||||
lib/kde2/libkcm_smserver.so.0.0
|
||||
lib/kde2/libkcm_style.so.0.0
|
||||
lib/kde2/libkcm_taskbar.so.0.0
|
||||
lib/kde2/libkcm_themes.so.0.0
|
||||
lib/kde2/libkfindpart.so.0.0
|
||||
lib/kde2/libkio_filter.so.0.0
|
||||
lib/kde2/libkio_finger.so.0.0
|
||||
lib/kde2/libkio_floppy.so.0.0
|
||||
lib/kde2/libkio_gopher.so.0.0
|
||||
lib/kde2/libkio_help.so.0.0
|
||||
lib/kde2/libkio_imap4.so.0.0
|
||||
lib/kde2/libkio_info.so.0.0
|
||||
lib/kde2/libkio_ldap.so.0.0
|
||||
lib/kde2/libkio_man.so.0.0
|
||||
lib/kde2/libkio_nfs.so.0.0
|
||||
lib/kde2/libkio_nntp.so.0.0
|
||||
lib/kde2/libkio_pop3.so.0.0
|
||||
lib/kde2/libkio_smb.so.0.0
|
||||
lib/kde2/libkio_smtp.so.0.0
|
||||
lib/kde2/libkio_tar.so.0.0
|
||||
lib/kde2/libkio_thumbnail.so.0.0
|
||||
lib/kde2/libkonqiconview.so.0.0
|
||||
lib/kde2/libkonqlistview.so.0.0
|
||||
lib/kde2/libkonqtree.so.0.0
|
||||
lib/kde2/libkshellcmdplugin.so.0.0
|
||||
lib/kde2/libkshorturifilter.so.0.0
|
||||
lib/kde2/libkuriikwsfilter.so.0.0
|
||||
lib/kde2/libkurisearchfilter.so.0.0
|
||||
lib/kde2/libkwin2k.so.0.0
|
||||
lib/kde2/libkwinb2.so.0.0
|
||||
lib/kde2/libkwinkde1.so.0.0
|
||||
lib/kde2/libkwinkstep.so.0.0
|
||||
lib/kde2/libkwinkwmtheme.so.0.0
|
||||
lib/kde2/libkwinlaptop.so.0.0
|
||||
lib/kde2/libkwinmodernsys.so.0.0
|
||||
lib/kde2/libkwinriscos.so.0.0
|
||||
lib/kde2/libkwinsystem.so.0.0
|
||||
lib/kde2/libtextthumbnail.so.0.0
|
||||
lib/libappletproxy.so.0.0
|
||||
lib/libchildpanelextension.so.1.0
|
||||
lib/libclockapplet.so.1.0
|
||||
lib/libdockbarextension.so.1.0
|
||||
lib/libextensionproxy.so.0.0
|
||||
lib/libhtmlsearch.so.0.0
|
||||
lib/libkaccess.so.0.0
|
||||
lib/libkcm_access.so.0.0
|
||||
lib/libkcm_arts.so.0.0
|
||||
lib/libkcm_background.so.0.0
|
||||
lib/libkcm_bell.so.0.0
|
||||
lib/libkcm_clock.so.0.0
|
||||
lib/libkcm_colors.so.0.0
|
||||
lib/libkcm_crypto.so.0.0
|
||||
lib/libkcm_email.so.0.0
|
||||
lib/libkcm_energy.so.0.0
|
||||
lib/libkcm_filetypes.so.0.0
|
||||
lib/libkcm_fonts.so.0.0
|
||||
lib/libkasbarextension.so.1.0
|
||||
lib/libkcm_htmlsearch.so.0.0
|
||||
lib/libkcm_icons.so.0.0
|
||||
lib/libkcm_iconthemes.so.0.0
|
||||
lib/libkcm_info.so.0.0
|
||||
lib/libkcm_input.so.0.0
|
||||
lib/libkcm_kdm.so.0.0
|
||||
lib/libkcm_keys.so.0.0
|
||||
lib/libkcm_khotkeys.so.0.0
|
||||
lib/libkcm_kicker.so.0.0
|
||||
lib/libkcm_kio.so.0.0
|
||||
lib/libkcm_knotify.so.0.0
|
||||
lib/libkcm_konq.so.0.0
|
||||
lib/libkcm_konqhtml.so.0.0
|
||||
lib/libkcm_kurifilt.so.0.0
|
||||
lib/libkcm_kwindesktop.so.0.0
|
||||
lib/libkcm_kwinmouse.so.0.0
|
||||
lib/libkcm_kwinoptions.so.0.0
|
||||
lib/libkcm_ioslaveinfo.so.0.0
|
||||
lib/libkcm_layout.so.0.0
|
||||
lib/libkcm_locale.so.0.0
|
||||
lib/libkcm_midi.so.0.0
|
||||
lib/libkcm_nsplugin.so.0.0
|
||||
lib/libkcm_passwords.so.0.0
|
||||
lib/libkcm_samba.so.0.0
|
||||
lib/libkcm_screensaver.so.0.0
|
||||
lib/libkcm_style.so.0.0
|
||||
lib/libkcm_taskbar.so.0.0
|
||||
lib/libkcm_virtualdesktops.so.0.0
|
||||
lib/libkcm_xmlrpcd.so.0.0
|
||||
lib/libkcminit.so.0.0
|
||||
lib/libkcmshell.so.0.0
|
||||
lib/libkcontrol.so.0.0
|
||||
lib/libkdesktop.so.0.0
|
||||
lib/libkeditbookmarks.so.0.0
|
||||
lib/libkfmclient.so.0.0
|
||||
lib/libkhelpcenter.so.1.0
|
||||
lib/libkhotkeys.so.0.0
|
||||
lib/libkicker.so.0.0
|
||||
lib/libkio_gopher.so.0.0
|
||||
lib/libkio_gzip.so.0.0
|
||||
lib/libkio_help.so.0.0
|
||||
lib/libkio_info.so.0.0
|
||||
lib/libkio_man.so.0.0
|
||||
lib/libkio_nfs.so.0.0
|
||||
lib/libkio_nntp.so.0.0
|
||||
lib/libkio_pop3.so.0.0
|
||||
lib/libkio_smb.so.0.0
|
||||
lib/libkio_smtp.so.0.0
|
||||
lib/libkio_tar.so.0.0
|
||||
lib/libklegacyimport.so.0.0
|
||||
lib/libklipper.so.0.0
|
||||
lib/libkmenuedit.so.0.0
|
||||
lib/libkminipagerapplet.so.1.0
|
||||
lib/libkonq.so.3.0
|
||||
lib/libkonqdirtree.so.0.0
|
||||
lib/libkonqiconview.so.0.0
|
||||
lib/libkonqlistview.so.0.0
|
||||
lib/libkonqaboutpage.so.0.0
|
||||
lib/libkonqueror.so.0.0
|
||||
lib/libkonsole.so.0.0
|
||||
lib/libkonsolepart.so.0.0
|
||||
lib/libkrunapplet.so.1.0
|
||||
lib/libkshorturifilter.so.1.0
|
||||
lib/libksysguardapplet.so.1.0
|
||||
lib/libksystemtrayapplet.so.1.0
|
||||
lib/libktaskbarapplet.so.1.0
|
||||
lib/libkuriikwsfilter.so.1.0
|
||||
lib/libkurisearchfilter.so.1.0
|
||||
lib/libkwin.so.0.0
|
||||
lib/libkwinb2.so.0.0
|
||||
lib/libkwindefault.so.0.0
|
||||
lib/libkwinkde1.so.0.0
|
||||
lib/libkwinkstep.so.0.0
|
||||
lib/libkwinlaptop.so.0.0
|
||||
lib/libkwinmodernsys.so.0.0
|
||||
lib/libkwinriscos.so.0.0
|
||||
lib/libkwinsystem.so.0.0
|
||||
lib/libkwrite.so.0.0
|
||||
lib/libkwrited.so.0.0
|
||||
lib/libkwritepart.so.0.0
|
||||
lib/libkxkb.so.0.0
|
||||
lib/libkxmlrpcd.so.0.0
|
||||
lib/libnaughtyapplet.so.1.0
|
||||
lib/libnsplugin.so.1.1
|
||||
lib/libquicklauncher.so.1.0
|
||||
lib/libsmb++.so.0.9
|
||||
lib/libtaskbarextension.so.1.0
|
||||
lib/libtaskmanager.so.1.0
|
||||
DYNLIBDIR(%D/lib)
|
||||
NEWDYNLIBDIR(%D/lib/kde2)
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user