[patch] astro/sunclock - to version 3.54.1

	astro/sunclock isn't fetchable anymore, upgrade to 3.54.1
	will resolve it.

PR:		ports/89524
Submitted by:	Edwin Groothuis <edwin@mavetju.org>
Approved by:	maitnainer timeout

5 files changed, 65 insertions, 11 deletions

diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index 07462e9700e..a9a608f0fc0 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	sunclock
-PORTVERSION=	3.53
+PORTVERSION=	3.54.1
 CATEGORIES=	astro x11-clocks
 MASTER_SITES=	http://frmas.free.fr/files/
 
@@ -20,7 +20,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 USE_BZIP2=	yes
 USE_XPM=	yes
 USE_IMAKE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
 
-MAN1=		sunclock.1
+MAN1=		sunclock.1 emx.1
 
 .include <bsd.port.mk>
diff --git a/astro/sunclock/distinfo b/astro/sunclock/distinfo
index d3959695530..5c2a89e3a04 100644
--- a/astro/sunclock/distinfo
+++ b/astro/sunclock/distinfo
@@ -1,2 +1,3 @@
-MD5 (sunclock-3.53.tar.bz2) = 5711ada76d8e8c86cb688746f1114669
-SIZE (sunclock-3.53.tar.bz2) = 563776
+MD5 (sunclock-3.54.1.tar.bz2) = 2ac6e715a048d848ff67baf2af1cd9d0
+SHA256 (sunclock-3.54.1.tar.bz2) = 5267312cd146e9aeeada81866f0584511b893e1697154a9296834e7b9a5af4eb
+SIZE (sunclock-3.54.1.tar.bz2) = 602245
diff --git a/astro/sunclock/files/patch-aa b/astro/sunclock/files/patch-aa
index fe9c8c87545..cbe7021bf6c 100644
--- a/astro/sunclock/files/patch-aa
+++ b/astro/sunclock/files/patch-aa
@@ -1,6 +1,6 @@
---- Imakefile.orig	Wed Aug 25 07:00:29 2004
-+++ Imakefile	Sun Nov 21 13:48:06 2004
-@@ -1,15 +1,17 @@
+--- Imakefile.orig	Tue Aug  2 00:13:59 2005
++++ Imakefile	Fri Nov 25 18:21:34 2005
+@@ -1,18 +1,18 @@
  XCOMM Should install to /usr or /usr/local ??
 -DESTDIR=/usr
 +DESTDIR=${PREFIX}
@@ -16,12 +16,14 @@
  XCOMM Name of share subdirectory of DESTDIR:
  SHAREDIR=/share/sunclock
  
+ 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 Compile options:
- XCOMM
-@@ -38,13 +40,13 @@
+@@ -42,13 +42,13 @@
  #CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
  
  # Solaris, Linux
@@ -42,7 +44,7 @@
  #endif
  
  SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
-@@ -52,7 +54,7 @@
+@@ -56,7 +56,7 @@
  OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \
       readvmf.o readxpm.o readgif.o readjpeg.o readpng.o
  LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \
diff --git a/astro/sunclock/files/patch-editkit__Imakefile b/astro/sunclock/files/patch-editkit__Imakefile
new file mode 100644
index 00000000000..88628876633
--- /dev/null
+++ b/astro/sunclock/files/patch-editkit__Imakefile
@@ -0,0 +1,45 @@
+--- 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
+ 
diff --git a/astro/sunclock/pkg-plist b/astro/sunclock/pkg-plist
index 8f992f3f6c8..bd863e5516e 100644
--- a/astro/sunclock/pkg-plist
+++ b/astro/sunclock/pkg-plist
@@ -1,4 +1,5 @@
 bin/sunclock
+bin/emx
 share/sunclock/Sunclockrc
 share/sunclock/earthmaps/vmf/landwater.vmf
 share/sunclock/earthmaps/vmf/timezones.vmf
@@ -11,7 +12,11 @@ share/sunclock/i18n/Sunclock.nl
 share/sunclock/i18n/Sunclock.no
 share/sunclock/i18n/Sunclock.pl
 share/sunclock/i18n/Sunclock.se
+share/editkit/rc.common
+share/editkit/emxrc
+share/editkit/README
 @dirrm share/sunclock/i18n
 @dirrm share/sunclock/earthmaps/vmf
 @dirrm share/sunclock/earthmaps
 @dirrm share/sunclock
+@dirrm share/editkit