diff --git a/x11/kde/addons3/Makefile b/x11/kde/addons3/Makefile index 6d1bd58e27f..e0f69a842af 100644 --- a/x11/kde/addons3/Makefile +++ b/x11/kde/addons3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.13 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2002/12/23 14:22:32 espie Exp $ COMMENT= "X11 toolkit, addons" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdeaddons-${VERSION} LIB_DEPENDS= kdecore.4,DCOP,artskde,kdeui,khtml,kio,kparts::x11/kde/libs3 \ diff --git a/x11/kde/addons3/distinfo b/x11/kde/addons3/distinfo index 652ad28ef03..4b510b9578a 100644 --- a/x11/kde/addons3/distinfo +++ b/x11/kde/addons3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdeaddons-3.0.5.tar.bz2) = e1d74a758921cf44b6f60874ecea2e33 -RMD160 (kde/kdeaddons-3.0.5.tar.bz2) = fd35eda08a87c740435aaeb5dd914d642820e535 -SHA1 (kde/kdeaddons-3.0.5.tar.bz2) = 25a3bb39a3d38ed378b457d9360920ce8c170df4 +MD5 (kde/kdeaddons-3.0.5a.tar.bz2) = bdda94e132c9bf035856108a06737a45 +RMD160 (kde/kdeaddons-3.0.5a.tar.bz2) = b78bb8641a0b1c7c2e988e631f679371bae9de39 +SHA1 (kde/kdeaddons-3.0.5a.tar.bz2) = 9d9f8d72cb2918298232b113bac7f6e28cd0b391 diff --git a/x11/kde/arts3/Makefile b/x11/kde/arts3/Makefile index 51797facbd2..50b7bcd0dfa 100644 --- a/x11/kde/arts3/Makefile +++ b/x11/kde/arts3/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.15 2002/12/03 13:58:19 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2002/12/23 14:22:32 espie Exp $ COMMENT= "X11 toolkit, multimedia hub" COMMENT-gmcop= "glib support for mcop" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 -DISTNAME= arts-1.0.5 +VERSION= 3.0.5a +DISTNAME= arts-1.0.5a NOT_FOR_ARCHS= LIB_DEPENDS= audiofile::devel/libaudiofile @@ -17,6 +17,7 @@ FLAVOR?= CONFIGURE_ENV+=ac_cv_path_PKG_CONFIG=no .else MULTI_PACKAGES=-gmcop +PKGNAME-gmcop= arts-gmcop-1.0.5a BUILD_DEPENDS=::devel/glib2 .endif diff --git a/x11/kde/arts3/distinfo b/x11/kde/arts3/distinfo index 73cc2b819a7..2b5208dec74 100644 --- a/x11/kde/arts3/distinfo +++ b/x11/kde/arts3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/arts-1.0.5.tar.bz2) = 6d8292e33d51a626642ea01557e88e06 -RMD160 (kde/arts-1.0.5.tar.bz2) = 6b79166165858085c663f23ec70231b2c1aaa60c -SHA1 (kde/arts-1.0.5.tar.bz2) = 7237ec4a6685db77d0900f081a1a5bb73eb07fc0 +MD5 (kde/arts-1.0.5a.tar.bz2) = 0ad59b514e63abac237d833229e371f0 +RMD160 (kde/arts-1.0.5a.tar.bz2) = b0bb301ad390aaedc625289e0d7cdc52c7632ab2 +SHA1 (kde/arts-1.0.5a.tar.bz2) = 93e884e4b657b7a61bae51d4ffd30b1050ae2943 diff --git a/x11/kde/arts3/patches/p-aclocal_m4 b/x11/kde/arts3/patches/p-aclocal_m4 index 5ac5162c79b..0611b333161 100644 --- a/x11/kde/arts3/patches/p-aclocal_m4 +++ b/x11/kde/arts3/patches/p-aclocal_m4 @@ -1,7 +1,7 @@ -$OpenBSD: p-aclocal_m4,v 1.3 2002/05/23 14:37:21 espie Exp $ ---- aclocal.m4.orig Tue May 14 02:33:09 2002 -+++ aclocal.m4 Thu May 16 18:36:21 2002 -@@ -6075,8 +6075,8 @@ nto-qnx) +$OpenBSD: p-aclocal_m4,v 1.4 2002/12/23 14:22:32 espie Exp $ +--- aclocal.m4.orig Sat Dec 21 08:07:21 2002 ++++ aclocal.m4 Sun Dec 22 13:52:17 2002 +@@ -6173,8 +6173,8 @@ nto-qnx) openbsd*) version_type=sunos @@ -12,7 +12,7 @@ $OpenBSD: p-aclocal_m4,v 1.3 2002/05/23 14:37:21 espie Exp $ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH -@@ -6749,6 +6749,7 @@ openbsd*) +@@ -6847,6 +6847,7 @@ openbsd*) else lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' fi @@ -20,7 +20,7 @@ $OpenBSD: p-aclocal_m4,v 1.3 2002/05/23 14:37:21 espie Exp $ ;; osf3* | osf4* | osf5*) -@@ -7502,6 +7503,16 @@ case $host_os in +@@ -7600,6 +7601,16 @@ case $host_os in netbsd*) # NetBSD uses g++ - do we need to do anything? ;; @@ -37,7 +37,7 @@ $OpenBSD: p-aclocal_m4,v 1.3 2002/05/23 14:37:21 espie Exp $ osf3*) case $cc_basename in KCC) -@@ -7816,15 +7827,24 @@ if AC_TRY_EVAL(ac_compile); then +@@ -7914,15 +7925,24 @@ if AC_TRY_EVAL(ac_compile); then else _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" fi @@ -64,7 +64,7 @@ $OpenBSD: p-aclocal_m4,v 1.3 2002/05/23 14:37:21 espie Exp $ fi fi ;; -@@ -9614,22 +9634,9 @@ EOF +@@ -9712,22 +9732,9 @@ EOF _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -90,7 +90,7 @@ $OpenBSD: p-aclocal_m4,v 1.3 2002/05/23 14:37:21 espie Exp $ ;; os2*) -@@ -9638,6 +9645,7 @@ EOF +@@ -9736,6 +9743,7 @@ EOF _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' diff --git a/x11/kde/artwork3/Makefile b/x11/kde/artwork3/Makefile index 7026c8a677e..8cb58db00f3 100644 --- a/x11/kde/artwork3/Makefile +++ b/x11/kde/artwork3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.12 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2002/12/23 14:22:32 espie Exp $ COMMENT= "X11 toolkit, additional artwork" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdeartwork-${VERSION} LIB_DEPENDS=kdecore.4,DCOP,kdefx,kdesu,kdeui,kio,kscreensaver::x11/kde/libs3 \ diff --git a/x11/kde/artwork3/distinfo b/x11/kde/artwork3/distinfo index 0c7a6f34328..0b214f11bc3 100644 --- a/x11/kde/artwork3/distinfo +++ b/x11/kde/artwork3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdeartwork-3.0.5.tar.bz2) = 0c48cbd9e8c0f3b6b4b83aa738be175a -RMD160 (kde/kdeartwork-3.0.5.tar.bz2) = a4cebd90714e12d96646f065688749ff1f25b0b4 -SHA1 (kde/kdeartwork-3.0.5.tar.bz2) = 95214d4167120235e656e45c965a7659ed01dd9e +MD5 (kde/kdeartwork-3.0.5a.tar.bz2) = 15f1bee3d6d258615a275fa609a549f5 +RMD160 (kde/kdeartwork-3.0.5a.tar.bz2) = 9fcda355ade01922e6c0ae676379c10fe5fdf6e7 +SHA1 (kde/kdeartwork-3.0.5a.tar.bz2) = decc46a3c2be6ab564cc6dee2e3f1aea19655df9 diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile index cb75043e5b1..a0667c9505b 100644 --- a/x11/kde/base3/Makefile +++ b/x11/kde/base3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.12 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2002/12/23 14:22:32 espie Exp $ COMMENT= "X11 toolkit, basic applications" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdebase-${VERSION} LIB_DEPENDS= kdecore.4,DCOP,artskde,kabc,katepartinterfaces,kdefakes,kdefx,kdeprint,kdeprint_management,kdesasl,kdesu,kdeui,khtml,kio,kjava,kmid,kparts,kscreensaver,kscript,kspell,ktexteditor,vcard::x11/kde/libs3 \ diff --git a/x11/kde/base3/distinfo b/x11/kde/base3/distinfo index cba4aaa0d5c..48648753241 100644 --- a/x11/kde/base3/distinfo +++ b/x11/kde/base3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdebase-3.0.5.tar.bz2) = e50369b20f8955e757eeda0a521a14f5 -RMD160 (kde/kdebase-3.0.5.tar.bz2) = a91b24c6f3b201ca0bf7504c03002d9cb4a701de -SHA1 (kde/kdebase-3.0.5.tar.bz2) = 3dac0d1980958afe936e5a7995707219fc353086 +MD5 (kde/kdebase-3.0.5a.tar.bz2) = 16c53e754e866f112797f695ba84c3a4 +RMD160 (kde/kdebase-3.0.5a.tar.bz2) = 4b8e47da2c33882dcea860f81cf0091a3c5bde28 +SHA1 (kde/kdebase-3.0.5a.tar.bz2) = 8d30538e4d84f805bffcd0eb6583f2fee5ce2da1 diff --git a/x11/kde/base3/patches/patch-konsole_konsole_konsole_cpp b/x11/kde/base3/patches/patch-konsole_konsole_konsole_cpp deleted file mode 100644 index 99321c675bb..00000000000 --- a/x11/kde/base3/patches/patch-konsole_konsole_konsole_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-konsole_konsole_konsole_cpp,v 1.1 2002/12/02 23:13:22 espie Exp $ ---- konsole/konsole/konsole.cpp.orig Mon Dec 2 23:56:15 2002 -+++ konsole/konsole/konsole.cpp Tue Dec 3 00:05:03 2002 -@@ -357,7 +357,7 @@ void Konsole::makeGUI() - // Remove the empty separator Qt inserts if the menu is empty on popup, - // not sure if this will be "fixed" in Qt, for now use this hack (malte) - if(!(isRestored)) { -- if (sender()->inherits("QPopupMenu") && -+ if (sender() && sender()->inherits("QPopupMenu") && - static_cast(sender())->count() == 1) - const_cast(static_cast(sender()))->removeItemAt(0); - } diff --git a/x11/kde/edu3/Makefile b/x11/kde/edu3/Makefile index 902fcfacfc7..85bf5d88e6d 100644 --- a/x11/kde/edu3/Makefile +++ b/x11/kde/edu3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.11 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2002/12/23 14:22:32 espie Exp $ COMMENT= "X11 toolkit, edutainment" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdeedu-${VERSION} LIB_DEPENDS= kdecore.4,DCOP,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kparts::x11/kde/libs3 diff --git a/x11/kde/edu3/distinfo b/x11/kde/edu3/distinfo index e3dbed23540..a3eb942b7bb 100644 --- a/x11/kde/edu3/distinfo +++ b/x11/kde/edu3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdeedu-3.0.5.tar.bz2) = 6357bfb0c9ebf5502db1e7f4ecf3996d -RMD160 (kde/kdeedu-3.0.5.tar.bz2) = 54b43fb3b0ab46c3b90958da7a1af6b547ec7a69 -SHA1 (kde/kdeedu-3.0.5.tar.bz2) = 053bff5cb06ae760d999abd6bb1856bbfa8bcb2f +MD5 (kde/kdeedu-3.0.5a.tar.bz2) = 005d5c3d6098e5593fdadabf94c7718a +RMD160 (kde/kdeedu-3.0.5a.tar.bz2) = 2b85cf375984735748d9a597fc71517b8f435e7a +SHA1 (kde/kdeedu-3.0.5a.tar.bz2) = a2f8ab56b0590d11cf0d33a749f2d5a539af5a59 diff --git a/x11/kde/games3/Makefile b/x11/kde/games3/Makefile index 6b0e56d36ab..27c98081fdc 100644 --- a/x11/kde/games3/Makefile +++ b/x11/kde/games3/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2002/12/23 14:22:32 espie Exp $ COMMENT= games for KDE CATEGORIES= x11 x11/kde games -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdegames-${VERSION} LIB_DEPENDS= kdecore.4,DCOP,kdefx,kdeprint,kdesu,kdeui,kio,kparts::x11/kde/libs3 diff --git a/x11/kde/games3/distinfo b/x11/kde/games3/distinfo index 19570c797cf..1c4dc1865de 100644 --- a/x11/kde/games3/distinfo +++ b/x11/kde/games3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdegames-3.0.5.tar.bz2) = 7abec549c8d9506f2956714ff50cfc72 -RMD160 (kde/kdegames-3.0.5.tar.bz2) = 26c62ab16213da5b7ab11e9746137f63208bf349 -SHA1 (kde/kdegames-3.0.5.tar.bz2) = 49bd872167501664778872f4db6415659cc81e10 +MD5 (kde/kdegames-3.0.5a.tar.bz2) = 11b1b5b0634b793f95ac6afe44e32cc0 +RMD160 (kde/kdegames-3.0.5a.tar.bz2) = b10d04f089033659146a97be43a6d6539a744402 +SHA1 (kde/kdegames-3.0.5a.tar.bz2) = 340253ebfe393f3f1e4d8d70f2b536837471820f diff --git a/x11/kde/graphics3/Makefile b/x11/kde/graphics3/Makefile index 460cddcaebf..2e800321c13 100644 --- a/x11/kde/graphics3/Makefile +++ b/x11/kde/graphics3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.14 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2002/12/23 14:22:32 espie Exp $ COMMENT= "X11 toolkit, graphic applications" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdegraphics-${VERSION} LIB_DEPENDS=Imlib::graphics/imlib \ diff --git a/x11/kde/graphics3/distinfo b/x11/kde/graphics3/distinfo index 0f0799f8f2f..c222dbf4051 100644 --- a/x11/kde/graphics3/distinfo +++ b/x11/kde/graphics3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdegraphics-3.0.5.tar.bz2) = bba2ef4cf44d355c3eb93c876f1b7faf -RMD160 (kde/kdegraphics-3.0.5.tar.bz2) = 0e73d7054795758d64df6c69b938e97d54fd1aca -SHA1 (kde/kdegraphics-3.0.5.tar.bz2) = cc735c1cdc7ffd3d1a77fdd8637b8353c71b3a99 +MD5 (kde/kdegraphics-3.0.5a.tar.bz2) = cba91964c5fcebfbe1942b58d2b1d059 +RMD160 (kde/kdegraphics-3.0.5a.tar.bz2) = 88e434d42ff3e69131ed1cdd42598ee8c845d4d6 +SHA1 (kde/kdegraphics-3.0.5a.tar.bz2) = 2288b4ee8ce80ef8103baa3783749655fd9e19a5 diff --git a/x11/kde/libs3-doc/Makefile b/x11/kde/libs3-doc/Makefile index d1a7f0aef31..1930b0e630b 100644 --- a/x11/kde/libs3-doc/Makefile +++ b/x11/kde/libs3-doc/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.9 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2002/12/23 14:22:32 espie Exp $ COMMENT= "X11 toolkit, libraries documentation" CATEGORIES= x11 x11/kde devel -VERSION= 3.0.5 +VERSION= 3.0.5a PKGNAME= kdelibs-doc-${VERSION} DISTFILES= diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile index aa6095bcbaa..7ee604eff43 100644 --- a/x11/kde/libs3/Makefile +++ b/x11/kde/libs3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.19 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2002/12/23 14:22:32 espie Exp $ COMMENT= "X11 toolkit, libraries" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdelibs-${VERSION} #PKGNAME= ${DISTNAME}p1 diff --git a/x11/kde/libs3/distinfo b/x11/kde/libs3/distinfo index e78995486d1..df224ec9554 100644 --- a/x11/kde/libs3/distinfo +++ b/x11/kde/libs3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdelibs-3.0.5.tar.bz2) = ff22bd58b91ac34e476c308d345421aa -RMD160 (kde/kdelibs-3.0.5.tar.bz2) = 24ae55145e33ce8cd17fc826fd7394c9f1ca3b6c -SHA1 (kde/kdelibs-3.0.5.tar.bz2) = fe858e947f7e44caaba3123267cf093ec7528f75 +MD5 (kde/kdelibs-3.0.5a.tar.bz2) = a3c714c7727ddc70e7c9ea6acf5e42dc +RMD160 (kde/kdelibs-3.0.5a.tar.bz2) = 288676a7f9b318936d6546ce1d5f313bb7eade6e +SHA1 (kde/kdelibs-3.0.5a.tar.bz2) = 2ebc2927eb724bcf570a781fcfb8f988bc2681ad diff --git a/x11/kde/multimedia3/Makefile b/x11/kde/multimedia3/Makefile index 83139771b63..92751bccf27 100644 --- a/x11/kde/multimedia3/Makefile +++ b/x11/kde/multimedia3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2002/12/23 14:22:32 espie Exp $ COMMENT= "X11 toolkit, multimedia applications" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdemultimedia-${VERSION} LIB_DEPENDS= DCOP,kdefx,kdesu,kdeui,kio,kmid,kparts,kdecore.4::x11/kde/libs3 \ diff --git a/x11/kde/multimedia3/distinfo b/x11/kde/multimedia3/distinfo index 0263045eb1f..356bf88d924 100644 --- a/x11/kde/multimedia3/distinfo +++ b/x11/kde/multimedia3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdemultimedia-3.0.5.tar.bz2) = 07c32b5348eee503152b227b1a33342f -RMD160 (kde/kdemultimedia-3.0.5.tar.bz2) = ddae590b35ccc71bde486994129faee4d0c4e6e0 -SHA1 (kde/kdemultimedia-3.0.5.tar.bz2) = 6151baddeb55fb03eddfcce0a22d459ff136d78a +MD5 (kde/kdemultimedia-3.0.5a.tar.bz2) = 641d30ecca821afc74ba47e7276b654a +RMD160 (kde/kdemultimedia-3.0.5a.tar.bz2) = 601e7b12033e7898b6054a1c8ab7249bd9a38308 +SHA1 (kde/kdemultimedia-3.0.5a.tar.bz2) = c6e9a02b318281e2a1c10210fda8150674f641c9 diff --git a/x11/kde/multimedia3/patches/patch-configure_in b/x11/kde/multimedia3/patches/patch-configure_in index 0c7a89add70..fc98d37bd48 100644 --- a/x11/kde/multimedia3/patches/patch-configure_in +++ b/x11/kde/multimedia3/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.4 2002/08/07 17:09:05 brad Exp $ ---- configure.in.orig Mon Jun 24 12:58:24 2002 -+++ configure.in Mon Aug 5 16:18:26 2002 -@@ -1070,7 +1070,7 @@ dnl else +$OpenBSD: patch-configure_in,v 1.5 2002/12/23 14:22:32 espie Exp $ +--- configure.in.orig Sat Dec 21 08:07:20 2002 ++++ configure.in Sun Dec 22 13:52:17 2002 +@@ -1075,7 +1075,7 @@ dnl else dnl lib_xaw_opt=-lXaw dnl fi EXTRATDEFS="$EXTRATDEFS -DIA_XAW" @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/08/07 17:09:05 brad Exp $ dnl if test "x$have_xext" = xyes; then dnl a_so_libs="-lXext -lX11" dnl else -@@ -1223,7 +1223,7 @@ dnl this does not work, but to have no e +@@ -1229,7 +1229,7 @@ dnl this does not work, but to have no e dnl Checks for header files. AC_CHECK_HEADERS(pthread.h pthread/mit/pthread.h) @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/08/07 17:09:05 brad Exp $ AC_C_BIGENDIAN -@@ -1401,8 +1401,13 @@ AC_MSG_RESULT($OS_TYPE) +@@ -1407,8 +1407,13 @@ AC_MSG_RESULT($OS_TYPE) case "$ARCH_TYPE" in i?86) @@ -35,7 +35,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/08/07 17:09:05 brad Exp $ ;; *) -@@ -1417,6 +1422,9 @@ case "$OS_TYPE" in +@@ -1423,6 +1428,9 @@ case "$OS_TYPE" in FreeBSD) kde_mpeglib_compiles=yes ;; @@ -45,7 +45,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/08/07 17:09:05 brad Exp $ Linux) kde_mpeglib_compiles=yes ;; -@@ -1446,6 +1454,12 @@ case "$OS_TYPE" in +@@ -1452,6 +1460,12 @@ case "$OS_TYPE" in AC_DEFINE(OS_Linux,1,[Define if you have linux pthread]) ;; @@ -58,7 +58,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/08/07 17:09:05 brad Exp $ FreeBSD) OS_TYPE="BSD" AC_CHECK_LIB(c_r, pthread_create, [LIBPTHREAD="-lc_r"]) dnl name of pthread lib in FreeBSD -@@ -1488,7 +1502,7 @@ esac +@@ -1494,7 +1508,7 @@ esac THIS_LIB_LIBS="-lX11 -lXext -lm -lstdc++ ${XVLIBS} ${DGALIBS} " THIS_LIB_LIBS="${THIS_LIB_LIBS} ${XVIDMODELIBS} ${SDLLIB} ${CDDALIBS} " diff --git a/x11/kde/multimedia3/patches/patch-kmidi_BITMAPS_Makefile_in b/x11/kde/multimedia3/patches/patch-kmidi_BITMAPS_Makefile_in index 9cdc59fcf1b..25b5433a92b 100644 --- a/x11/kde/multimedia3/patches/patch-kmidi_BITMAPS_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-kmidi_BITMAPS_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-kmidi_BITMAPS_Makefile_in,v 1.1 2002/06/04 09:52:45 espie Exp $ ---- kmidi/BITMAPS/Makefile.in.orig Tue Jun 4 11:46:18 2002 -+++ kmidi/BITMAPS/Makefile.in Tue Jun 4 11:46:29 2002 -@@ -447,7 +447,7 @@ install-data-local: +$OpenBSD: patch-kmidi_BITMAPS_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- kmidi/BITMAPS/Makefile.in.orig Sat Dec 21 08:07:51 2002 ++++ kmidi/BITMAPS/Makefile.in Sun Dec 22 13:55:17 2002 +@@ -446,7 +446,7 @@ install-data-local: #>+ 1 $(mkinstalldirs) $(DESTDIR)$(TIMID_DIR)/BITMAPS @for i in $(CONFIG_FILES); do \ -- if [ ! -f "$(TIMID_DIR)/BITMAPS/$$i" ] ; then \ -+ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/BITMAPS/$$i" ] ; then \ - echo "$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)/BITMAPS"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)/BITMAPS ; \ - fi ; \ +- if [ ! -f "$(TIMID_DIR)/BITMAPS/$$i" ] ; then \ ++ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/BITMAPS/$$i" ] ; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)/BITMAPS"; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)/BITMAPS ; \ + fi ; \ diff --git a/x11/kde/multimedia3/patches/patch-kmidi_config_Makefile_in b/x11/kde/multimedia3/patches/patch-kmidi_config_Makefile_in index c8241bf7d0b..6ee0d8afed1 100644 --- a/x11/kde/multimedia3/patches/patch-kmidi_config_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-kmidi_config_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-kmidi_config_Makefile_in,v 1.1 2002/06/04 09:52:45 espie Exp $ ---- kmidi/config/Makefile.in.orig Tue Jun 4 11:46:58 2002 -+++ kmidi/config/Makefile.in Tue Jun 4 11:47:11 2002 -@@ -560,7 +560,7 @@ install-data-local: +$OpenBSD: patch-kmidi_config_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- kmidi/config/Makefile.in.orig Sat Dec 21 08:07:51 2002 ++++ kmidi/config/Makefile.in Sun Dec 22 13:55:45 2002 +@@ -559,7 +559,7 @@ install-data-local: #>+ 1 $(mkinstalldirs) $(DESTDIR)$(TIMID_DIR) @for i in $(CONFIG_FILES); do \ -- if [ ! -f "$(TIMID_DIR)/$$i" ] ; then \ -+ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/$$i" ] ; then \ - echo "$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR) ; \ - fi ; \ +- if [ ! -f "$(TIMID_DIR)/$$i" ] ; then \ ++ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/$$i" ] ; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)"; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR) ; \ + fi ; \ diff --git a/x11/kde/multimedia3/patches/patch-kmidi_configure_in_in b/x11/kde/multimedia3/patches/patch-kmidi_configure_in_in index 215a5f43c6d..26d3a0a8df4 100644 --- a/x11/kde/multimedia3/patches/patch-kmidi_configure_in_in +++ b/x11/kde/multimedia3/patches/patch-kmidi_configure_in_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-kmidi_configure_in_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- kmidi/configure.in.in.orig Sat Apr 20 04:30:45 2002 -+++ kmidi/configure.in.in Sat Apr 20 04:31:02 2002 -@@ -640,7 +640,7 @@ dnl else +$OpenBSD: patch-kmidi_configure_in_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- kmidi/configure.in.in.orig Mon Dec 16 04:00:27 2002 ++++ kmidi/configure.in.in Sun Dec 22 13:52:20 2002 +@@ -645,7 +645,7 @@ dnl else dnl lib_xaw_opt=-lXaw dnl fi EXTRATDEFS="$EXTRATDEFS -DIA_XAW" diff --git a/x11/kde/multimedia3/patches/patch-kscd_Makefile_in b/x11/kde/multimedia3/patches/patch-kscd_Makefile_in index 0fbb97726d7..3c853f21d8f 100644 --- a/x11/kde/multimedia3/patches/patch-kscd_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-kscd_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-kscd_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- kscd/Makefile.in.orig Sat Apr 20 05:04:34 2002 -+++ kscd/Makefile.in Sat Apr 20 05:04:58 2002 -@@ -297,7 +297,7 @@ appsdir = $(kde_appsdir)/Multimedia +$OpenBSD: patch-kscd_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- kscd/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ kscd/Makefile.in Sun Dec 22 13:52:20 2002 +@@ -296,7 +296,7 @@ appsdir = $(kde_appsdir)/Multimedia CDDBDIR = $(kde_datadir)/kscd/cddb/ LDFLAGS = $(LIB_KIO) $(all_libraries) $(KDE_RPATH) @@ -10,17 +10,17 @@ $OpenBSD: patch-kscd_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ INCLUDES = $(all_includes) LINK = $(CXXLINK) -@@ -328,7 +328,7 @@ kscd_SOURCES=kscd.cpp configdlg.cpp cdd - # plat_svr4.c plat_freebsd.c plat_osf1.c plat_irix.c +@@ -327,7 +327,7 @@ kscd_SOURCES=kscd.cpp configdlg.cpp cdd + # plat_svr4.c plat_freebsd.c plat_osf1.c plat_irix.c #cddaslave_SOURCES = cddaslave.c -#cddaslave_LDADD = libwm/libworkman.la +#cddaslave_LDADD = libwm/libkworkman.la #SOURCES3=kscdmagic/bitmap.cpp kscdmagic/core.cpp kscdmagic/main.cpp \ - # kscdmagic/sound.cpp kscdmagic/xlibwrap.cpp kscdmagic/xlib.c -@@ -391,7 +391,7 @@ kscd_nofinal_OBJECTS = kscd.$(OBJEXT) co - kscd_meta_unload.o + # kscdmagic/sound.cpp kscdmagic/xlibwrap.cpp kscdmagic/xlib.c +@@ -385,7 +385,7 @@ kscd_nofinal_OBJECTS = kscd.$(OBJEXT) co + mgconfdlg.$(OBJEXT) bwlednum.$(OBJEXT) configWidget.$(OBJEXT) kscd_skel.$(OBJEXT) @KDE_USE_FINAL_FALSE@kscd_OBJECTS = $(kscd_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kscd_OBJECTS = $(kscd_final_OBJECTS) -kscd_DEPENDENCIES = libwm/libworkman.la diff --git a/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_in b/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_in index d71d34260da..69b3d437c5b 100644 --- a/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-kscd_libwm_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- kscd/libwm/Makefile.in.orig Sat Apr 20 05:02:39 2002 -+++ kscd/libwm/Makefile.in Sat Apr 20 05:03:38 2002 -@@ -298,9 +298,9 @@ subdirs = include +$OpenBSD: patch-kscd_libwm_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- kscd/libwm/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ kscd/libwm/Makefile.in Sun Dec 22 13:56:29 2002 +@@ -297,9 +297,9 @@ subdirs = include INCLUDES = $(all_includes) @@ -13,16 +13,16 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ # # Headers come later... -@@ -310,7 +310,7 @@ include_HEADERS = +@@ -309,7 +309,7 @@ include_HEADERS = # Which headers shouldn't be installed when a make install is done? #noinst_HEADERS = -libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\ +libkworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\ - database.c index.c scsi.c \ - plat_aix.c plat_bsd386.c plat_freebsd.c plat_hpux.c plat_irix.c \ - plat_linux.c plat_svr4.c plat_ultrix.c plat_news.c plat_openbsd.c \ -@@ -323,24 +323,24 @@ CONFIG_HEADER = $(top_builddir)/config.h + database.c index.c scsi.c \ + plat_aix.c plat_bsd386.c plat_freebsd.c plat_hpux.c plat_irix.c \ + plat_linux.c plat_svr4.c plat_ultrix.c plat_news.c plat_openbsd.c \ +@@ -322,24 +322,24 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -54,7 +54,7 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -368,11 +368,11 @@ CCLD = $(CC) +@@ -381,11 +381,11 @@ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ @@ -68,7 +68,7 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ #>- all: all-am #>+ 1 -@@ -419,8 +419,8 @@ uninstall-libLTLIBRARIES: +@@ -432,8 +432,8 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @@ -79,7 +79,7 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core -@@ -651,16 +651,16 @@ force-reedit: +@@ -664,16 +664,16 @@ force-reedit: #>+ 2 final: @@ -99,4 +99,4 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ + $(MAKE) libkworkman_la_OBJECTS="$(libkworkman_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_artsplug_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_artsplug_Makefile_in index 9068b873194..620bb5cc316 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_artsplug_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_artsplug_Makefile_in @@ -1,21 +1,21 @@ -$OpenBSD: patch-mpeglib_artsplug_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib_artsplug/Makefile.in.orig Sat Apr 20 14:07:09 2002 -+++ mpeglib_artsplug/Makefile.in Sat Apr 20 14:07:27 2002 -@@ -358,7 +358,7 @@ libarts_mpeglib_la_SOURCES = $(BUILT_SOU +$OpenBSD: patch-mpeglib_artsplug_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib_artsplug/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib_artsplug/Makefile.in Sun Dec 22 14:36:33 2002 +@@ -357,7 +357,7 @@ libarts_mpeglib_la_SOURCES = $(BUILT_SOU libarts_mpeglib_la_LDFLAGS = $(all_libraries) \ -- $(top_builddir)/mpeglib/lib/libmpeg.la \ -+ $(top_builddir)/mpeglib/lib/libkmpeg.la \ - -module \ - -release $(MPEGLIB_ARTS_VERSION) \ - -version-info $(MPEGLIB_ARTS_MAJOR_VERSION):$(MPEGLIB_ARTS_MINOR_VERSION):$(MPEGLIB_ARTS_MICRO_VERSION) -@@ -369,7 +369,7 @@ libarts_splay_la_SOURCES = splayPlayObje +- $(top_builddir)/mpeglib/lib/libmpeg.la \ ++ $(top_builddir)/mpeglib/lib/libkmpeg.la \ + -module \ + -release $(MPEGLIB_ARTS_VERSION) \ + -version-info $(MPEGLIB_ARTS_MAJOR_VERSION):$(MPEGLIB_ARTS_MINOR_VERSION):$(MPEGLIB_ARTS_MICRO_VERSION) +@@ -368,7 +368,7 @@ libarts_splay_la_SOURCES = splayPlayObje libarts_splay_la_LDFLAGS = $(all_libraries) \ -- $(top_builddir)/mpeglib/lib/libmpeg.la \ -+ $(top_builddir)/mpeglib/lib/libkmpeg.la \ - -module +- $(top_builddir)/mpeglib/lib/libmpeg.la \ ++ $(top_builddir)/mpeglib/lib/libkmpeg.la \ + -module diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in index 1106f83daab..52a82c46975 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_cddaplay_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/cddaplay/Makefile.in.orig Mon Mar 25 00:15:50 2002 -+++ mpeglib/example/cddaplay/Makefile.in Sat Apr 20 07:03:04 2002 -@@ -303,7 +303,7 @@ noinst_HEADERS = +$OpenBSD: patch-mpeglib_example_cddaplay_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/cddaplay/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/cddaplay/Makefile.in Sun Dec 22 13:57:49 2002 +@@ -302,7 +302,7 @@ noinst_HEADERS = cddaplay_LDFLAGS = $(all_libraries) -cddaplay_LDADD = ../../lib/libmpeg.la \ +cddaplay_LDADD = ../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + $(THIS_LIB_LIBS) subdir = mpeglib/example/cddaplay -@@ -317,7 +317,7 @@ am_cddaplay_OBJECTS = cddaplay.$(OBJEXT) +@@ -316,7 +316,7 @@ am_cddaplay_OBJECTS = cddaplay.$(OBJEXT) #>- cddaplay_OBJECTS = $(am_cddaplay_OBJECTS) #>+ 1 cddaplay_OBJECTS = cddaplay.$(OBJEXT) diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in index c2103180e80..f7f8393c5e1 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_mpgplay_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/mpgplay/Makefile.in.orig Mon Mar 25 00:15:51 2002 -+++ mpeglib/example/mpgplay/Makefile.in Sat Apr 20 07:02:58 2002 -@@ -303,7 +303,7 @@ noinst_HEADERS = +$OpenBSD: patch-mpeglib_example_mpgplay_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/mpgplay/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/mpgplay/Makefile.in Sun Dec 22 13:58:14 2002 +@@ -302,7 +302,7 @@ noinst_HEADERS = mpgplay_LDFLAGS = $(all_libraries) -mpgplay_LDADD = ../../lib/libmpeg.la \ +mpgplay_LDADD = ../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + $(THIS_LIB_LIBS) subdir = mpeglib/example/mpgplay -@@ -317,7 +317,7 @@ am_mpgplay_OBJECTS = mpgplay.$(OBJEXT) +@@ -316,7 +316,7 @@ am_mpgplay_OBJECTS = mpgplay.$(OBJEXT) #>- mpgplay_OBJECTS = $(am_mpgplay_OBJECTS) #>+ 1 mpgplay_OBJECTS = mpgplay.$(OBJEXT) diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in index fefbe841c35..a748d73e081 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in @@ -1,22 +1,22 @@ -$OpenBSD: patch-mpeglib_example_splay_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/splay/Makefile.in.orig Mon Mar 25 00:15:51 2002 -+++ mpeglib/example/splay/Makefile.in Sat Apr 20 07:02:49 2002 -@@ -305,12 +305,12 @@ noinst_HEADERS = +$OpenBSD: patch-mpeglib_example_splay_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/splay/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/splay/Makefile.in Sun Dec 22 13:58:44 2002 +@@ -304,12 +304,12 @@ noinst_HEADERS = splay_LDFLAGS = $(all_libraries) -splay_LDADD = ../../lib/libmpeg.la \ +splay_LDADD = ../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + $(THIS_LIB_LIBS) mp3framing_LDFLAGS = $(all_libraries) -mp3framing_LDADD = ../../lib/libmpeg.la \ +mp3framing_LDADD = ../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + $(THIS_LIB_LIBS) subdir = mpeglib/example/splay -@@ -324,12 +324,12 @@ am_mp3framing_OBJECTS = mp3framing.$(OBJ +@@ -323,12 +323,12 @@ am_mp3framing_OBJECTS = mp3framing.$(OBJ #>- mp3framing_OBJECTS = $(am_mp3framing_OBJECTS) #>+ 1 mp3framing_OBJECTS = mp3framing.$(OBJEXT) diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in index 266eb08a23f..7640404e3b5 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_tplay_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/tplay/Makefile.in.orig Mon Mar 25 00:15:51 2002 -+++ mpeglib/example/tplay/Makefile.in Sat Apr 20 07:02:54 2002 -@@ -303,7 +303,7 @@ noinst_HEADERS = +$OpenBSD: patch-mpeglib_example_tplay_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/tplay/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/tplay/Makefile.in Sun Dec 22 13:59:01 2002 +@@ -302,7 +302,7 @@ noinst_HEADERS = tplay_LDFLAGS = $(all_libraries) -tplay_LDADD = ../../lib/libmpeg.la \ +tplay_LDADD = ../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + $(THIS_LIB_LIBS) subdir = mpeglib/example/tplay -@@ -317,7 +317,7 @@ am_tplay_OBJECTS = tplay.$(OBJEXT) +@@ -316,7 +316,7 @@ am_tplay_OBJECTS = tplay.$(OBJEXT) #>- tplay_OBJECTS = $(am_tplay_OBJECTS) #>+ 1 tplay_OBJECTS = tplay.$(OBJEXT) diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in index efa8b527c65..4085c119d8f 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafcdda_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/yaf/yafcdda/Makefile.in.orig Mon Mar 25 00:15:51 2002 -+++ mpeglib/example/yaf/yafcdda/Makefile.in Sat Apr 20 07:02:09 2002 -@@ -303,7 +303,7 @@ yaf_cdda_LDFLAGS = $(all_libraries) +$OpenBSD: patch-mpeglib_example_yaf_yafcdda_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/yaf/yafcdda/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/yaf/yafcdda/Makefile.in Sun Dec 22 14:21:40 2002 +@@ -302,7 +302,7 @@ yaf_cdda_LDFLAGS = $(all_libraries) yaf_cdda_LDADD = ../yafxplayer/libyafxplayer.la \ - ../yafcore/libyafcore.la \ -- ../../../lib/libmpeg.la \ -+ ../../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + ../yafcore/libyafcore.la \ +- ../../../lib/libmpeg.la \ ++ ../../../lib/libkmpeg.la \ + $(THIS_LIB_LIBS) subdir = mpeglib/example/yaf/yafcdda -@@ -318,7 +318,7 @@ am_yaf_cdda_OBJECTS = cdda_control.$(OBJ +@@ -317,7 +317,7 @@ am_yaf_cdda_OBJECTS = cdda_control.$(OBJ #>+ 1 yaf_cdda_OBJECTS = cdda_control.$(OBJEXT) yaf_cdda_DEPENDENCIES = ../yafxplayer/libyafxplayer.la \ diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in index 7dcbf8facac..2ad4ac5aa34 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafmpgplay_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/yaf/yafmpgplay/Makefile.in.orig Mon Mar 25 00:15:52 2002 -+++ mpeglib/example/yaf/yafmpgplay/Makefile.in Sat Apr 20 07:02:17 2002 -@@ -305,7 +305,7 @@ yaf_mpgplay_LDFLAGS = $(all_libraries) +$OpenBSD: patch-mpeglib_example_yaf_yafmpgplay_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/yaf/yafmpgplay/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/yaf/yafmpgplay/Makefile.in Sun Dec 22 14:22:07 2002 +@@ -304,7 +304,7 @@ yaf_mpgplay_LDFLAGS = $(all_libraries) yaf_mpgplay_LDADD = ../yafcore/libyafcore.la \ - ../yafxplayer/libyafxplayer.la \ -- ../../../lib/libmpeg.la \ -+ ../../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + ../yafxplayer/libyafxplayer.la \ +- ../../../lib/libmpeg.la \ ++ ../../../lib/libkmpeg.la \ + $(THIS_LIB_LIBS) subdir = mpeglib/example/yaf/yafmpgplay -@@ -320,7 +320,7 @@ am_yaf_mpgplay_OBJECTS = mpg_control.$(O +@@ -319,7 +319,7 @@ am_yaf_mpgplay_OBJECTS = mpg_control.$(O #>+ 1 yaf_mpgplay_OBJECTS = mpg_control.$(OBJEXT) yaf_mpgplay_DEPENDENCIES = ../yafcore/libyafcore.la \ diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in index d28ffd5475c..fd6a5efcacc 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafsplay_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/yaf/yafsplay/Makefile.in.orig Mon Mar 25 00:15:52 2002 -+++ mpeglib/example/yaf/yafsplay/Makefile.in Sat Apr 20 07:02:28 2002 -@@ -305,7 +305,7 @@ yaf_splay_LDFLAGS = $(all_libraries) +$OpenBSD: patch-mpeglib_example_yaf_yafsplay_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/yaf/yafsplay/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/yaf/yafsplay/Makefile.in Sun Dec 22 14:22:20 2002 +@@ -304,7 +304,7 @@ yaf_splay_LDFLAGS = $(all_libraries) yaf_splay_LDADD = ../yafxplayer/libyafxplayer.la \ - ../yafcore/libyafcore.la \ -- ../../../lib/libmpeg.la \ -+ ../../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + ../yafcore/libyafcore.la \ +- ../../../lib/libmpeg.la \ ++ ../../../lib/libkmpeg.la \ + $(THIS_LIB_LIBS) subdir = mpeglib/example/yaf/yafsplay -@@ -320,7 +320,7 @@ am_yaf_splay_OBJECTS = splay_control.$(O +@@ -319,7 +319,7 @@ am_yaf_splay_OBJECTS = splay_control.$(O #>+ 1 yaf_splay_OBJECTS = splay_control.$(OBJEXT) yaf_splay_DEPENDENCIES = ../yafxplayer/libyafxplayer.la \ diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in index 5c7456934c8..38490e305fc 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yaftplay_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/yaf/yaftplay/Makefile.in.orig Mon Mar 25 00:15:52 2002 -+++ mpeglib/example/yaf/yaftplay/Makefile.in Sat Apr 20 07:02:33 2002 -@@ -303,7 +303,7 @@ yaf_tplay_LDFLAGS = $(all_libraries) +$OpenBSD: patch-mpeglib_example_yaf_yaftplay_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/yaf/yaftplay/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/yaf/yaftplay/Makefile.in Sun Dec 22 14:22:36 2002 +@@ -302,7 +302,7 @@ yaf_tplay_LDFLAGS = $(all_libraries) yaf_tplay_LDADD = ../yafcore/libyafcore.la \ - ../yafxplayer/libyafxplayer.la \ -- ../../../lib/libmpeg.la \ -+ ../../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + ../yafxplayer/libyafxplayer.la \ +- ../../../lib/libmpeg.la \ ++ ../../../lib/libkmpeg.la \ + $(THIS_LIB_LIBS) subdir = mpeglib/example/yaf/yaftplay -@@ -318,7 +318,7 @@ am_yaf_tplay_OBJECTS = tplay_control.$(O +@@ -317,7 +317,7 @@ am_yaf_tplay_OBJECTS = tplay_control.$(O #>+ 1 yaf_tplay_OBJECTS = tplay_control.$(OBJEXT) yaf_tplay_DEPENDENCIES = ../yafcore/libyafcore.la \ diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in index 852e882c16a..1dd9ca3cb1d 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafvorbis_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/yaf/yafvorbis/Makefile.in.orig Mon Mar 25 00:15:52 2002 -+++ mpeglib/example/yaf/yafvorbis/Makefile.in Sat Apr 20 07:02:23 2002 -@@ -306,7 +306,7 @@ yaf_vorbis_LDFLAGS = $(all_libraries) +$OpenBSD: patch-mpeglib_example_yaf_yafvorbis_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/yaf/yafvorbis/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/yaf/yafvorbis/Makefile.in Sun Dec 22 14:22:51 2002 +@@ -305,7 +305,7 @@ yaf_vorbis_LDFLAGS = $(all_libraries) yaf_vorbis_LDADD = \ - ../yafcore/libyafcore.la \ - ../yafxplayer/libyafxplayer.la \ -- ../../../lib/libmpeg.la \ -+ ../../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + ../yafcore/libyafcore.la \ + ../yafxplayer/libyafxplayer.la \ +- ../../../lib/libmpeg.la \ ++ ../../../lib/libkmpeg.la \ + $(THIS_LIB_LIBS) subdir = mpeglib/example/yaf/yafvorbis -@@ -321,7 +321,7 @@ am_yaf_vorbis_OBJECTS = vorbis_control.$ +@@ -320,7 +320,7 @@ am_yaf_vorbis_OBJECTS = vorbis_control.$ #>+ 1 yaf_vorbis_OBJECTS = vorbis_control.$(OBJEXT) yaf_vorbis_DEPENDENCIES = ../yafcore/libyafcore.la \ diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafxplayer_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafxplayer_Makefile_in index 08e4a42eb2d..dc3d455eca3 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafxplayer_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafxplayer_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafxplayer_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/yaf/yafxplayer/Makefile.in.orig Mon Mar 25 00:15:53 2002 -+++ mpeglib/example/yaf/yafxplayer/Makefile.in Sat Apr 20 07:02:41 2002 -@@ -314,7 +314,7 @@ libyafxplayer_la_LDFLAGS = $(all_librari - -module +$OpenBSD: patch-mpeglib_example_yaf_yafxplayer_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/yaf/yafxplayer/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/yaf/yafxplayer/Makefile.in Sun Dec 22 14:23:07 2002 +@@ -313,7 +313,7 @@ libyafxplayer_la_LDFLAGS = $(all_librari + -module -libyafxplayer_la_LIBADD = ../../../lib/libmpeg.la \ +libyafxplayer_la_LIBADD = ../../../lib/libkmpeg.la \ - ../yafcore/libyafcore.la \ - $(THIS_LIB_LIBS) + ../yafcore/libyafcore.la \ + $(THIS_LIB_LIBS) -@@ -331,7 +331,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -330,7 +330,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in index 91f905e5e2d..81fb07d298d 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafyuv_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/example/yaf/yafyuv/Makefile.in.orig Mon Mar 25 00:15:53 2002 -+++ mpeglib/example/yaf/yafyuv/Makefile.in Sat Apr 20 07:02:37 2002 -@@ -305,7 +305,7 @@ yaf_yuv_LDFLAGS = $(all_libraries) +$OpenBSD: patch-mpeglib_example_yaf_yafyuv_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/example/yaf/yafyuv/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/example/yaf/yafyuv/Makefile.in Sun Dec 22 14:23:24 2002 +@@ -304,7 +304,7 @@ yaf_yuv_LDFLAGS = $(all_libraries) yaf_yuv_LDADD = ../yafxplayer/libyafxplayer.la \ - ../yafcore/libyafcore.la \ -- ../../../lib/libmpeg.la \ -+ ../../../lib/libkmpeg.la \ - $(THIS_LIB_LIBS) + ../yafcore/libyafcore.la \ +- ../../../lib/libmpeg.la \ ++ ../../../lib/libkmpeg.la \ + $(THIS_LIB_LIBS) subdir = mpeglib/example/yaf/yafyuv -@@ -320,7 +320,7 @@ am_yaf_yuv_OBJECTS = yuv_control.$(OBJEX +@@ -319,7 +319,7 @@ am_yaf_yuv_OBJECTS = yuv_control.$(OBJEX #>+ 1 yaf_yuv_OBJECTS = yuv_control.$(OBJEXT) yaf_yuv_DEPENDENCIES = ../yafxplayer/libyafxplayer.la \ diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_lib_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_lib_Makefile_in index 69e961e1a17..2ac4b18aac2 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_lib_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_lib_Makefile_in @@ -1,8 +1,8 @@ -$OpenBSD: patch-mpeglib_lib_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- mpeglib/lib/Makefile.in.orig Mon Mar 25 00:15:53 2002 -+++ mpeglib/lib/Makefile.in Sat Apr 20 06:41:27 2002 -@@ -312,16 +312,16 @@ THIS_EXTRALIBS = mpgplayer/libmpgplayer. - yuv/libyuvPlugin.la +$OpenBSD: patch-mpeglib_lib_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- mpeglib/lib/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ mpeglib/lib/Makefile.in Sun Dec 22 14:25:31 2002 +@@ -311,16 +311,16 @@ THIS_EXTRALIBS = mpgplayer/libmpgplayer. + yuv/libyuvPlugin.la -lib_LTLIBRARIES = libmpeg.la @@ -13,16 +13,16 @@ $OpenBSD: patch-mpeglib_lib_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp -libmpeg_la_LDFLAGS = $(all_libraries) \ +libkmpeg_la_LDFLAGS = $(all_libraries) \ - -module \ - -release $(THIS_LIB_VERSION) + -module \ + -release $(THIS_LIB_VERSION) -libmpeg_la_LIBADD = $(THIS_EXTRALIBS) $(MMXFILES) \ +libkmpeg_la_LIBADD = $(THIS_EXTRALIBS) $(MMXFILES) \ - $(THIS_LIB_LIBS) + $(THIS_LIB_LIBS) subdir = mpeglib/lib -@@ -330,15 +330,15 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -329,15 +329,15 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -42,7 +42,7 @@ $OpenBSD: patch-mpeglib_lib_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -366,7 +366,7 @@ CXXLD = $(CXX) +@@ -368,7 +368,7 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -51,7 +51,7 @@ $OpenBSD: patch-mpeglib_lib_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-info-recursive all-recursive install-data-recursive \ -@@ -374,7 +374,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -376,7 +376,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -60,7 +60,7 @@ $OpenBSD: patch-mpeglib_lib_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp #>- all: all-recursive #>+ 1 -@@ -421,8 +421,8 @@ uninstall-libLTLIBRARIES: +@@ -423,8 +423,8 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @@ -71,33 +71,3 @@ $OpenBSD: patch-mpeglib_lib_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core -@@ -690,20 +690,20 @@ force-reedit: - - - #>+ 11 --libmpeg_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp -- @echo 'creating libmpeg_la.all_cpp.cpp ...'; \ -- rm -f libmpeg_la.all_cpp.files libmpeg_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> libmpeg_la.all_cpp.final; \ -+libkmpeg_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp -+ @echo 'creating libkmpeg_la.all_cpp.cpp ...'; \ -+ rm -f libkmpeg_la.all_cpp.files libkmpeg_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkmpeg_la.all_cpp.final; \ - for file in dummy.cpp ; do \ -- echo "#include \"$$file\"" >> libmpeg_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libmpeg_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libkmpeg_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmpeg_la.all_cpp.final; \ - done; \ -- cat libmpeg_la.all_cpp.final libmpeg_la.all_cpp.files > libmpeg_la.all_cpp.cpp; \ -- rm -f libmpeg_la.all_cpp.final libmpeg_la.all_cpp.files -+ cat libkmpeg_la.all_cpp.final libkmpeg_la.all_cpp.files > libkmpeg_la.all_cpp.cpp; \ -+ rm -f libkmpeg_la.all_cpp.final libkmpeg_la.all_cpp.files - - #>+ 3 - clean-final: -- -rm -f libmpeg_la.all_cpp.cpp -+ -rm -f libkmpeg_la.all_cpp.cpp - - #>+ 2 - final: diff --git a/x11/kde/multimedia3/patches/patch-noatun_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_Makefile_in index 3e9ad5c442e..04cd09b5753 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/Makefile.in.orig Sat Apr 20 03:19:25 2002 -+++ noatun/Makefile.in Sat Apr 20 03:19:41 2002 -@@ -300,7 +300,7 @@ kde_module_LTLIBRARIES = noatun.la +$OpenBSD: patch-noatun_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/Makefile.in.orig Sat Dec 21 08:07:52 2002 ++++ noatun/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -299,7 +299,7 @@ kde_module_LTLIBRARIES = noatun.la #>+ 1 noatun_la_SOURCES=main.cpp joinhandler.cpp joinhandler_skel.cpp noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ bin_PROGRAMS = noatun noatun_SOURCES = dummy.cpp -@@ -330,7 +330,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -329,7 +329,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) diff --git a/x11/kde/multimedia3/patches/patch-noatun_library_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_library_Makefile_in index 485e4703667..a51984d3633 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_library_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_library_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_library_Makefile_in,v 1.2 2002/12/02 16:27:21 espie Exp $ ---- noatun/library/Makefile.in.orig Tue Nov 12 00:46:23 2002 -+++ noatun/library/Makefile.in Mon Dec 2 15:39:10 2002 -@@ -301,9 +301,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar +$OpenBSD: patch-noatun_library_Makefile_in,v 1.3 2002/12/23 14:22:32 espie Exp $ +--- noatun/library/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/library/Makefile.in Sun Dec 22 14:28:01 2002 +@@ -300,9 +300,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar SUBDIRS = noatunarts noatun . noatuntags @@ -13,14 +13,14 @@ $OpenBSD: patch-noatun_library_Makefile_in,v 1.2 2002/12/02 16:27:21 espie Exp $ playlist.cpp pref.cpp \ player.cpp playlistsaver.cpp app.cpp \ pluginloader.cpp plugin.cpp \ -@@ -315,12 +315,12 @@ libnoatun_la_SOURCES = pluginmodule.cpp +@@ -314,12 +314,12 @@ libnoatun_la_SOURCES = pluginmodule.cpp include_HEADERS = cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h ksaver.h -libnoatun_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \ +libknoatun_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \ - $(KDE_RPATH) $(all_libraries) -L$(top_builddir)/arts/gui/common \ - -L$(top_builddir)/arts/gui/kde + $(KDE_RPATH) $(all_libraries) -L$(top_builddir)/arts/gui/common \ + -L$(top_builddir)/arts/gui/kde -libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \ @@ -28,7 +28,7 @@ $OpenBSD: patch-noatun_library_Makefile_in,v 1.2 2002/12/02 16:27:21 espie Exp $ $(top_builddir)/arts/gui/kde/libartsgui_kde.la \ $(top_builddir)/arts/modules/libartsmodules.la \ -lkio -lqtmcop -lkmedia2_idl -lnoatunarts \ -@@ -345,27 +345,27 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -344,26 +344,26 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -45,7 +45,7 @@ $OpenBSD: patch-noatun_library_Makefile_in,v 1.2 2002/12/02 16:27:21 espie Exp $ effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo -#>- libnoatun_la_OBJECTS = $(am_libnoatun_la_OBJECTS) +#>- libknoatun_la_OBJECTS = $(am_libknoatun_la_OBJECTS) - #>+ 10 + #>+ 9 -libnoatun_la_final_OBJECTS = libnoatun_la.all_cpp.lo -libnoatun_la_nofinal_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \ +libknoatun_la_final_OBJECTS = libknoatun_la.all_cpp.lo @@ -54,17 +54,24 @@ $OpenBSD: patch-noatun_library_Makefile_in,v 1.2 2002/12/02 16:27:21 espie Exp $ pluginloader.lo plugin.lo noatunstdaction.lo conversion.lo \ noatunui.lo effectview.lo equalizerview.lo equalizer.lo \ effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo\ - plugin_deps.moc.lo \ -- libnoatun_la_meta_unload.lo + plugin_deps.moc.lo -@KDE_USE_FINAL_FALSE@libnoatun_la_OBJECTS = $(libnoatun_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libnoatun_la_OBJECTS = $(libnoatun_la_final_OBJECTS) -+ libknoatun_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libknoatun_la_OBJECTS = $(libknoatun_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libknoatun_la_OBJECTS = $(libknoatun_la_final_OBJECTS) libnoatuncontrols_la_DEPENDENCIES = am_libnoatuncontrols_la_OBJECTS = controls.lo scrollinglabel.lo #>- libnoatuncontrols_la_OBJECTS = $(am_libnoatuncontrols_la_OBJECTS) -@@ -423,7 +423,7 @@ CXXLD = $(CXX) +@@ -403,7 +403,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@ $(DEPDIR)/scrollinglabel.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/stereobuttonaction.Plo + #>+ 29 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/plugin_deps.moc.P $(DEPDIR)/libnoatun_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P $(DEPDIR)/gentable.all_cpp.P $(DEPDIR)/app.Plo $(DEPDIR)/cmodule.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/plugin_deps.moc.P $(DEPDIR)/libknoatun_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P $(DEPDIR)/gentable.all_cpp.P $(DEPDIR)/app.Plo $(DEPDIR)/cmodule.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/controls.Plo $(DEPDIR)/conversion.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/downloader.Plo $(DEPDIR)/effects.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/effectview.Plo $(DEPDIR)/engine.Plo \ +@@ -451,7 +451,7 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -73,7 +80,7 @@ $OpenBSD: patch-noatun_library_Makefile_in,v 1.2 2002/12/02 16:27:21 espie Exp $ $(gentable_SOURCES) DATA = $(magictable_DATA) -@@ -436,7 +436,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -464,7 +464,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -82,7 +89,7 @@ $OpenBSD: patch-noatun_library_Makefile_in,v 1.2 2002/12/02 16:27:21 espie Exp $ #>- all: all-recursive #>+ 1 -@@ -483,8 +483,8 @@ uninstall-libLTLIBRARIES: +@@ -511,8 +511,8 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @@ -93,60 +100,32 @@ $OpenBSD: patch-noatun_library_Makefile_in,v 1.2 2002/12/02 16:27:21 espie Exp $ libnoatuncontrols.la: $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libnoatuncontrols_la_LDFLAGS) $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_LIBADD) $(LIBS) -@@ -856,33 +856,33 @@ force-reedit: +@@ -884,16 +884,16 @@ force-reedit: - #>+ 12 --libnoatun_la_meta_unload.cpp: plugin_deps.moc.cpp mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc -- @echo 'creating libnoatun_la_meta_unload.cpp' -- @-rm -f libnoatun_la_meta_unload.cpp -+libknoatun_la_meta_unload.cpp: plugin_deps.moc.cpp mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc -+ @echo 'creating libknoatun_la_meta_unload.cpp' -+ @-rm -f libknoatun_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_libnoatun_la[] = {' > libnoatun_la_meta_unload.cpp ;\ -- cat plugin_deps.moc.cpp mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libnoatun_la_meta_unload.cpp ;\ -- echo '0};' >> libnoatun_la_meta_unload.cpp ;\ -- echo '#include ' >> libnoatun_la_meta_unload.cpp ;\ -- echo '_UNLOAD(libnoatun_la)' >> libnoatun_la_meta_unload.cpp ;\ -- else echo > libnoatun_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libknoatun_la[] = {' > libknoatun_la_meta_unload.cpp ;\ -+ cat plugin_deps.moc.cpp mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libknoatun_la_meta_unload.cpp ;\ -+ echo '0};' >> libknoatun_la_meta_unload.cpp ;\ -+ echo '#include ' >> libknoatun_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libknoatun_la)' >> libknoatun_la_meta_unload.cpp ;\ -+ else echo > libknoatun_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f libnoatun_la_meta_unload.cpp -+ -rm -f libknoatun_la_meta_unload.cpp - #>+ 11 --libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp libnoatun_la_meta_unload.cpp plugin_deps.moc.cpp mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc +-libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp plugin_deps.moc.cpp mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc - @echo 'creating libnoatun_la.all_cpp.cpp ...'; \ - rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \ -- for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp libnoatun_la_meta_unload.cpp plugin_deps.moc.cpp; do \ -- echo "#include \"$$file\"" >> libnoatun_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_la.all_cpp.final; \ -+libknoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp libknoatun_la_meta_unload.cpp plugin_deps.moc.cpp mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc ++libknoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp plugin_deps.moc.cpp mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc + @echo 'creating libknoatun_la.all_cpp.cpp ...'; \ + rm -f libknoatun_la.all_cpp.files libknoatun_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libknoatun_la.all_cpp.final; \ -+ for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp libknoatun_la_meta_unload.cpp plugin_deps.moc.cpp; do \ + for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp plugin_deps.moc.cpp ; do \ +- echo "#include \"$$file\"" >> libnoatun_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libknoatun_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libknoatun_la.all_cpp.final; \ done; \ -- cat libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files > libnoatun_la.all_cpp.cpp; \ +- cat libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files > libnoatun_la.all_cpp.cpp; \ - rm -f libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files -+ cat libknoatun_la.all_cpp.final libknoatun_la.all_cpp.files > libknoatun_la.all_cpp.cpp; \ ++ cat libknoatun_la.all_cpp.final libknoatun_la.all_cpp.files > libknoatun_la.all_cpp.cpp; \ + rm -f libknoatun_la.all_cpp.final libknoatun_la.all_cpp.files #>+ 11 - libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp -@@ -910,20 +910,20 @@ gentable.all_cpp.cpp: $(srcdir)/Makefile + libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp plugin_deps.moc.cpp +@@ -921,20 +921,20 @@ gentable.all_cpp.cpp: $(srcdir)/Makefile #>+ 3 clean-final: @@ -171,4 +150,4 @@ $OpenBSD: patch-noatun_library_Makefile_in,v 1.2 2002/12/02 16:27:21 espie Exp $ + $(MAKE) libknoatun_la_OBJECTS="$(libknoatun_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kde/multimedia3/patches/patch-noatun_library_noatuntags_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_library_noatuntags_Makefile_in index 088f4ca11c4..01574a1ee31 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_library_noatuntags_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_library_noatuntags_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_library_noatuntags_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/library/noatuntags/Makefile.in.orig Sat Apr 20 03:48:25 2002 -+++ noatun/library/noatuntags/Makefile.in Sat Apr 20 03:48:54 2002 -@@ -295,7 +295,7 @@ lib_LTLIBRARIES = libnoatuntags.la +$OpenBSD: patch-noatun_library_noatuntags_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/library/noatuntags/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/library/noatuntags/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -294,7 +294,7 @@ lib_LTLIBRARIES = libnoatuntags.la libnoatuntags_la_SOURCES = tags.cpp libnoatuntags_la_LDFLAGS = -L$(top_builddir)/noatun/library @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_library_noatuntags_Makefile_in,v 1.1.1.1 2002/04/20 17:08 #>- libnoatuntags_la_METASOURCES = AUTO -@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES = +@@ -307,7 +307,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) libnoatuntags_la_DEPENDENCIES = \ @@ -18,4 +18,4 @@ $OpenBSD: patch-noatun_library_noatuntags_Makefile_in,v 1.1.1.1 2002/04/20 17:08 + $(top_builddir)/noatun/library/libknoatun.la am_libnoatuntags_la_OBJECTS = tags.lo #>- libnoatuntags_la_OBJECTS = $(am_libnoatuntags_la_OBJECTS) - #>+ 5 + #>+ 1 diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_dcopiface_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_dcopiface_Makefile_in index f01ffcd9088..2fce5331c06 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_dcopiface_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_dcopiface_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_modules_dcopiface_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/dcopiface/Makefile.in.orig Sat Apr 20 03:20:13 2002 -+++ noatun/modules/dcopiface/Makefile.in Sat Apr 20 03:23:42 2002 -@@ -297,7 +297,7 @@ kde_module_LTLIBRARIES = noatun_dcopifac +$OpenBSD: patch-noatun_modules_dcopiface_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/dcopiface/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/dcopiface/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -296,7 +296,7 @@ kde_module_LTLIBRARIES = noatun_dcopifac noatun_dcopiface_la_SOURCES=dcopiface.cpp dcopiface_skel.cpp noatun_dcopiface_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_modules_dcopiface_Makefile_in,v 1.1.1.1 2002/04/20 17:08: #>- noatun_dcopiface_la_METASOURCES = AUTO -@@ -311,7 +311,7 @@ CONFIG_CLEAN_FILES = +@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_dcopiface_la_DEPENDENCIES = \ diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_excellent_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_excellent_Makefile_in index 82ca699e6f8..6ecde621e06 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_excellent_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_excellent_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_modules_excellent_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/excellent/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/excellent/Makefile.in Sat Apr 20 03:21:28 2002 -@@ -298,7 +298,7 @@ noatun_excellent_la_SOURCES = noatunui.c +$OpenBSD: patch-noatun_modules_excellent_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/excellent/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/excellent/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -297,7 +297,7 @@ noatun_excellent_la_SOURCES = noatunui.c noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatun_excellent_la_LIBADD = $(LIB_KFILE) \ @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_modules_excellent_Makefile_in,v 1.1.1.1 2002/04/20 17:08: $(top_builddir)/noatun/library/libnoatuncontrols.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -315,7 +315,7 @@ CONFIG_CLEAN_FILES = +@@ -314,7 +314,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_excellent_la_DEPENDENCIES = \ diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_hayes_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_hayes_Makefile_in index c67e547195d..5f4f0067278 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_hayes_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_hayes_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_modules_hayes_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/hayes/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/hayes/Makefile.in Sat Apr 20 03:21:13 2002 -@@ -300,7 +300,7 @@ noatun_hayes_la_SOURCES = branch.cpp \ +$OpenBSD: patch-noatun_modules_hayes_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/hayes/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/hayes/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -299,7 +299,7 @@ noatun_hayes_la_SOURCES = branch.cpp \ noatun_hayes_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_modules_hayes_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 e #>- noatun_hayes_la_METASOURCES = AUTO -@@ -321,7 +321,7 @@ CONFIG_CLEAN_FILES = +@@ -320,7 +320,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_hayes_la_DEPENDENCIES = \ @@ -18,4 +18,4 @@ $OpenBSD: patch-noatun_modules_hayes_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 e + $(top_builddir)/noatun/library/libknoatun.la am_noatun_hayes_la_OBJECTS = branch.lo cmodule.lo playlist.lo window.lo #>- noatun_hayes_la_OBJECTS = $(am_noatun_hayes_la_OBJECTS) - #>+ 5 + #>+ 4 diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_htmlexport_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_htmlexport_Makefile_in index 993f9694442..a9f280ec94c 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_htmlexport_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_htmlexport_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-noatun_modules_htmlexport_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/htmlexport/Makefile.in.orig Sat Apr 20 03:20:13 2002 -+++ noatun/modules/htmlexport/Makefile.in Sat Apr 20 03:23:08 2002 -@@ -296,7 +296,7 @@ noatun_htmlexport_la_SOURCES = htmlexpor +$OpenBSD: patch-noatun_modules_htmlexport_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/htmlexport/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/htmlexport/Makefile.in Sun Dec 22 14:31:58 2002 +@@ -295,7 +295,7 @@ noatun_htmlexport_la_SOURCES = htmlexpor noinst_HEADERS = htmlexport.h noatun_htmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libknoatun.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = +@@ -309,7 +309,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_htmlexport_la_DEPENDENCIES = \ @@ -18,4 +18,4 @@ $OpenBSD: patch-noatun_modules_htmlexport_Makefile_in,v 1.1.1.1 2002/04/20 17:08 + $(top_builddir)/noatun/library/libknoatun.la am_noatun_htmlexport_la_OBJECTS = htmlexport.lo #>- noatun_htmlexport_la_OBJECTS = $(am_noatun_htmlexport_la_OBJECTS) - #>+ 5 + #>+ 1 diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_infrared_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_infrared_Makefile_in index 15f33846c04..14770f474a0 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_infrared_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_infrared_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-noatun_modules_infrared_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/infrared/Makefile.in.orig Sat Apr 20 03:20:13 2002 -+++ noatun/modules/infrared/Makefile.in Sat Apr 20 03:23:02 2002 -@@ -296,7 +296,7 @@ noatun_infrared_la_SOURCES = infrared.cp +$OpenBSD: patch-noatun_modules_infrared_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/infrared/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/infrared/Makefile.in Sun Dec 22 14:31:49 2002 +@@ -295,7 +295,7 @@ noatun_infrared_la_SOURCES = infrared.cp noinst_HEADERS = infrared.h lirc.h irprefs.h noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libknoatun.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = +@@ -309,7 +309,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_infrared_la_DEPENDENCIES = \ @@ -18,4 +18,4 @@ $OpenBSD: patch-noatun_modules_infrared_Makefile_in,v 1.1.1.1 2002/04/20 17:08:4 + $(top_builddir)/noatun/library/libknoatun.la am_noatun_infrared_la_OBJECTS = infrared.lo lirc.lo irprefs.lo #>- noatun_infrared_la_OBJECTS = $(am_noatun_infrared_la_OBJECTS) - #>+ 5 + #>+ 4 diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_kaiman_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_kaiman_Makefile_in index a63cf099e04..0710430c0ca 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_kaiman_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_kaiman_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-noatun_modules_kaiman_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/kaiman/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/kaiman/Makefile.in Sat Apr 20 03:22:18 2002 -@@ -301,7 +301,7 @@ noatun_kaiman_la_SOURCES = \ +$OpenBSD: patch-noatun_modules_kaiman_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/kaiman/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/kaiman/Makefile.in Sun Dec 22 14:31:34 2002 +@@ -300,7 +300,7 @@ noatun_kaiman_la_SOURCES = \ noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libknoatun.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -321,7 +321,7 @@ CONFIG_CLEAN_FILES = +@@ -320,7 +320,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_kaiman_la_DEPENDENCIES = \ diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_keyz_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_keyz_Makefile_in index 8899f444827..d2b46e9a8a6 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_keyz_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_keyz_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_modules_keyz_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/keyz/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/keyz/Makefile.in Sat Apr 20 03:20:59 2002 -@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = noatun_keyz.la +$OpenBSD: patch-noatun_modules_keyz_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/keyz/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/keyz/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_keyz.la noatun_keyz_la_SOURCES = keyz.cpp noatun_keyz_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_modules_keyz_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 es #>- noatun_keyz_la_METASOURCES = AUTO -@@ -309,7 +309,7 @@ CONFIG_CLEAN_FILES = +@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_keyz_la_DEPENDENCIES = \ @@ -18,4 +18,4 @@ $OpenBSD: patch-noatun_modules_keyz_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 es + $(top_builddir)/noatun/library/libknoatun.la am_noatun_keyz_la_OBJECTS = keyz.lo #>- noatun_keyz_la_OBJECTS = $(am_noatun_keyz_la_OBJECTS) - #>+ 5 + #>+ 1 diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_kjofol-skin_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_kjofol-skin_Makefile_in index 5725b5783d3..49019568e9e 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_kjofol-skin_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_kjofol-skin_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-noatun_modules_kjofol-skin_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/kjofol-skin/Makefile.in.orig Sat Apr 20 03:20:13 2002 -+++ noatun/modules/kjofol-skin/Makefile.in Sat Apr 20 03:22:42 2002 -@@ -311,7 +311,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj +$OpenBSD: patch-noatun_modules_kjofol-skin_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/kjofol-skin/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/kjofol-skin/Makefile.in Sun Dec 22 14:31:43 2002 +@@ -310,7 +310,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libknoatun.la \ - $(LIB_KIO) -lm \ - $(top_builddir)/arts/modules/libartsmodules.la + $(LIB_KIO) -lm \ + $(top_builddir)/arts/modules/libartsmodules.la -@@ -332,7 +332,7 @@ CONFIG_CLEAN_FILES = +@@ -331,7 +331,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_kjofol_la_DEPENDENCIES = \ diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_liszt_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_liszt_Makefile_in index 4e6c62f756a..1c8acb1cb58 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_liszt_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_liszt_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-noatun_modules_liszt_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/liszt/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/liszt/Makefile.in Sat Apr 20 03:21:21 2002 -@@ -309,7 +309,7 @@ noatun_liszt_la_SOURCES = \ +$OpenBSD: patch-noatun_modules_liszt_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/liszt/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/liszt/Makefile.in Sun Dec 22 14:31:04 2002 +@@ -308,7 +308,7 @@ Liszt.cpp noatun_liszt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatun_liszt_la_LIBADD = \ -- $(top_builddir)/noatun/library/libnoatun.la \ -+ $(top_builddir)/noatun/library/libknoatun.la \ - $(LIB_KFILE) -lqtmcop -lkmedia2_idl -lsoundserver_idl +- $(top_builddir)/noatun/library/libnoatun.la \ ++ $(top_builddir)/noatun/library/libknoatun.la \ + $(LIB_KFILE) -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -339,7 +339,7 @@ CONFIG_CLEAN_FILES = +@@ -338,7 +338,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_liszt_la_DEPENDENCIES = \ diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_marquis_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_marquis_Makefile_in index 2d20b0b3e0e..46f49bd3926 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_marquis_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_marquis_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-noatun_modules_marquis_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/marquis/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/marquis/Makefile.in Sat Apr 20 03:21:36 2002 -@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = noatun_marquis. +$OpenBSD: patch-noatun_modules_marquis_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/marquis/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/marquis/Makefile.in Sun Dec 22 14:31:16 2002 +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_marquis. noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp noatun_marquis_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libknoatun.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -311,7 +311,7 @@ CONFIG_CLEAN_FILES = +@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_marquis_la_DEPENDENCIES = \ @@ -18,4 +18,4 @@ $OpenBSD: patch-noatun_modules_marquis_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 + $(top_builddir)/noatun/library/libknoatun.la am_noatun_marquis_la_OBJECTS = marquis.lo plugin.lo #>- noatun_marquis_la_OBJECTS = $(am_noatun_marquis_la_OBJECTS) - #>+ 5 + #>+ 4 diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_metatag_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_metatag_Makefile_in index d8eb84682ae..c13909382e8 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_metatag_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_metatag_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_modules_metatag_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/metatag/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/metatag/Makefile.in Sat Apr 20 03:21:43 2002 -@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = noatun_metatag. +$OpenBSD: patch-noatun_modules_metatag_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/metatag/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/metatag/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_metatag. noatun_metatag_la_SOURCES = metatag.cpp edit.cpp noatun_metatag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_modules_metatag_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 $(top_builddir)/noatun/library/noatuntags/libnoatuntags.la -@@ -311,7 +311,7 @@ CONFIG_CLEAN_FILES = +@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_metatag_la_DEPENDENCIES = \ diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_monoscope_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_monoscope_Makefile_in index 01ed81ade32..b63116b5d89 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_monoscope_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_monoscope_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_modules_monoscope_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/monoscope/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/monoscope/Makefile.in Sat Apr 20 03:21:06 2002 -@@ -296,7 +296,7 @@ noatun_monoscope_la_SOURCES = monoscope. +$OpenBSD: patch-noatun_modules_monoscope_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/monoscope/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/monoscope/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -295,7 +295,7 @@ noatun_monoscope_la_SOURCES = monoscope. #prefs.cpp noatun_monoscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_modules_monoscope_Makefile_in,v 1.1.1.1 2002/04/20 17:08: #>- noatun_monoscope_la_METASOURCES = AUTO -@@ -311,7 +311,7 @@ CONFIG_CLEAN_FILES = +@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_monoscope_la_DEPENDENCIES = \ @@ -18,4 +18,4 @@ $OpenBSD: patch-noatun_modules_monoscope_Makefile_in,v 1.1.1.1 2002/04/20 17:08: + $(top_builddir)/noatun/library/libknoatun.la am_noatun_monoscope_la_OBJECTS = monoscope.lo #>- noatun_monoscope_la_OBJECTS = $(am_noatun_monoscope_la_OBJECTS) - #>+ 5 + #>+ 1 diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_net_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_net_Makefile_in index a32a4f27d8e..bfcd42d824a 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_net_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_net_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_modules_net_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/net/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/net/Makefile.in Sat Apr 20 03:20:50 2002 -@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = noatun_net.la +$OpenBSD: patch-noatun_modules_net_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/net/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/net/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_net.la noatun_net_la_SOURCES = net.cpp noatun_net_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_modules_net_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 esp #>- noatun_net_la_METASOURCES = AUTO -@@ -308,7 +308,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -18,4 +18,4 @@ $OpenBSD: patch-noatun_modules_net_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 esp +noatun_net_la_DEPENDENCIES = $(top_builddir)/noatun/library/libknoatun.la am_noatun_net_la_OBJECTS = net.lo #>- noatun_net_la_OBJECTS = $(am_noatun_net_la_OBJECTS) - #>+ 5 + #>+ 1 diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_noatunui_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_noatunui_Makefile_in index 87355824080..916dd4dd3f2 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_noatunui_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_noatunui_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-noatun_modules_noatunui_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/noatunui/Makefile.in.orig Sat Apr 20 03:20:13 2002 -+++ noatun/modules/noatunui/Makefile.in Sat Apr 20 03:23:35 2002 -@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = noatun_ui.la +$OpenBSD: patch-noatun_modules_noatunui_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/noatunui/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/noatunui/Makefile.in Sun Dec 22 14:32:10 2002 +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_ui.la noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp noatun_ui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libknoatun.la \ - $(top_builddir)/noatun/library/libnoatuncontrols.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + $(top_builddir)/noatun/library/libnoatuncontrols.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -311,7 +311,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -310,7 +310,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_splitplaylist_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_splitplaylist_Makefile_in index c21c746aa45..bba1ab4f0a4 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_splitplaylist_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_splitplaylist_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_modules_splitplaylist_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/splitplaylist/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/splitplaylist/Makefile.in Sat Apr 20 03:21:50 2002 -@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = noatun_splitpla +$OpenBSD: patch-noatun_modules_splitplaylist_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/splitplaylist/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/splitplaylist/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_splitpla noatun_splitplaylist_la_SOURCES = splitplaylist.cpp playlist.cpp view.cpp find.cpp noatun_splitplaylist_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_modules_splitplaylist_Makefile_in,v 1.1.1.1 2002/04/20 17 #>- noatun_splitplaylist_la_METASOURCES = AUTO -@@ -309,7 +309,7 @@ CONFIG_CLEAN_FILES = +@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_splitplaylist_la_DEPENDENCIES = \ diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_systray_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_systray_Makefile_in index 74d16da1ddd..8ad45df5e43 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_systray_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_systray_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-noatun_modules_systray_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/systray/Makefile.in.orig Sat Apr 20 03:20:12 2002 -+++ noatun/modules/systray/Makefile.in Sat Apr 20 03:21:59 2002 -@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = noatun_systray. +$OpenBSD: patch-noatun_modules_systray_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/systray/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/systray/Makefile.in Sun Dec 22 14:31:25 2002 +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_systray. noatun_systray_la_SOURCES = systray.cpp noatunui.cpp kitsystemtray.cpp cmodule.cpp noatun_systray_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libknoatun.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -314,7 +314,7 @@ CONFIG_CLEAN_FILES = +@@ -313,7 +313,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_systray_la_DEPENDENCIES = \ diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_voiceprint_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_voiceprint_Makefile_in index d4ec88d406d..dcd1eaba8c6 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_voiceprint_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_voiceprint_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-noatun_modules_voiceprint_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/voiceprint/Makefile.in.orig Sat Apr 20 03:20:13 2002 -+++ noatun/modules/voiceprint/Makefile.in Sat Apr 20 03:22:48 2002 -@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = noatun_voicepri +$OpenBSD: patch-noatun_modules_voiceprint_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/voiceprint/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/voiceprint/Makefile.in Sun Dec 22 13:52:21 2002 +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_voicepri noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp noatun_voiceprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -10,7 +10,7 @@ $OpenBSD: patch-noatun_modules_voiceprint_Makefile_in,v 1.1.1.1 2002/04/20 17:08 #>- noatun_voiceprint_la_METASOURCES = AUTO -@@ -309,7 +309,7 @@ CONFIG_CLEAN_FILES = +@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_voiceprint_la_DEPENDENCIES = \ @@ -18,4 +18,4 @@ $OpenBSD: patch-noatun_modules_voiceprint_Makefile_in,v 1.1.1.1 2002/04/20 17:08 + $(top_builddir)/noatun/library/libknoatun.la am_noatun_voiceprint_la_OBJECTS = voiceprint.lo prefs.lo #>- noatun_voiceprint_la_OBJECTS = $(am_noatun_voiceprint_la_OBJECTS) - #>+ 5 + #>+ 4 diff --git a/x11/kde/multimedia3/patches/patch-noatun_modules_winskin_Makefile_in b/x11/kde/multimedia3/patches/patch-noatun_modules_winskin_Makefile_in index 378607d726a..5de0d8855aa 100644 --- a/x11/kde/multimedia3/patches/patch-noatun_modules_winskin_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-noatun_modules_winskin_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-noatun_modules_winskin_Makefile_in,v 1.1.1.1 2002/04/20 17:08:42 espie Exp $ ---- noatun/modules/winskin/Makefile.in.orig Sat Apr 20 03:20:13 2002 -+++ noatun/modules/winskin/Makefile.in Sat Apr 20 03:23:23 2002 -@@ -345,7 +345,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar - -module -avoid-version -no-undefined +$OpenBSD: patch-noatun_modules_winskin_Makefile_in,v 1.2 2002/12/23 14:22:32 espie Exp $ +--- noatun/modules/winskin/Makefile.in.orig Sat Dec 21 08:07:53 2002 ++++ noatun/modules/winskin/Makefile.in Sun Dec 22 14:32:04 2002 +@@ -344,7 +344,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar + -module -avoid-version -no-undefined -noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \ +noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libknoatun.la \ - $(WINSKINVIS_LIB) + $(WINSKINVIS_LIB) -@@ -357,7 +357,7 @@ CONFIG_CLEAN_FILES = +@@ -356,7 +356,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_winskin_la_DEPENDENCIES = \ diff --git a/x11/kde/network3/Makefile b/x11/kde/network3/Makefile index 62498fa895b..513497e56cf 100644 --- a/x11/kde/network3/Makefile +++ b/x11/kde/network3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.10 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2002/12/23 14:22:33 espie Exp $ COMMENT= "X11 toolkit, network applications" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdenetwork-${VERSION} LIB_DEPENDS= kdecore.4,DCOP,kabc,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kparts,kspell,vcard::x11/kde/libs3 diff --git a/x11/kde/network3/distinfo b/x11/kde/network3/distinfo index 9580746ea5a..12ccb74a29f 100644 --- a/x11/kde/network3/distinfo +++ b/x11/kde/network3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdenetwork-3.0.5.tar.bz2) = 504032bceeef0dfa9ff02aed0faf795d -RMD160 (kde/kdenetwork-3.0.5.tar.bz2) = ba4b15a05b4d1c0aee6216314e59bbebc7b7cb95 -SHA1 (kde/kdenetwork-3.0.5.tar.bz2) = b37c26235aa1ae8f83763ffaa0dea1c2bd6465a2 +MD5 (kde/kdenetwork-3.0.5a.tar.bz2) = 527973059f0b880e714f8a4eae0d18e5 +RMD160 (kde/kdenetwork-3.0.5a.tar.bz2) = f7ad43450f54ea0bf71c837661cc693b62643df2 +SHA1 (kde/kdenetwork-3.0.5a.tar.bz2) = 325800806aa027073b7f0523140ade65e86614f1 diff --git a/x11/kde/toys3/Makefile b/x11/kde/toys3/Makefile index e6300fad017..2c1720187b2 100644 --- a/x11/kde/toys3/Makefile +++ b/x11/kde/toys3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2002/12/02 16:27:21 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2002/12/23 14:22:33 espie Exp $ COMMENT= "some useless kde applications" CATEGORIES= x11 x11/kde games -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdetoys-${VERSION} LIB_DEPENDS= kdecore.4,DCOP,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kparts,kscreensaver::x11/kde/libs3 diff --git a/x11/kde/toys3/distinfo b/x11/kde/toys3/distinfo index f41059f3314..e1c35ece25e 100644 --- a/x11/kde/toys3/distinfo +++ b/x11/kde/toys3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdetoys-3.0.5.tar.bz2) = 3974bb197dd39fbd609405b9159e6044 -RMD160 (kde/kdetoys-3.0.5.tar.bz2) = bb27e1a22870a526982bfeee1efc73e5d62f9feb -SHA1 (kde/kdetoys-3.0.5.tar.bz2) = e31c655ee76f9b43e089b9e400e7f075e1a4b30f +MD5 (kde/kdetoys-3.0.5a.tar.bz2) = 004e9dc893dfd2c7f526409b50ae9293 +RMD160 (kde/kdetoys-3.0.5a.tar.bz2) = 2b9393aa20367560a312be002533725679950789 +SHA1 (kde/kdetoys-3.0.5a.tar.bz2) = 06df8464b2b0c9ed6a9a65b1fa0e2c3bccfd1e60 diff --git a/x11/kde/utils3/Makefile b/x11/kde/utils3/Makefile index 39f53d1e846..72e71431d02 100644 --- a/x11/kde/utils3/Makefile +++ b/x11/kde/utils3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.9 2002/12/02 16:27:22 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2002/12/23 14:22:33 espie Exp $ COMMENT= "X11 toolkit, utilities" CATEGORIES= x11 x11/kde -VERSION= 3.0.5 +VERSION= 3.0.5a DISTNAME= kdeutils-${VERSION} LIB_DEPENDS= kdecore.4,DCOP,kabc,kdefakes,kdefx,kdeprint,kdesu,kdeui,kio,kparts,kspell,vcard::x11/kde/libs3 diff --git a/x11/kde/utils3/distinfo b/x11/kde/utils3/distinfo index fc5ffa916e1..814b7909169 100644 --- a/x11/kde/utils3/distinfo +++ b/x11/kde/utils3/distinfo @@ -1,3 +1,3 @@ -MD5 (kde/kdeutils-3.0.5.tar.bz2) = 104620498429632d1489f93b241436a2 -RMD160 (kde/kdeutils-3.0.5.tar.bz2) = e637cd95eb3cca05feae9065a2a94cc53ed364c7 -SHA1 (kde/kdeutils-3.0.5.tar.bz2) = bd4db4ace38a05064bcc5532640ff9c00313f735 +MD5 (kde/kdeutils-3.0.5a.tar.bz2) = 68ee0f1259bf7173273a0e19ae06f700 +RMD160 (kde/kdeutils-3.0.5a.tar.bz2) = 39706186ff56de1aa987a33dbac6a59229d681c8 +SHA1 (kde/kdeutils-3.0.5a.tar.bz2) = 63104afb1686c5eaed7939e1bd8b6ec6b2cda7fd