Fix build with the kde option.

5 files changed, 29 insertions, 27 deletions

diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo
index 75d25a5ce8d..b4e8913596e 100644
--- a/misc/celestia/distinfo
+++ b/misc/celestia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2006/03/25 18:10:08 joerg Exp $
+$NetBSD: distinfo,v 1.11 2006/06/14 12:37:52 markd Exp $
 
 SHA1 (celestia-1.4.1.tar.gz) = 37863498c43d3078b41027706bfa033bccd949a9
 RMD160 (celestia-1.4.1.tar.gz) = c66c2540e329613dace12e5b12b2dae2a4c679e0
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = e749cc8a8bd9be9dd10b4f53e6d7878875a2aa57
 SHA1 (patch-ac) = 22e1ed46c832f97a4f2f20b5b6d6255469ea6b90
 SHA1 (patch-ad) = f7d9d5c3d80385eaba721045ea619f15fa3af326
 SHA1 (patch-ae) = a7ac58087cc366119f4ac5b193b49dc87ecc261c
-SHA1 (patch-af) = df2dae0d054a475ee98286281780037f088f07bc
-SHA1 (patch-ag) = 16a8ae890c82bf1fa4f89953a5ebfc1c07ec1491
 SHA1 (patch-ah) = 90f20cbbf4a8f187ea39de23f0e5b13aa4e10fb6
 SHA1 (patch-aj) = 1ef7a10260a3b1476392c4cae17081ab0e7771b4
+SHA1 (patch-ak) = 20506d8b2f7c8c9ff778e0844dc999b0e497d644
+SHA1 (patch-al) = f998727c986145d3f298295bed1760221a686245
diff --git a/misc/celestia/patches/patch-af b/misc/celestia/patches/patch-af
deleted file mode 100644
index 0ff5db9ab16..00000000000
--- a/misc/celestia/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/11/27 13:45:25 markd Exp $
-
---- src/celestia/kde/data/celestia.desktop.orig	2003-11-28 02:03:58.000000000 +1300
-+++ src/celestia/kde/data/celestia.desktop
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Name=Celestia
- Comment=Celestia
--Exec=celestia %f
-+Exec=kcelestia %f
- Terminal=false
- Icon=celestia.png
- MimeType=application/x-celestia-script
diff --git a/misc/celestia/patches/patch-ag b/misc/celestia/patches/patch-ag
deleted file mode 100644
index 77a7c7f0894..00000000000
--- a/misc/celestia/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/11/27 13:45:25 markd Exp $
-
---- src/celestia/kde/data/celestia.protocol.orig	2003-11-28 02:04:06.000000000 +1300
-+++ src/celestia/kde/data/celestia.protocol
-@@ -1,5 +1,5 @@
- [Protocol]
--exec=celestia %u
-+exec=kcelestia %u
- protocol=cel
- input=none
- output=none
diff --git a/misc/celestia/patches/patch-ak b/misc/celestia/patches/patch-ak
new file mode 100644
index 00000000000..a20686db065
--- /dev/null
+++ b/misc/celestia/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2006/06/14 12:37:53 markd Exp $
+
+--- src/celestia/Makefile.in.orig	2006-06-13 00:08:44.000000000 +1200
++++ src/celestia/Makefile.in
+@@ -300,7 +300,7 @@ INCLUDES = -I..
+ 
+ localedir = $(datadir)/locale
+ @ENABLE_KDE_TRUE@celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+-@ENABLE_KDE_TRUE@                  $(LIBSOCKET) kde/libkdegui.a
++@ENABLE_KDE_TRUE@                  $(LIBSOCKET) $(LIBINTL) kde/libkdegui.a
+ 
+ @ENABLE_KDE_TRUE@celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ @ENABLE_GTK_TRUE@celestiaGTKLIBS = gtk/libgtkgui.a
diff --git a/misc/celestia/patches/patch-al b/misc/celestia/patches/patch-al
new file mode 100644
index 00000000000..7ac0301d678
--- /dev/null
+++ b/misc/celestia/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2006/06/14 12:37:53 markd Exp $
+
+--- src/celestia/kde/doc/celestia/Makefile.in.orig	2006-02-16 10:53:43.000000000 +1300
++++ src/celestia/kde/doc/celestia/Makefile.in
+@@ -642,7 +642,7 @@ install-docs: docs-am install-nls
+ 	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/; \
+ 	fi
+ 	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common
+-	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common
++	$(LN_S) $(kde_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common
+ 
+ uninstall-docs:
+ 	-rm -rf $(kde_htmldir)/$(KDE_LANG)/celestia