5 files changed, 38 insertions, 20 deletions

diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index 62b644ca9033..7e48c8773f7c 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -7,19 +7,19 @@
 #
 
 PORTNAME=	sunclock
-PORTVERSION=	3.45
+PORTVERSION=	3.50.p1
 CATEGORIES=	astro x11-clocks
 MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/geosciences/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	torstenb@FreeBSD.org
-
-WRKSRC=		${WRKDIR}/${DISTNAME}v2
+MAINTAINER=	pat@databits.net
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_XPM=	YES
-USE_IMAKE=	YES
+USE_X_PREFIX=	yes
+USE_XPM=	yes
+USE_IMAKE=	yes
 
 MAN1=		sunclock.1
 
diff --git a/astro/sunclock/distinfo b/astro/sunclock/distinfo
index 71984ee68492..cbd32e1ca696 100644
--- a/astro/sunclock/distinfo
+++ b/astro/sunclock/distinfo
@@ -1 +1 @@
-MD5 (sunclock-3.45.tgz) = 67a60a02391852e95a77a64e4bdb8d38
+MD5 (sunclock-3.50pre1.tgz) = 6e07964a99848018432825c5b3297cc6
diff --git a/astro/sunclock/files/patch-aa b/astro/sunclock/files/patch-aa
index 1d7ba4f609d2..74bf07b4ff95 100644
--- a/astro/sunclock/files/patch-aa
+++ b/astro/sunclock/files/patch-aa
@@ -1,5 +1,5 @@
---- Imakefile.orig	Sun Apr 22 22:27:53 2001
-+++ Imakefile	Sun Apr 22 22:30:04 2001
+--- Imakefile.orig	Tue Aug 14 09:30:24 2001
++++ Imakefile	Fri Aug 24 07:48:14 2001
 @@ -1,15 +1,17 @@
  XCOMM Should install to /usr or /usr/local ??
 -DESTDIR=/usr
@@ -21,25 +21,32 @@
  XCOMM
  XCOMM Compile options:
  XCOMM
-@@ -38,17 +40,17 @@
+@@ -38,13 +40,12 @@
+ #CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+ 
  # Solaris, Linux
- #XPMLIB=-L/usr/X11R6/lib
- #XPMINC=-I/usr/X11R6/include/X11
--#JLIB=-L/usr/lib
+-#XPMLIBDIR=-L/usr/X11R6/lib
+-#XPMINC=-I/usr/X11R6/include/X11
+-#JLIBDIR=-L/usr/lib
+-#ZLIBDIR=-L/usr/lib
 -#JINC=-I/usr/include
-+JLIB=-L${LOCALBASE}/lib
+-
+-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
++XPMLIBDIR=-L${X11BASE}/lib
++XPMINC=-I${X11BASE}/include/X11
++JLIBDIR=-L${LOCALBASE}/lib
++ZLIBDIR=-L${LOCALBASE}/lib
 +JINC=-I${LOCALBASE}/include
- 
--CCOPTIONS=-O -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
-+CCOPTIONS=-O -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"  -DNEW_CTIME -I${LOCALBASE}/include
++CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include
  #endif
  
  SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
-      readvmf.c readxpm.c readjpeg.c
+@@ -52,7 +53,7 @@
  OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \
       readvmf.o readxpm.o readjpeg.o
--LOCAL_LIBRARIES=$(XLIB) $(XPMLIB) -lXpm $(JLIB) -ljpeg -lm
-+LOCAL_LIBRARIES=$(XLIB) $(XPMLIB) -lXpm $(JLIB) -ljpeg -lm -lcompat
+ LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \
+-     $(JLIBDIR) -ljpeg -lm
++     $(JLIBDIR) -ljpeg -lm -lcompat
  DEPLIBS=		# I don't know what I'm doing, and I hate imake!
  
  ComplexProgramTarget(sunclock)
diff --git a/astro/sunclock/files/patch-tildepath.c b/astro/sunclock/files/patch-tildepath.c
new file mode 100644
index 000000000000..ba98770cd368
--- /dev/null
+++ b/astro/sunclock/files/patch-tildepath.c
@@ -0,0 +1,10 @@
+--- tildepath.c.orig	Fri Aug 24 07:06:53 2001
++++ tildepath.c	Fri Aug 24 07:06:59 2001
+@@ -38,7 +38,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <pwd.h>
+-#include <malloc.h>
+ #include <string.h>
+ 
+ /*
diff --git a/astro/sunclock/pkg-plist b/astro/sunclock/pkg-plist
index 5273eee0b788..b532c91d4f8c 100644
--- a/astro/sunclock/pkg-plist
+++ b/astro/sunclock/pkg-plist
@@ -1,6 +1,7 @@
 bin/sunclock
 share/sunclock/Sunclockrc
 share/sunclock/earthmaps/vmf/standard.vmf
+share/sunclock/earthmaps/vmf/timezones.vmf
 share/sunclock/i18n/Sunclock.de
 share/sunclock/i18n/Sunclock.en
 share/sunclock/i18n/Sunclock.es