ports/89524: [patch] astro/sunclock - to version 3.54.1

[Edwin Groothuis]

>Number:         89524
>Category:       ports
>Synopsis:       [patch] astro/sunclock - to version 3.54.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 25 12:00:10 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Edwin Groothuis
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #8: Wed Dec 15 16:58:01 EST 2004 edwin at k7.mavetju:/usr/src-5.2.1/sys/i386/compile/k7 i386

>Description:

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

	no, I'm not solliciting for maintainership.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/astro/sunclock/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	27 May 2005 23:23:14 -0000	1.22
+++ Makefile	25 Nov 2005 11:53:04 -0000
@@ -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 @@
 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>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/astro/sunclock/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo	27 May 2005 23:23:14 -0000	1.12
+++ distinfo	25 Nov 2005 11:53:04 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/astro/sunclock/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist	27 May 2005 23:23:14 -0000	1.9
+++ pkg-plist	25 Nov 2005 11:53:04 -0000
@@ -11,7 +11,13 @@
 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
+lib/X11/doc/html/sunclock.1.html
+lib/X11/doc/html/emx.1.html
 @dirrm share/sunclock/i18n
 @dirrm share/sunclock/earthmaps/vmf
 @dirrm share/sunclock/earthmaps
 @dirrm share/sunclock
+ at dirrm share/editkit
Index: files/patch-aa
===================================================================
RCS file: /home/pcvs/ports/astro/sunclock/files/patch-aa,v
retrieving revision 1.7
diff -u -r1.7 patch-aa
--- files/patch-aa	21 Nov 2004 18:59:41 -0000	1.7
+++ files/patch-aa	25 Nov 2005 11:53:04 -0000
@@ -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 \
Index: files/patch-editkit__Imakefile
===================================================================
RCS file: files/patch-editkit__Imakefile
diff -N files/patch-editkit__Imakefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-editkit__Imakefile	25 Nov 2005 11:53:04 -0000
@@ -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
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: