Date: Fri, 24 Aug 2001 08:05:33 -0400 (EDT) From: Patrick Li <pat@databits.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/30024: Update port astro/sunclock Message-ID: <200108241205.f7OC5XD83876@cc92687-a.wlgrv1.pa.home.com>
next in thread | raw e-mail | index | archive | help
>Number: 30024 >Category: ports >Synopsis: Update port astro/sunclock >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 24 05:10:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Patrick Li >Release: FreeBSD 4.4-RC i386 >Organization: N/A >Environment: System: FreeBSD bottlenek 4.4-RC FreeBSD 4.4-RC #0: Wed Aug 22 12:13:02 EDT 2001 pat@bottlenek:/usr/src/sys/compile/BOTTLENEK i386 >Description: - Update to 3.50pre1 (checked with pkg_version and 3.50.p1 was the way to go) - Use lowercase - Modify patch and pkg-plist - Fix dwcjr error to last commit of sunclock which put WRKSRC was ahead of LIB_DEPENDS which made portlint warning. If you compare commit logs and PR i sent long ago which he closed, In NO way did I mentioned in the patch to put WRKSRC ahead of LIB_DEPENDS. - This PR supercedes PR # 28837 - I'll be maintainer if ok... NOTE: This is the 5th PR updating this port with no response from torstenb first PR i sent is dated 2001/06/11 >How-To-Repeat: Let dwcjr touch your PR instead of mah #1 FOB! >Fix: diff -ruN /usr/ports/astro/sunclock/Makefile sunclock/Makefile --- /usr/ports/astro/sunclock/Makefile Wed Jul 25 13:35:38 2001 +++ sunclock/Makefile Fri Aug 24 07:25:42 2001 @@ -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 -ruN /usr/ports/astro/sunclock/distinfo sunclock/distinfo --- /usr/ports/astro/sunclock/distinfo Mon Jul 9 21:43:18 2001 +++ sunclock/distinfo Fri Aug 24 06:57:21 2001 @@ -1 +1 @@ -MD5 (sunclock-3.45.tgz) = 67a60a02391852e95a77a64e4bdb8d38 +MD5 (sunclock-3.50pre1.tgz) = 6e07964a99848018432825c5b3297cc6 diff -ruN /usr/ports/astro/sunclock/files/patch-aa sunclock/files/patch-aa --- /usr/ports/astro/sunclock/files/patch-aa Sun Apr 22 10:35:32 2001 +++ sunclock/files/patch-aa Fri Aug 24 07:48:34 2001 @@ -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 -ruN /usr/ports/astro/sunclock/files/patch-tildepath.c sunclock/files/patch-tildepath.c --- /usr/ports/astro/sunclock/files/patch-tildepath.c Wed Dec 31 19:00:00 1969 +++ sunclock/files/patch-tildepath.c Fri Aug 24 07:07:14 2001 @@ -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 -ruN /usr/ports/astro/sunclock/pkg-plist sunclock/pkg-plist --- /usr/ports/astro/sunclock/pkg-plist Mon Jul 9 21:43:18 2001 +++ sunclock/pkg-plist Fri Aug 24 07:51:33 2001 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108241205.f7OC5XD83876>