cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.2.1.

Browse Source 
Some patches folded back.
ksysguardd from Sebastian Stark. Doesn't work squeaky-clean yet, but at
least some people can look at it now...
This commit is contained in:
espie 2001-09-19 14:13:28 +00:00
parent 813a2ef9e3
commit 25650be808
33 changed files with 340 additions and 596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/kde/base2/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.24 2001/08/27 12:11:17 espie Exp $
# $OpenBSD: Makefile,v 1.25 2001/09/19 14:13:28 espie Exp $
COMMENT= "X11 toolkit, basic applications"
COMMENT-plugins= "X11 toolkit, netscape plugins"
CATEGORIES= x11 x11/kde
NEED_VERSION= 1.447
VERSION= 2.2
VERSION= 2.2.1
DISTNAME= kdebase-${VERSION}
PKGNAME-plugins= kdebase-ns-${VERSION}
DIST_SUBDIR= kde
@ -26,7 +26,7 @@ SUBPACKAGE?=
USE_MOTIF= any
.endif
LIB_DEPENDS= kdecore.3.::x11/kde/libs2 \
LIB_DEPENDS= kdecore.3,kdeui,kdezoinx::x11/kde/libs2 \
ldap.2::databases/openldap \
vorbis.::audio/libvorbis \
cdda_paranoia.::audio/cdparanoia
@ -52,6 +52,7 @@ 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

6
x11/kde/base2/files/md5
View File

