2 files changed, 21 insertions, 47 deletions

diff --git a/astro/sunclock/files/patch-aa b/astro/sunclock/files/patch-Imakefile
index cbe7021bf6ca..16d095369c03 100644
--- a/astro/sunclock/files/patch-aa
+++ b/astro/sunclock/files/patch-Imakefile
@@ -1,5 +1,5 @@
---- Imakefile.orig	Tue Aug  2 00:13:59 2005
-+++ Imakefile	Fri Nov 25 18:21:34 2005
+--- Imakefile.orig	Sun Jun 18 23:58:50 2006
++++ Imakefile	Wed Jul 26 14:47:03 2006
 @@ -1,18 +1,18 @@
  XCOMM Should install to /usr or /usr/local ??
 -DESTDIR=/usr
@@ -53,3 +53,22 @@
  DEPLIBS=		# I don't know what I'm doing, and I hate imake!
  
  ComplexProgramTarget(sunclock)
+@@ -64,7 +64,7 @@
+ all::
+ 	cd editkit ; xmkmf ; make emx \
+           DESTDIR=$(DESTDIR) \
+-	  BINDIR=$(SHAREDIR)/bin \
++	  BINDIR=/bin \
+ 	  MANDIR=$(SHAREDIR)/editkit \
+ 	  SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
+ 
+@@ -78,8 +78,7 @@
+ 	cd i18n ; rm -f *~ ; cp -f Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n
+ 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
+ 	cd vmf ; rm -f *~ ; cp -f * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
+-	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin
+-	install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/bin
++	install -c -s editkit/emx $(DESTDIR)/bin
+ 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/editkit
+ 	cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \
+ 		$(DESTDIR)$(SHAREDIR)/editkit
diff --git a/astro/sunclock/files/patch-editkit__Imakefile b/astro/sunclock/files/patch-editkit__Imakefile
deleted file mode 100644
index 886288766336..000000000000
--- a/astro/sunclock/files/patch-editkit__Imakefile
+++ /dev/null
@@ -1,45 +0,0 @@
---- editkit/Imakefile.orig	Tue Aug  2 00:14:15 2005
-+++ editkit/Imakefile	Fri Nov 25 22:47:48 2005
-@@ -1,20 +1,20 @@
- XCOMM Should install to /usr or /usr/local ??
- #ifndef DESTDIR
--DESTDIR=/usr
-+DESTDIR=${PREFIX}
- #endif
- 
- XCOMM Name of man subdirectory of DESTDIR:
--MANDIR=/X11R6/man/man1
-+MANDIR=/man/man1
- 
- XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just  /bin
--BINDIR=/X11R6/bin
-+BINDIR=/bin
- 
- XCOMM Name of share subdirectory of DESTDIR_XRMAP:
- SHAREDIR=$(DESTDIR)/share/editkit
- 
- XCOMM Name of DOCDIR's subdirectories of DESTDIR:
- DOCDIR=/X11R6/lib/X11/doc 
--DOCHTMLDIR=/X11R6/lib/X11/doc/html
-+DOCHTMLDIR=/lib/X11/doc/html
- 
- XCOMM
- XCOMM Normally -- except for new architectures -- you should be done there.
-@@ -23,7 +23,7 @@
- XCOMM Compile options:
- XCOMM
- 
--CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
-+CFLAGS += -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
- 
- LOCAL_LIBRARIES=$(XLIB)
- DEPLIBS=		# I don't know what I'm doing, and I hate imake!
-@@ -38,8 +38,6 @@
- 	$(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c
- 
- install.man::
--	if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \
--	   then gzip -f $(DESTDIR)$(MANDIR)/emx.1 ; fi
- 	if [ -r $(DESTDIR)$(MANDIR)/emx.1x.gz ] ; \
- 	   then gzip -f $(DESTDIR)$(MANDIR)/emx.1x ; fi
-