diff options
author | skrll <skrll@pkgsrc.org> | 2003-01-20 10:03:40 +0000 |
---|---|---|
committer | skrll <skrll@pkgsrc.org> | 2003-01-20 10:03:40 +0000 |
commit | 55966f3f8441576d4c8ac402e42f81a73587c4fa (patch) | |
tree | 281d4eb4b00f6fc47b7b11e966102e98cddc72a2 /graphics | |
parent | f05976d42617e7ea6d8f6f57b9553b5b0aa6ecad (diff) | |
download | pkgsrc-55966f3f8441576d4c8ac402e42f81a73587c4fa.tar.gz |
The result of my recent KDE fiddlings
- Build all packages with a --disable-static libtool. This is how the
packages should be built and means that we don't get a load of useless
static libraries.
- Use x11/kde3/files/foo_main.cpp instead of creating N copies with
patches.
- Some other PLIST fixes
- Fix PR 19848. kspell doesn't find dictionaries.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/kdegraphics3/Makefile | 8 | ||||
-rw-r--r-- | graphics/kdegraphics3/PLIST | 17 | ||||
-rw-r--r-- | graphics/kdegraphics3/distinfo | 4 | ||||
-rw-r--r-- | graphics/kdegraphics3/patches/patch-ae | 33 | ||||
-rw-r--r-- | graphics/kdegraphics3/patches/patch-aj | 33 |
5 files changed, 9 insertions, 86 deletions
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index c90278e4d47..bdc1c45cc5e 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/01/02 09:12:25 skrll Exp $ +# $NetBSD: Makefile,v 1.12 2003/01/20 10:03:49 skrll Exp $ DISTNAME= kdegraphics-3.0.5a CATEGORIES= graphics @@ -16,6 +16,12 @@ CONFIGURE_ARGS+= --without-kamera # requires gPhoto2, gpio # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} +FOO_MAIN_FILES= \ + kview/kview_main.cpp \ + kuickshow/src/kuickshow_main.cpp + +.include "../../x11/kde3/Makefile.foo_main" + #.include "../../graphics/tiff/buildlink2.mk" .include "../../graphics/imlib/buildlink2.mk" .include "../../x11/kde3/buildlink2.mk" diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST index b3a58464808..736ac2f1ae2 100644 --- a/graphics/kdegraphics3/PLIST +++ b/graphics/kdegraphics3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/28 07:15:28 skrll Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/01/20 10:03:49 skrll Exp $ bin/kcolorchooser bin/kcoloredit bin/kdvi @@ -13,55 +13,40 @@ bin/kuickshow bin/kview bin/kviewshell include/kmultipageInterface.h -lib/kcolorchooser.a lib/kcolorchooser.la lib/kcolorchooser.so -lib/kde3/kfile_pdf.a lib/kde3/kfile_pdf.la lib/kde3/kfile_pdf.so -lib/kde3/kfile_png.a lib/kde3/kfile_png.la lib/kde3/kfile_png.so -lib/kde3/kfile_ps.a lib/kde3/kfile_ps.la lib/kde3/kfile_ps.so -lib/kuickshow.a lib/kuickshow.la lib/kuickshow.so -lib/kview.a lib/kview.la lib/kview.so -lib/libkdvi.a lib/libkdvi.la lib/libkdvi.so -lib/libkfax.a lib/libkfax.la lib/libkfax.so -lib/libkghostview.a lib/libkghostview.la lib/libkghostview.so -lib/libkmultipage.a lib/libkmultipage.la lib/libkmultipage.so lib/libkmultipage.so.0 lib/libkmultipage.so.0.0 -lib/libkpagetest.a lib/libkpagetest.la lib/libkpagetest.so -lib/libkuickshow_main.a lib/libkuickshow_main.la lib/libkuickshow_main.so lib/libkuickshow_main.so.0 lib/libkuickshow_main.so.0.0 -lib/libkview_main.a lib/libkview_main.la lib/libkview_main.so lib/libkview_main.so.0 lib/libkview_main.so.0.0 -lib/libkviewerpart.a lib/libkviewerpart.la lib/libkviewerpart.so -lib/libkviewpart.a lib/libkviewpart.la lib/libkviewpart.so share/doc/kde/HTML/en/kcoloredit/common diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index 833197ed8ac..e3bc59d4931 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2003/01/02 09:12:25 skrll Exp $ +$NetBSD: distinfo,v 1.6 2003/01/20 10:03:49 skrll Exp $ SHA1 (kdegraphics-3.0.5a.tar.bz2) = 2288b4ee8ce80ef8103baa3783749655fd9e19a5 Size (kdegraphics-3.0.5a.tar.bz2) = 2664922 bytes @@ -6,9 +6,7 @@ SHA1 (patch-aa) = 6abaca67ea4d0fa0a5f9ac9126adb78cc15bc287 SHA1 (patch-ab) = 2797a41da3c39cca6d39369bba767728f973e245 SHA1 (patch-ac) = 64cd943b954af8f0b2b8875f56a43ec6d175f5c7 SHA1 (patch-ad) = d66a8749a0c7c6ac76ba2e196f1bd6bb94d5f66a -SHA1 (patch-ae) = f9ff03ea8e1ff92126312ef28e5d5df5a17b8e57 SHA1 (patch-af) = 9dd124174938f41124b98540da3d3548ebedbb48 SHA1 (patch-ag) = 81c4a846763534c9fe3366bf8d571208d337e2c4 SHA1 (patch-ah) = 551a85ead5c295e9342134478062abfb9700b4d4 SHA1 (patch-ai) = 78e82154d831918f7ebe6d4a1d89b5cb208b57f1 -SHA1 (patch-aj) = 907f78831601897aa12de00f07c2978d09b72ad5 diff --git a/graphics/kdegraphics3/patches/patch-ae b/graphics/kdegraphics3/patches/patch-ae deleted file mode 100644 index 2fff8da0bab..00000000000 --- a/graphics/kdegraphics3/patches/patch-ae +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/06/05 08:58:03 skrll Exp $ - ---- kview/kview_main.cpp.orig Wed Jun 5 09:01:42 2002 -+++ kview/kview_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/graphics/kdegraphics3/patches/patch-aj b/graphics/kdegraphics3/patches/patch-aj deleted file mode 100644 index ed507540dbb..00000000000 --- a/graphics/kdegraphics3/patches/patch-aj +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2002/08/28 07:15:31 skrll Exp $ - ---- kuickshow/src/kuickshow_main.cpp.orig Tue Aug 27 21:04:50 2002 -+++ kuickshow/src/kuickshow_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} |