@ -1,3 +1,3 @@
MD5 (kde/kdebase-2.2.tar.bz2) = 15e0232aa73029ac10346157b6eb079b
RMD160 (kde/kdebase-2.2.tar.bz2) = ac1edc84198774eb9173ef9387e04f4850572791
SHA1 (kde/kdebase-2.2.tar.bz2) = 364e9a610ab9385ae5558fc2cb160440587b5c9e
MD5 (kde/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a
RMD160 (kde/kdebase-2.2.1.tar.bz2) = 4ec52b65495d789a403d4b77c08a2e770405df5c
SHA1 (kde/kdebase-2.2.1.tar.bz2) = 5c3a300829fee66bfe26faea39112050fc4cd1e9

53
x11/kde/base2/patches/patch-aclocal_m4
View File

@ -1,16 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.3 2001/08/23 22:25:49 espie Exp $
--- aclocal.m4.orig Mon Aug 6 03:30:16 2001
+++ aclocal.m4 Thu Aug 23 01:30:41 2001
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -4722,19 +4722,7 @@ netbsd*)
$OpenBSD: patch-aclocal_m4,v 1.4 2001/09/19 14:13:28 espie Exp $
--- aclocal.m4.orig Sat Sep 8 02:34:47 2001
+++ aclocal.m4 Tue Sep 18 23:11:58 2001
@@ -4746,19 +4746,7 @@ netbsd*)
;;
openbsd* )
@ -31,39 +22,3 @@ $OpenBSD: patch-aclocal_m4,v 1.3 2001/08/23 22:25:49 espie Exp $
;;
newsos6)
@@ -4981,7 +4969,7 @@ AC_DEFUN([LT_AC_PROG_GCJ],
dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
@@ -5009,7 +4997,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
# Check to make sure that the build environment is sane.
#
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
@@ -5050,7 +5038,7 @@ AC_MSG_RESULT(yes)])
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
[AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
@@ -5066,7 +5054,7 @@ AC_SUBST($1)])
# Like AC_CONFIG_HEADER, but automatically create stamp file.
-AC_DEFUN(AM_CONFIG_HEADER,
+AC_DEFUN([AM_CONFIG_HEADER],
[AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file.

83
x11/kde/base2/patches/patch-configure_in
View File

@ -1,15 +1,5 @@
$OpenBSD: patch-configure_in,v 1.1 2001/08/26 12:04:44 espie Exp $
--- configure.in.orig Mon Aug 6 03:30:14 2001
+++ configure.in Sat Aug 25 14:15:36 2001
@@ -35,7 +35,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdebase, "2.2") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kdebase-2.2, "2.2") dnl searches for some needed programs
KDE_SET_PREFIX
--- configure.in.orig Sat Sep 8 02:34:45 2001
+++ configure.in Tue Sep 18 23:11:58 2001
@@ -789,6 +789,11 @@ if test "x$with_cdparanoia" = "xCHECK" ;
break
fi
@ -57,64 +47,11 @@ $OpenBSD: patch-configure_in,v 1.1 2001/08/26 12:04:44 espie Exp $
LIBS="$ac_save_LIBS"
fi
LAME_INCS=
@@ -1017,7 +1027,7 @@ no) AC_MSG_RESULT(no) ;;
NOTFOUND) AC_MSG_RESULT(searched but not found) ;;
*)
if test "x$with_vorbis" = "xFOUND" ; then
- msg="incs=$vorbis_libdir libs=$vorbis_incdir"
+ msg="incs=$vorbis_incdir libs=$vorbis_libdir"
else
msg="$with_vorbis"
VORBIS_ROOT="$with_vorbis"
@@ -1031,8 +1041,10 @@ NOTFOUND) AC_MSG_RESULT(searched but not
non_compile=no
if test "x$enable_vorbistest" = xyes ; then
ac_save_CFLAGS="$CFLAGS"
+ ac_save_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $all_includes $VORBIS_INCS"
+ CXXFLAGS="$CXXFLAGS $all_includes $VORBIS_INCS"
LIBS="$LIBS $all_libraries $VORBIS_LIBS"
rm -f conf.vorbistest
AC_TRY_RUN([
@@ -1049,6 +1061,7 @@ int main ()
], , non_compile=yes , [echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
# bogus return value, but it _did_ run
test -f conf.vorbistest && non_compile="no"
@@ -1059,12 +1072,13 @@ int main ()
AC_MSG_RESULT($msg)
AC_DEFINE_UNQUOTED(HAVE_VORBIS, 1, [Define if you have vorbis])
VORBISFILE_LIBS="-lvorbisfile"
- VORBISENC_LIBS="-lvorbisenc"
+ VORBISENC_LIBS="-lvorbisenc -lvorbis"
KCM_AUDIOCD="kcmaudiocd"
else
AC_MSG_RESULT(no (but first try gave $msg))
echo "*** Could not run Vorbis test program, checking why..."
CFLAGS="$CFLAGS $all_includes $VORBIS_INCS"
+ CXXFLAGS="$CXXFLAGS $all_includes $VORBIS_INCS"
LIBS="$LIBS $all_libraries $VORBIS_LIBS"
AC_TRY_LINK([
#include <stdio.h>
@@ -1083,6 +1097,7 @@ int main ()
echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
echo "*** or that you have moved Vorbis since it was installed." ])
CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
VORBIS_INCS=""
VORBIS_LIBS=""
@@ -1655,8 +1670,8 @@ kdcop/Makefile \
kdebugdialog/Makefile \
kdeprint/Makefile \
kdeprint/descriptions/Makefile \
-kdeprint/kdeprintfax/Makefile \
kdeprint/kdeprint_part/Makefile \
+kdeprint/kdeprintfax/Makefile \
kdeprint/kjobviewer/Makefile \
kdeprint/kprinter/Makefile \
kdeprint/printmgr/Makefile \
@@ -1296,6 +1306,7 @@ AC_MSG_CHECKING(if ksysguardd can be com
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+ *-*-openbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
*) ksysguard_compile=no; UNAME='' ;;
esac

31
x11/kde/base2/patches/patch-kcontrol_info_info_openbsd_cpp
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-kcontrol_info_info_openbsd_cpp,v 1.4 2001/08/21 13:43:34 espie Exp $
--- kcontrol/info/info_openbsd.cpp.orig Mon Aug 20 23:06:21 2001
+++ kcontrol/info/info_openbsd.cpp Mon Aug 20 23:42:29 2001
@@ -122,7 +122,7 @@ static bool GetDmesgInfo(QListView *lBox
}
QListViewItem *olditem = NULL;
- while((s = t->readLine()) != "") {
+ while (!(s = t->readLine()).isNull()) {
if (!seencpu) {
if (s.contains("cpu"))
seencpu = true;
@@ -285,15 +285,15 @@ bool GetInfo_Partitions (QListView *lbox
lbox->addColumn(i18n("Mount Options"));
QListViewItem *olditem = 0;
- while ((s = t->readLine()) != "") {
+ while (!(s = t->readLine()).isNull()) {
orig_line = line = strdup(s.latin1());
device = strsep(&line, " ");
- (void) strsep(&line, " "); // cosume word "on"
+ (void) strsep(&line, " "); // consume word "on"
mountpoint = strsep(&line, " ");
- (void) strsep(&line, " "); // cosume word "type"
+ (void) strsep(&line, " "); // consume word "type"
type = strsep(&line, " ");
flags = line;

39
x11/kde/base2/patches/patch-kcontrol_info_memory_cpp
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-kcontrol_info_memory_cpp,v 1.1 2001/08/20 23:42:08 espie Exp $
--- kcontrol/info/memory.cpp.orig Mon Aug 20 23:53:47 2001
+++ kcontrol/info/memory.cpp Mon Aug 20 23:54:51 2001
@@ -39,7 +39,7 @@ enum { /* entries for Memory_Info[] *
TOTAL_MEM = 0, /* total physical memory (without swaps) */
FREE_MEM, /* total free physical memory (without swaps) */
#if !defined(__svr4__) || !defined(sun)
-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
SHARED_MEM, /* shared memory size */
BUFFER_MEM, /* buffered memory size */
#else
@@ -132,7 +132,7 @@ KMemoryWidget::KMemoryWidget(QWidget * p
title = i18n("Free physical memory");
break;
#if !defined(__svr4__) || !defined(sun)
-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
case SHARED_MEM:
title = i18n("Shared memory");
break;
@@ -346,7 +346,7 @@ void KMemoryWidget::update_Values()
used[1] = 0;
#if !defined(__svr4__) || !defined(sun)
-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
used[1] = ZERO_IF_NO_INFO(Memory_Info[BUFFER_MEM]);
#endif
#endif
@@ -416,7 +416,7 @@ void KMemoryWidget::update_Values()
#include "memory_fbsd.cpp"
#elif hpux
#include "memory_hpux.cpp"
-#elif __NetBSD__
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
#include "memory_netbsd.cpp"
#elif __osf__
#include "memory_tru64.cpp"

13
x11/kde/base2/patches/patch-kcontrol_info_memory_netbsd_cpp
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-kcontrol_info_memory_netbsd_cpp,v 1.1 2001/08/20 23:42:08 espie Exp $
--- kcontrol/info/memory_netbsd.cpp.orig Mon Aug 20 23:53:47 2001
+++ kcontrol/info/memory_netbsd.cpp Mon Aug 20 23:55:14 2001
@@ -4,6 +4,9 @@
#if __NetBSD_Version__ > 103080000
#define UVM
#endif
+#if defined(__OpenBSD__)
+#define UVM
+#endif
#include <stdlib.h>
#include <unistd.h>

167
x11/kde/base2/patches/patch-kioslave_audiocd_audiocd_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-kioslave_audiocd_audiocd_cpp,v 1.2 2001/08/26 14:05:05 espie Exp $
--- kioslave/audiocd/audiocd.cpp.orig Sun Jul 29 06:56:35 2001
+++ kioslave/audiocd/audiocd.cpp Sun Aug 26 14:48:51 2001
$OpenBSD: patch-kioslave_audiocd_audiocd_cpp,v 1.3 2001/09/19 14:13:28 espie Exp $
--- kioslave/audiocd/audiocd.cpp.orig Wed Sep 5 01:16:12 2001
+++ kioslave/audiocd/audiocd.cpp Tue Sep 18 23:31:54 2001
@@ -41,8 +41,13 @@ extern "C"
/* This is in support for the Mega Hack, if cdparanoia ever is fixed, or we
@ -111,163 +111,20 @@ $OpenBSD: patch-kioslave_audiocd_audiocd_cpp,v 1.2 2001/08/26 14:05:05 espie Exp
int mp3bytes = lame_encode_finish(d->gf,(unsigned char *)mp3buffer,(int)mp3buffer_size);
if (mp3bytes < 0 ) {
@@ -1224,94 +1244,96 @@ void AudioCDProtocol::getParameters() {
@@ -1224,6 +1244,8 @@ void AudioCDProtocol::getParameters() {
#ifdef HAVE_LAME
- config->setGroup("MP3");
+ if (d->gf != NULL)
+ {
+ config->setGroup("MP3");
+ {
config->setGroup("MP3");
- int quality = config->readNumEntry("quality",2);
+ int quality = config->readNumEntry("quality",2);
- if (quality < 0 ) quality = 0;
- if (quality > 9) quality = 9;
+ if (quality < 0 ) quality = 0;
+ if (quality > 9) quality = 9;
- int method = config->readNumEntry("encmethod",0);
+ int method = config->readNumEntry("encmethod",0);
- if (method == 0) {
-
- // Constant Bitrate Encoding
- lame_set_VBR(d->gf, vbr_off);
- lame_set_brate(d->gf,config->readNumEntry("cbrbitrate",160));
- d->bitrate = lame_get_brate(d->gf);
- lame_set_quality(d->gf, quality);
+ if (method == 0) {
+
+ // Constant Bitrate Encoding
+ lame_set_VBR(d->gf, vbr_off);
+ lame_set_brate(d->gf,config->readNumEntry("cbrbitrate",160));
+ d->bitrate = lame_get_brate(d->gf);
+ lame_set_quality(d->gf, quality);
- } else {
-
- // Variable Bitrate Encoding
-
- if (config->readBoolEntry("set_vbr_avr",true)) {
+ } else {
+
+ // Variable Bitrate Encoding
+
+ if (config->readBoolEntry("set_vbr_avr",true)) {
- lame_set_VBR(d->gf,vbr_abr);
- lame_set_VBR_mean_bitrate_kbps(d->gf, config->readNumEntry("vbr_average_bitrate",0));
+ lame_set_VBR(d->gf,vbr_abr);
+ lame_set_VBR_mean_bitrate_kbps(d->gf, config->readNumEntry("vbr_average_bitrate",0));
- d->bitrate = lame_get_VBR_mean_bitrate_kbps(d->gf);
+ d->bitrate = lame_get_VBR_mean_bitrate_kbps(d->gf);
- } else {
+ } else {
- if (lame_get_VBR(d->gf) == vbr_off) lame_set_VBR(d->gf, vbr_default);
+ if (lame_get_VBR(d->gf) == vbr_off) lame_set_VBR(d->gf, vbr_default);
- if (config->readBoolEntry("set_vbr_min",true))
- lame_set_VBR_min_bitrate_kbps(d->gf, config->readNumEntry("vbr_min_bitrate",0));
- if (config->readBoolEntry("vbr_min_hard",true))
- lame_set_VBR_hard_min(d->gf, 1);
- if (config->readBoolEntry("set_vbr_max",true))
- lame_set_VBR_max_bitrate_kbps(d->gf, config->readNumEntry("vbr_max_bitrate",0));
+ if (config->readBoolEntry("set_vbr_min",true))
+ lame_set_VBR_min_bitrate_kbps(d->gf, config->readNumEntry("vbr_min_bitrate",0));
+ if (config->readBoolEntry("vbr_min_hard",true))
+ lame_set_VBR_hard_min(d->gf, 1);
+ if (config->readBoolEntry("set_vbr_max",true))
+ lame_set_VBR_max_bitrate_kbps(d->gf, config->readNumEntry("vbr_max_bitrate",0));
- d->bitrate = 128;
- lame_set_VBR_q(d->gf, quality);
-
- }
+ d->bitrate = 128;
+ lame_set_VBR_q(d->gf, quality);
+
+ }
- if ( config->readBoolEntry("write_xing_tag",true) ) lame_set_bWriteVbrTag(d->gf, 1);
+ if ( config->readBoolEntry("write_xing_tag",true) ) lame_set_bWriteVbrTag(d->gf, 1);
- }
+ }
- switch ( config->readNumEntry("mode",0) ) {
+ switch ( config->readNumEntry("mode",0) ) {
- case 0: lame_set_mode(d->gf, STEREO);
- break;
- case 1: lame_set_mode(d->gf, JOINT_STEREO);
- break;
- case 2: lame_set_mode(d->gf,DUAL_CHANNEL);
- break;
- case 3: lame_set_mode(d->gf,MONO);
- break;
- default: lame_set_mode(d->gf,STEREO);
- break;
- }
+ case 0: lame_set_mode(d->gf, STEREO);
+ break;
+ case 1: lame_set_mode(d->gf, JOINT_STEREO);
+ break;
+ case 2: lame_set_mode(d->gf,DUAL_CHANNEL);
+ break;
+ case 3: lame_set_mode(d->gf,MONO);
+ break;
+ default: lame_set_mode(d->gf,STEREO);
+ break;
+ }
- lame_set_copyright(d->gf, config->readBoolEntry("copyright",false));
- lame_set_original(d->gf, config->readBoolEntry("original",true));
- lame_set_strict_ISO(d->gf, config->readBoolEntry("iso",false));
- lame_set_error_protection(d->gf, config->readBoolEntry("crc",false));
+ lame_set_copyright(d->gf, config->readBoolEntry("copyright",false));
+ lame_set_original(d->gf, config->readBoolEntry("original",true));
+ lame_set_strict_ISO(d->gf, config->readBoolEntry("iso",false));
+ lame_set_error_protection(d->gf, config->readBoolEntry("crc",false));
- d->write_id3 = config->readBoolEntry("id3",true);
+ d->write_id3 = config->readBoolEntry("id3",true);
- if ( config->readBoolEntry("enable_lowpassfilter",false) ) {
+ if ( config->readBoolEntry("enable_lowpassfilter",false) ) {
- lame_set_lowpassfreq(d->gf, config->readNumEntry("lowpassfilter_freq",0));
+ lame_set_lowpassfreq(d->gf, config->readNumEntry("lowpassfilter_freq",0));
- if (config->readBoolEntry("set_lowpassfilter_width",false)) {
- lame_set_lowpasswidth(d->gf, config->readNumEntry("lowpassfilter_width",0));
- }
+ if (config->readBoolEntry("set_lowpassfilter_width",false)) {
+ lame_set_lowpasswidth(d->gf, config->readNumEntry("lowpassfilter_width",0));
+ }
- }
+ }
- if ( config->readBoolEntry("enable_highpassfilter",false) ) {
+ if ( config->readBoolEntry("enable_highpassfilter",false) ) {
- lame_set_highpassfreq(d->gf, config->readNumEntry("highpassfilter_freq",0));
+ lame_set_highpassfreq(d->gf, config->readNumEntry("highpassfilter_freq",0));
- if (config->readBoolEntry("set_highpassfilter_width",false)) {
- lame_set_highpasswidth(d->gf, config->readNumEntry("highpassfilter_width",0));
+ if (config->readBoolEntry("set_highpassfilter_width",false)) {
+ lame_set_highpasswidth(d->gf, config->readNumEntry("highpassfilter_width",0));
+ }
+ }
int quality = config->readNumEntry("quality",2);
@@ -1311,6 +1333,7 @@ void AudioCDProtocol::getParameters() {
lame_set_highpasswidth(d->gf, config->readNumEntry("highpassfilter_width",0));
}
-
- }
+ }
}
#endif // HAVE_LAME
#ifdef HAVE_VORBIS

55
x11/kde/base2/patches/patch-kioslave_audiocd_configure_in_in
View File

@ -1,5 +1,5 @@
--- kioslave/audiocd/configure.in.in.orig Sun Jul 29 06:56:35 2001
+++ kioslave/audiocd/configure.in.in Sat Aug 25 14:14:01 2001
--- kioslave/audiocd/configure.in.in.orig Wed Sep 5 01:16:12 2001
+++ kioslave/audiocd/configure.in.in Tue Sep 18 23:11:59 2001
@@ -38,6 +38,11 @@ if test "x$with_cdparanoia" = "xCHECK" ;
break
fi
@ -48,54 +48,3 @@
LIBS="$ac_save_LIBS"
fi
LAME_INCS=
@@ -266,7 +276,7 @@ no) AC_MSG_RESULT(no) ;;
NOTFOUND) AC_MSG_RESULT(searched but not found) ;;
*)
if test "x$with_vorbis" = "xFOUND" ; then
- msg="incs=$vorbis_libdir libs=$vorbis_incdir"
+ msg="incs=$vorbis_incdir libs=$vorbis_libdir"
else
msg="$with_vorbis"
VORBIS_ROOT="$with_vorbis"
@@ -280,8 +290,10 @@ NOTFOUND) AC_MSG_RESULT(searched but not
non_compile=no
if test "x$enable_vorbistest" = xyes ; then
ac_save_CFLAGS="$CFLAGS"
+ ac_save_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $all_includes $VORBIS_INCS"
+ CXXFLAGS="$CXXFLAGS $all_includes $VORBIS_INCS"
LIBS="$LIBS $all_libraries $VORBIS_LIBS"
rm -f conf.vorbistest
AC_TRY_RUN([
@@ -298,6 +310,7 @@ int main ()
], , non_compile=yes , [echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
# bogus return value, but it _did_ run
test -f conf.vorbistest && non_compile="no"
@@ -308,12 +321,13 @@ int main ()
AC_MSG_RESULT($msg)
AC_DEFINE_UNQUOTED(HAVE_VORBIS, 1, [Define if you have vorbis])
VORBISFILE_LIBS="-lvorbisfile"
- VORBISENC_LIBS="-lvorbisenc"
+ VORBISENC_LIBS="-lvorbisenc -lvorbis"
KCM_AUDIOCD="kcmaudiocd"
else
AC_MSG_RESULT(no (but first try gave $msg))
echo "*** Could not run Vorbis test program, checking why..."
CFLAGS="$CFLAGS $all_includes $VORBIS_INCS"
+ CXXFLAGS="$CXXFLAGS $all_includes $VORBIS_INCS"
LIBS="$LIBS $all_libraries $VORBIS_LIBS"
AC_TRY_LINK([
#include <stdio.h>
@@ -332,6 +346,7 @@ int main ()
echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
echo "*** or that you have moved Vorbis since it was installed." ])
CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
VORBIS_INCS=""
VORBIS_LIBS=""

14
x11/kde/base2/patches/patch-konsole_src_Makefile_in
View File

@ -1,16 +1,6 @@
$OpenBSD: patch-konsole_src_Makefile_in,v 1.5 2001/08/27 05:44:37 espie Exp $
$OpenBSD: patch-konsole_src_Makefile_in,v 1.6 2001/09/19 14:13:28 espie Exp $
--- konsole/src/Makefile.in.orig Mon Aug 6 03:32:12 2001
+++ konsole/src/Makefile.in Sat Aug 25 14:17:21 2001
@@ -1,7 +1,7 @@
# KDE tags expanded automatically by am_edit - $Revision: 1.5 $
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+++ konsole/src/Makefile.in Mon Aug 27 09:21:16 2001
@@ -326,6 +326,7 @@ konsole_LDFLAGS = $(all_libraries) $(KDE
konsole_grantpty_SOURCES = konsole_grantpty.c

11
x11/kde/base2/patches/patch-ksysguard_configure_in_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-ksysguard_configure_in_in,v 1.1 2001/09/19 14:13:28 espie Exp $
--- ksysguard/configure.in.in.orig Sun May 13 23:20:29 2001
+++ ksysguard/configure.in.in Tue Sep 18 23:11:59 2001
@@ -3,6 +3,7 @@ AC_MSG_CHECKING(if ksysguardd can be com
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+ *-*-openbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
*) ksysguard_compile=no; UNAME='' ;;
esac

13
x11/kde/base2/patches/patch-ksysguard_ksysguardd_FreeBSD_CPU_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_CPU_c,v 1.1 2001/09/19 14:13:28 espie Exp $
--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig Mon Sep 3 12:34:58 2001
+++ ksysguard/ksysguardd/FreeBSD/CPU.c Mon Sep 3 12:35:14 2001
@@ -25,7 +25,9 @@
#include <kvm.h>
#include <nlist.h>
+#ifndef __OpenBSD__
#include <devstat.h>
+#endif
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>

48
x11/kde/base2/patches/patch-ksysguard_ksysguardd_FreeBSD_Memory_c Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_Memory_c,v 1.1 2001/09/19 14:13:28 espie Exp $
--- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Mon Sep 3 12:35:22 2001
+++ ksysguard/ksysguardd/FreeBSD/Memory.c Mon Sep 3 12:37:47 2001
@@ -67,7 +67,13 @@ updateMemory(void)
char buf[256];
len = sizeof (Total);
+#ifdef __OpenBSD__
+ mib[0] = CTL_HW;
+ mib[1] = HW_PHYSMEM;
+ sysctl(mib, 2, &Total, &len, NULL, 0);
+#else
sysctlbyname("hw.physmem", &Total, &len, NULL, 0);
+#endif
Total /= 1024;
/* Q&D hack for swap display. Borrowed from xsysinfo-1.4 */
@@ -93,20 +99,30 @@ updateMemory(void)
len = sizeof (Buffers);
+#ifndef __OpenBSD__
if ((sysctlbyname("vfs.bufspace", &Buffers, &len, NULL, 0) == -1) || !len)
+#endif
Buffers = 0; /* Doesn't work under FreeBSD v2.2.x */
Buffers /= 1024;
len = sizeof (Cached);
+#ifndef __OpenBSD__
if ((sysctlbyname("vm.stats.vm.v_cache_count", &Cached, &len, NULL, 0) == -1) || !len)
+#endif
Cached = 0; /* Doesn't work under FreeBSD v2.2.x */
Cached *= getpagesize() / 1024;
/* initializes the pointer to the vmmeter struct */
len = sizeof (p);
+#ifdef __OpenBSD__
+ mib[0] = CTL_VM;
+ mib[1] = VM_METER;
+ sysctl(mib, 2, &p, &len, NULL, 0);
+#else
sysctlbyname("vm.vmmeter", &p, &len, NULL, 0);
+#endif
MFree = p.t_free * getpagesize() / 1024;
Used = p.t_arm * getpagesize() / 1024 + Buffers + Cached;

138
x11/kde/base2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2001/08/23 22:25:49 espie Exp $
@comment $OpenBSD: PLIST,v 1.20 2001/09/19 14:13:28 espie Exp $
bin/appletproxy
bin/chooser
bin/conttest
@ -73,6 +73,7 @@ bin/ksplash
bin/kstart
bin/kswarm.kss
bin/ksysguard
bin/ksysguardd
bin/ktip
bin/kvm.kss
bin/kwebdesktop
@ -1230,14 +1231,149 @@ share/doc/HTML/en/kcontrol/thememgr.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
share/doc/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
share/doc/HTML/en/kdeprint/PPD-options-for-infotecP450.png
share/doc/HTML/en/kdeprint/PrintQueue-KJobViewer.png
share/doc/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
share/doc/HTML/en/kdeprint/big-ppd-esppp-gui.png
share/doc/HTML/en/kdeprint/common
share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
share/doc/HTML/en/kdeprint/cups-server-configuration-2.png
share/doc/HTML/en/kdeprint/cups-server-configuration-3.png
share/doc/HTML/en/kdeprint/cups-server-configuration-4.png
share/doc/HTML/en/kdeprint/cups-server-configuration.png
share/doc/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
share/doc/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
share/doc/HTML/en/kdeprint/hi32-action-wizard.png
share/doc/HTML/en/kdeprint/iconview-printerwindow.png
share/doc/HTML/en/kdeprint/index.cache.bz2
share/doc/HTML/en/kdeprint/index.docbook
share/doc/HTML/en/kdeprint/info-tab.png
share/doc/HTML/en/kdeprint/ipp-scan-result-1.png
share/doc/HTML/en/kdeprint/kcontrol-icon.png
share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
share/doc/HTML/en/kdeprint/kcontrolcenter-printsystem.png
share/doc/HTML/en/kdeprint/kcron_to_be_printed.png
share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png
share/doc/HTML/en/kdeprint/kdeprint_printer.png
share/doc/HTML/en/kdeprint/kdeprint_printer_class.png
share/doc/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
share/doc/HTML/en/kdeprint/kdeprint_printer_remote.png
share/doc/HTML/en/kdeprint/kdeprint_printer_stopped.png
share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
share/doc/HTML/en/kdeprint/kprinter-dialog.png
share/doc/HTML/en/kdeprint/kprinter-fonts.png
share/doc/HTML/en/kdeprint/kprinter-kivio.png
share/doc/HTML/en/kdeprint/kprinter.png
share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png
share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
share/doc/HTML/en/kdeprint/printericons-meanings.png
share/doc/HTML/en/kdeprint/ps-boxes.png
share/doc/HTML/en/kdeprint/selecting-printingsystem.png
share/doc/HTML/en/kdeprint/smb-scan-result-2.png
share/doc/HTML/en/kdeprint/smb-scan-result-3.png
share/doc/HTML/en/kdeprint/steinbruch.png
share/doc/HTML/en/kdeprint/steinbruch_scaled.png
share/doc/HTML/en/kdeprint/taskbar-icons.png
share/doc/HTML/en/kdeprint/test_size_withdecoration.png
share/doc/HTML/en/kdeprint/test_size_without_decoration.png
share/doc/HTML/en/kdeprint/xpp-fonts.png
share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/index.cache.bz2
share/doc/HTML/en/kdesu/index.docbook

6
x11/kde/games2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2001/08/21 10:59:38 espie Exp $
# $OpenBSD: Makefile,v 1.15 2001/09/19 14:13:29 espie Exp $
COMMENT= games for KDE
COMMENT-cards= faces for kde card games
@ -30,7 +30,7 @@ COMMENT-lskat= card game for two players, based on Skat
CATEGORIES= x11 x11/kde games
NEED_VERSION= 1.404
VERSION= 2.2
VERSION= 2.2.1
DISTNAME= kdegames-${VERSION}
DIST_SUBDIR= kde
@ -78,6 +78,8 @@ CONFIGURE_ARGS+= --disable-debug
USE_GMAKE= Yes
CONFIGURE_ENV= MOC=${LOCALBASE}/bin/moc2 \
RUN_KAPPFINDER=no KDEDIR=${LOCALBASE}
CONFIGURE_ENV+= ac_aux_files=''
MAKE_ENV= ${CONFIGURE_ENV}
pre-build:

6
x11/kde/games2/files/md5
View File

@ -1,3 +1,3 @@
MD5 (kde/kdegames-2.2.tar.bz2) = 82d711796217e24fa0a0da52550bdadf
RMD160 (kde/kdegames-2.2.tar.bz2) = 4fce13840fd04e69ed8f1883704e539464718ef6
SHA1 (kde/kdegames-2.2.tar.bz2) = 33bf30ebb7a9620c785a2ada82e04f00c385dae8
MD5 (kde/kdegames-2.2.1.tar.bz2) = ddfb22843331f548bac51dc6a167958f
RMD160 (kde/kdegames-2.2.1.tar.bz2) = da57b92b83175a9aa0bbcbd6eda356057ceee788
SHA1 (kde/kdegames-2.2.1.tar.bz2) = b78f91cccc31c10b81f54e7538c0d13d7c8a33ed

2
x11/kde/games2/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/08/20 23:44:17 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2001/09/19 14:13:29 espie Exp $
lib/libkbackgammon.so.0.0
lib/libkdegames.so.1.1
DYNLIBDIR(%D/lib)

3
x11/kde/games2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2001/08/20 23:44:17 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2001/09/19 14:13:29 espie Exp $
bin/kabalone
bin/kasteroids
bin/katomic
@ -877,6 +877,7 @@ share/apps/katomic/levels/.cvsignore
share/apps/katomic/levels/CVS/Entries
share/apps/katomic/levels/CVS/Repository
share/apps/katomic/levels/CVS/Root
share/apps/katomic/levels/CVS/Tag
share/apps/katomic/levels/level_1
share/apps/katomic/levels/level_10
share/apps/katomic/levels/level_11

6
x11/kde/graphics2/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2001/08/27 13:35:06 espie Exp $
# $OpenBSD: Makefile,v 1.9 2001/09/19 14:13:28 espie Exp $
COMMENT= "X11 toolkit, graphics applications"
CATEGORIES= x11 x11/kde
NEED_VERSION= 1.447
VERSION= 2.2
VERSION= 2.2.1
DISTNAME= kdegraphics-${VERSION}
DIST_SUBDIR= kde
@ -34,6 +34,8 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
USE_GMAKE= Yes
CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE}
CONFIGURE_ENV+= ac_aux_files=''
MAKE_ENV= ${CONFIGURE_ENV}
pre-build:

6
x11/kde/graphics2/files/md5
View File

@ -1,3 +1,3 @@
MD5 (kde/kdegraphics-2.2.tar.bz2) = 32125d00243c884017daa4345b87e2fe
RMD160 (kde/kdegraphics-2.2.tar.bz2) = 3748da514bdfc997f3e96816ad0da1f4ff3a8a5a
SHA1 (kde/kdegraphics-2.2.tar.bz2) = 2c584a959f6d581c7fe7f51f518c3ab51c20397d
MD5 (kde/kdegraphics-2.2.1.tar.bz2) = a2d0b9242f20264167f8b96a8ba3a5c7
RMD160 (kde/kdegraphics-2.2.1.tar.bz2) = e1b76572bde02ea098fda6fb6bbc3fc78b886d5b
SHA1 (kde/kdegraphics-2.2.1.tar.bz2) = d52ec093915707b127f819cef0cad94d77e3119a

2
x11/kde/graphics2/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/08/21 16:33:18 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2001/09/19 14:13:28 espie Exp $
lib/libkcolorchooser.so.0.0
lib/libkdvi.so.0.0
lib/libkfax.so.0.0

2
x11/kde/graphics2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2001/08/21 16:33:18 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2001/09/19 14:13:28 espie Exp $
bin/kcolorchooser
bin/kcoloredit
bin/kdvi

8
x11/kde/libs2/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2001/08/27 09:58:35 espie Exp $
# $OpenBSD: Makefile,v 1.24 2001/09/19 14:13:28 espie Exp $
COMMENT= "X11 toolkit, libraries"
CATEGORIES= x11 x11/kde
NEED_VERSION= 1.447
VERSION= 2.2
VERSION= 2.2.1
DISTNAME= kdelibs-${VERSION}
DIST_SUBDIR= kde
@ -49,6 +49,10 @@ 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:

6
x11/kde/libs2/files/md5
View File

@ -1,3 +1,3 @@
MD5 (kde/kdelibs-2.2.tar.bz2) = 2aca0c00143f4f7bc1ee7afdbe892912
RMD160 (kde/kdelibs-2.2.tar.bz2) = c35e6a1fcfe62143fe3eb00c01919f896f24fa8a
SHA1 (kde/kdelibs-2.2.tar.bz2) = 3eb526a4085bbe00ddfeefd0fb1d4f2c13640222
MD5 (kde/kdelibs-2.2.1.tar.bz2) = 3aa73b3fe7095b3bab3081bece73f56f
RMD160 (kde/kdelibs-2.2.1.tar.bz2) = f1ded625472e1c3afe607aee063af4cccb47d0d9
SHA1 (kde/kdelibs-2.2.1.tar.bz2) = 6f5359905ba1f6c0785972da92c0113485ddee62

12
x11/kde/libs2/patches/patch-kdecore_netsupp_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kdecore_netsupp_cpp,v 1.1 2001/08/20 23:40:18 espie Exp $
--- kdecore/netsupp.cpp.orig Tue Aug 21 00:29:54 2001
+++ kdecore/netsupp.cpp Tue Aug 21 00:30:59 2001
@@ -781,7 +781,7 @@ int getaddrinfo(const char *name, const
if (name != NULL && ((*name == '*' && name[1] == '\0') || *name == '\0'))
name = NULL;
// Treat service of "*" as NULL, which I guess means no port (0)
- if (serv != NULL && (*serv == '*' && serv[1] == '\0') || *serv == '\0')
+ if (serv != NULL && ((*serv == '*' && serv[1] == '\0') || *serv == '\0'))
serv = NULL;
if (name == NULL && serv == NULL) // what the hell do you want?

99
x11/kde/libs2/patches/patch-kssl_kopenssl_cc
View File

@ -1,99 +0,0 @@
$OpenBSD: patch-kssl_kopenssl_cc,v 1.2 2001/08/21 14:20:08 espie Exp $
--- kssl/kopenssl.cc.orig Sun Jul 29 06:55:41 2001
+++ kssl/kopenssl.cc Tue Aug 21 16:11:26 2001
@@ -117,6 +117,51 @@ void KOpenSSLProxy::destroy() {
_me = NULL;
}
+#ifdef __OpenBSD__
+#include <qdir.h>
+#include <qstring.h>
+#include <qstringlist.h>
+
+static QString findMostRecentLib(QString dir, QString name)
+{
+ // Grab all shared libraries in the directory
+ QString filter = "lib"+name+".so.*";
+ QDir d(dir, filter);
+ if (!d.exists())
+ return NULL;
+ QStringList l = d.entryList();
+
+ // Find the best one
+ int bestmaj = -1;
+ int bestmin = -1;
+ QString best = NULL;
+ // where do we start
+ uint s = filter.length()-1;
+ for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+ QString numberpart = (*it).mid(s);
+ uint endmaj = numberpart.find('.');
+ if (endmaj == -1)
+ continue;
+ bool ok;
+ int maj = numberpart.left(endmaj).toInt(&ok);
+ if (!ok)
+ continue;
+ int min = numberpart.mid(endmaj+1).toInt(&ok);
+ if (!ok)
+ continue;
+ if (maj > bestmaj || (maj == bestmaj && min > bestmin)) {
+ bestmaj = maj;
+ bestmin = min;
+ best = (*it);
+ }
+ }
+ if (best.isNull())
+ return NULL;
+ else
+ return dir+"/"+best;
+}
+#endif
+
KOpenSSLProxy::KOpenSSLProxy() {
KLibLoader *ll = KLibLoader::self();
@@ -135,6 +180,13 @@ KConfig *cfg;
delete cfg;
+#ifdef __OpenBSD__
+ {
+ QString libname = findMostRecentLib("/usr/lib", "crypto");
+ if (!libname.isNull())
+ _cryptoLib = ll->globalLibrary(libname.latin1());
+ }
+#else
libpaths << "/usr/lib/"
<< "/usr/local/lib/"
<< "/usr/local/openssl/lib/"
@@ -163,6 +215,7 @@ KConfig *cfg;
}
if (_cryptoLib) break;
}
+#endif
if (_cryptoLib) {
#ifdef HAVE_SSL
@@ -210,6 +263,13 @@ KConfig *cfg;
#endif
}
+#ifdef __OpenBSD__
+ {
+ QString libname = findMostRecentLib("/usr/lib", "ssl");
+ if (!libname.isNull())
+ _sslLib = ll->globalLibrary(libname.latin1());
+ }
+#else
for (QStringList::Iterator it = libpaths.begin();
it != libpaths.end();
++it) {
@@ -222,6 +282,7 @@ KConfig *cfg;
}
if (_sslLib) break;
}
+#endif
if (_sslLib) {
#ifdef HAVE_SSL

3
x11/kde/libs2/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2001/08/22 19:56:32 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.8 2001/09/19 14:13:28 espie Exp $
lib/kde2/libkbzip2filter.so.0.0
lib/kde2/libkded_kdeprintd.so.0.0
lib/kde2/libkdeprint_ext.so.0.0
@ -22,6 +22,7 @@ lib/libDCOP.so.1.0
lib/libartsc.so.0.0
lib/libartscbackend.so.0.0
lib/libartsdsp.so.0.0
lib/libartsdsp_st.so.0.0
lib/libartsflow.so.0.0
lib/libartsflow_idl.so.0.0
lib/libartskde.so.0.0

22
x11/kde/libs2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2001/08/22 19:56:32 espie Exp $
@comment $OpenBSD: PLIST,v 1.10 2001/09/19 14:13:28 espie Exp $
bin/artsc-config
bin/artscat
bin/artsd
@ -510,6 +510,7 @@ lib/libDCOP.la
lib/libartsc.la
lib/libartscbackend.la
lib/libartsdsp.la
lib/libartsdsp_st.la
lib/libartsflow.la
lib/libartsflow_idl.la
lib/libartskde.la
@ -1373,20 +1374,6 @@ share/config/kdebugrc
share/config/kdeprintrc
share/config/ui/kprintpreviewui.rc
share/config/ui/ui_standards.rc
share/doc/HTML/en/api/README
share/doc/HTML/en/api/common
share/doc/HTML/en/api/configure.in.in
share/doc/HTML/en/api/index.cache.bz2
share/doc/HTML/en/api/index.docbook
share/doc/HTML/en/api/install-dep.entities
share/doc/HTML/en/api/install-dep.entities.in
share/doc/HTML/en/api/kcolordialog.png
share/doc/HTML/en/api/kdatepicker.png
share/doc/HTML/en/api/kedittoolbar.png
share/doc/HTML/en/api/kfiledialog.png
share/doc/HTML/en/api/kfontdialog.png
share/doc/HTML/en/api/kkeydialog.png
share/doc/HTML/en/api/kpixmapio-perf.png
share/doc/HTML/en/common/1.png
share/doc/HTML/en/common/10.png
share/doc/HTML/en/common/2.png
@ -1430,9 +1417,6 @@ share/doc/HTML/en/common/up.png
share/doc/HTML/en/common/warning.png
share/doc/HTML/en/common/x11-license.html
share/doc/HTML/en/common/xml.dcl
share/doc/HTML/en/kspell/common
share/doc/HTML/en/kspell/index.cache.bz2
share/doc/HTML/en/kspell/index.docbook
share/icons/hicolor/16x16/actions/1downarrow.png
share/icons/hicolor/16x16/actions/1leftarrow.png
share/icons/hicolor/16x16/actions/1rightarrow.png
@ -2548,9 +2532,7 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/icons/hicolor/16x16
@dirrm share/icons/hicolor
@dirrm share/icons
@dirrm share/doc/HTML/en/kspell
@dirrm share/doc/HTML/en/common
@dirrm share/doc/HTML/en/api
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML
@dirrm share/config/ui

5
x11/kde/toys2/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2001/08/27 12:48:43 espie Exp $
# $OpenBSD: Makefile,v 1.10 2001/09/19 14:13:29 espie Exp $
COMMENT= "some useless kde applications"
CATEGORIES= x11 x11/kde games
NEED_VERSION= 1.447
VERSION= 2.2
VERSION= 2.2.1
DISTNAME= kdetoys-${VERSION}
DIST_SUBDIR= kde
@ -29,6 +29,7 @@ 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

6
x11/kde/toys2/files/md5
View File

@ -1,3 +1,3 @@
MD5 (kde/kdetoys-2.2.tar.bz2) = 64e575acaf9f6ae8da00d85744beffc6
RMD160 (kde/kdetoys-2.2.tar.bz2) = 0a702acaf39a7371a7507af5fcf8cf1e511c97f0
SHA1 (kde/kdetoys-2.2.tar.bz2) = cf3953542198422589d38215c56e29305a8906a4
MD5 (kde/kdetoys-2.2.1.tar.bz2) = a106df7cbd681d2ef06185ee633d9de6
RMD160 (kde/kdetoys-2.2.1.tar.bz2) = a99d254e3c32ddda09d55a1b00435f7c1e066518
SHA1 (kde/kdetoys-2.2.1.tar.bz2) = be1476c8375cecd58c49d60915bdd23ab0ce9768

60
x11/kde/toys2/patches/patch-amor_data_bsdrc
View File

@ -1,12 +1,60 @@
$OpenBSD: patch-amor_data_bsdrc,v 1.1 2001/08/21 14:10:10 espie Exp $
--- amor/data/bsdrc.orig Tue Aug 21 16:02:04 2001
+++ amor/data/bsdrc Tue Aug 21 16:02:09 2001
@@ -2,7 +2,7 @@
$OpenBSD: patch-amor_data_bsdrc,v 1.2 2001/09/19 14:13:29 espie Exp $
--- amor/data/bsdrc.orig Wed Sep 5 01:29:07 2001
+++ amor/data/bsdrc Wed Sep 19 14:16:12 2001
@@ -2,31 +2,31 @@
[Config]
PixmapPath=static
Static=true
-Description=BSD Mascot
-Description[cs]=Maskot BSD
-Description[da]=BSD Maskot
-Description[de]=BSD-Maskottchen
-Description[es]=Mascota de BSD
-Description[fi]=BSD maskotti
-Description[fr]=Mascotte BSD
-Description[he]=BSD עימק
-Description[hu]=BSD kabalafigura
-Description[is]=BSD dýrið
-Description[it]=Mascot BSD
-Description[ja]=BSD マスコット
-Description[lt]=BSD talismanas
-Description[lv]=BSD Talismans
-Description[nl]=BSD Mascotte
-Description[no]=BSD Maskott
-Description[no_NY]=BSD-maskot
-Description[pt_BR]=Mascote do BSD
-Description[pt]=Mascote do BSD
-Description[ru]=BSD-шник
-Description[sk]=Maskot BSD
-Description[sl]=Maskota BSD
-Description[sr]=BSD Maskota
-Description[sv]=BSD-maskot
-Description[xh]=Umntu/into ekukholelwa ukuba izisa intlahla ye BSD
+Description=FreeBSD Mascot
+Description[cs]=Maskot FreeBSD
+Description[da]=FreeBSD Maskot
+Description[de]=FreeBSD-Maskottchen
+Description[es]=Mascota de FreeBSD
+Description[fi]=FreeBSD maskotti
+Description[fr]=Mascotte FreeBSD
+Description[he]=FreeBSD עימק
+Description[hu]=FreeBSD kabalafigura
+Description[is]=FreeBSD dýrið
+Description[it]=Mascot FreeBSD
+Description[ja]=FreeBSD マスコット
+Description[lt]=FreeBSD talismanas
+Description[lv]=FreeBSD Talismans
+Description[nl]=FreeBSD Mascotte
+Description[no]=FreeBSD Maskott
+Description[no_NY]=FreeBSD-maskot
+Description[pt_BR]=Mascote do FreeBSD
+Description[pt]=Mascote do FreeBSD
+Description[ru]=FreeBSD-шник
+Description[sk]=Maskot FreeBSD
+Description[sl]=Maskota FreeBSD
+Description[sr]=FreeBSD Maskota
+Description[sv]=FreeBSD-maskot
+Description[xh]=Umntu/into ekukholelwa ukuba izisa intlahla ye FreeBSD
About=Static window sitter
Icon=bsd.png
About[cs]=Statická ozdoba okna
About[da]=Statisk vinduespasser

2
x11/kde/toys2/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2001/08/20 23:48:48 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2001/09/19 14:13:29 espie Exp $
lib/libkeyesapplet.so.1.0
lib/libkfifteenapplet.so.1.0
lib/libkscoreapplet.so.1.0

2
x11/kde/toys2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2001/08/20 23:48:48 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2001/09/19 14:13:29 espie Exp $
bin/amor
bin/kmoon
bin/kodo