From owner-freebsd-ports Sat Apr 14 23:30:12 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6F05237B496 for ; Sat, 14 Apr 2001 23:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f3F6U1J66019; Sat, 14 Apr 2001 23:30:01 -0700 (PDT) (envelope-from gnats) Received: from Terry.Dorm8.NCTU.edu.tw (Terry.Dorm8.NCTU.edu.tw [140.113.93.99]) by hub.freebsd.org (Postfix) with ESMTP id B222237B423 for ; Sat, 14 Apr 2001 23:27:40 -0700 (PDT) (envelope-from ijliao@Terry.Dorm8.NCTU.edu.tw) Received: (from ijliao@localhost) by Terry.Dorm8.NCTU.edu.tw (8.11.3/8.11.2) id f3F6STu57873; Sun, 15 Apr 2001 14:28:30 +0800 (CST) (envelope-from ijliao) Message-Id: <200104150628.f3F6STu57873@Terry.Dorm8.NCTU.edu.tw> Date: Sun, 15 Apr 2001 14:28:30 +0800 (CST) From: Ying-Chieh Liao Reply-To: ijliao@terry.dragon2.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/26590: update ports : astro/sunclock Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 26590 >Category: ports >Synopsis: update ports : astro/sunclock >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 14 23:30:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Ying-Chieh Liao >Release: FreeBSD 5.0-CURRENT i386 >Organization: NCTU CSIE >Environment: System: FreeBSD Terry.Dorm8.NCTU.edu.tw 5.0-CURRENT FreeBSD 5.0-CURRENT #4: Sun Apr 1 01:34:51 CST 2001 root@Terry.Dorm8.NCTU.edu.tw:/usr/obj/usr/src/sys/TERRY i386 >Description: upgrade sunclock from 3.27 to 3.36 >How-To-Repeat: >Fix: diff -ruN /usr/ports/astro/sunclock/Makefile sunclock/Makefile --- /usr/ports/astro/sunclock/Makefile Tue Apr 3 11:52:14 2001 +++ sunclock/Makefile Sun Apr 15 14:23:31 2001 @@ -6,18 +6,21 @@ # PORTNAME= sunclock -PORTVERSION= 3.27 +PORTVERSION= 3.36 CATEGORIES= astro x11-clocks MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/ EXTRACT_SUFX= .tgz MAINTAINER= torstenb@FreeBSD.org +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg + USE_IMAKE= YES MAN1= sunclock.1 -post-patch: - @${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/Imakefile +#post-patch: +# @${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g ; \ +# s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Imakefile .include diff -ruN /usr/ports/astro/sunclock/distinfo sunclock/distinfo --- /usr/ports/astro/sunclock/distinfo Tue Apr 3 11:52:16 2001 +++ sunclock/distinfo Sun Apr 15 02:17:35 2001 @@ -1 +1 @@ -MD5 (sunclock-3.27.tgz) = fccba948f48a65a3c481a8411f41de98 +MD5 (sunclock-3.36.tgz) = 2c1070c32b251626ab0dd9171c7a9524 diff -ruN /usr/ports/astro/sunclock/files/patch-aa sunclock/files/patch-aa --- /usr/ports/astro/sunclock/files/patch-aa Tue Apr 3 11:52:16 2001 +++ sunclock/files/patch-aa Sun Apr 15 14:24:21 2001 @@ -1,31 +1,45 @@ ---- Imakefile.orig Sat Dec 30 15:24:02 2000 -+++ Imakefile Sat Dec 30 15:38:55 2000 -@@ -8,7 +8,7 @@ - XCOMM Pick -O or -g - XCOMM +--- Imakefile.orig Fri Apr 13 03:40:29 2001 ++++ Imakefile Sun Apr 15 14:20:12 2001 +@@ -1,15 +1,17 @@ + XCOMM Should install to /usr or /usr/local ?? +-DESTDIR=/usr ++DESTDIR=${PREFIX} + + XCOMM Name of man subdirectory of DESTDIR: +-MANDIR=/X11R6/man/man1 ++MANDIR=/man/man1 --SHAREDIR=/usr/share/sunclock -+SHAREDIR=%%X11BASE%%/share/sunclock + XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin +-BINDIR=/X11R6/bin ++BINDIR=/bin - #ifdef HPArchitecture - CCOPTIONS = -Ae -DBIGFONT=\"6x13\" -DSMALLFONT=\"6x10\" -DAPPDEF=\"$(DESTDIR)$(XAPPLOADDIR)\" -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -@@ -16,16 +16,16 @@ - # SunOS - #CCOPTIONS=-DBIGFONT=\"6x13\" -DSMALLFONT=\"6x10\" -O -DNEW_CTIME -DAPPDEF=\"$(DESTDIR)$(XAPPLOADDIR)\" -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" + XCOMM Name of share subdirectory of DESTDIR: + SHAREDIR=/share/sunclock + ++DOCHTMLDIR=/lib/X11/doc/html ++ + XCOMM + XCOMM Compile options: + XCOMM +@@ -39,17 +41,17 @@ # Solaris, Linux --CCOPTIONS=-DBIGFONT=\"6x13\" -DSMALLFONT=\"6x10\" -O -DAPPDEF=\"$(DESTDIR)$(XAPPLOADDIR)\" -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -+CCOPTIONS=-DBIGFONT=\"6x13\" -DSMALLFONT=\"6x10\" -O -DAPPDEF=\"$(DESTDIR)$(XAPPLOADDIR)\" -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME + #XPMLIB=-L/usr/X11R6/lib + #XPMINC=-I/usr/X11R6/include/X11 +-#JLIB=-L/usr/lib +-#JINC=-I/usr/include ++JLIB=-L${LOCALBASE}/lib ++JINC=-I${LOCALBASE}/include + +-CCOPTIONS=-DMENUFONT=\"6x13\" -DCLOCKFONT=\"6x10\" -O -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" ++CCOPTIONS=-DMENUFONT=\"6x13\" -DCLOCKFONT=\"6x10\" -O -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include #endif - SRCS=sunclock.c astro.c tildepath.c mapdata.c dirlist.c - OBJS=sunclock.o astro.o tildepath.o mapdata.o dirlist.o --LOCAL_LIBRARIES=$(XLIB) -lXpm -lm -+LOCAL_LIBRARIES=$(XLIB) -lXpm -lm -lcompat + SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \ + readvmf.c readxpm.c readjpeg.c + 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 DEPLIBS= # I don't know what I'm doing, and I hate imake! - genmap:: mapdata.o -- gcc -c mapgen.c -o mapgen.o -+ gcc -I%%X11BASE%%/include -c mapgen.c -o mapgen.o - gcc -o mapgen -O mapgen.o mapdata.o -lm - - maps:: genmap + ComplexProgramTarget(sunclock) diff -ruN /usr/ports/astro/sunclock/pkg-plist sunclock/pkg-plist --- /usr/ports/astro/sunclock/pkg-plist Tue Apr 3 11:52:16 2001 +++ sunclock/pkg-plist Sun Apr 15 04:43:54 2001 @@ -1,9 +1,14 @@ bin/sunclock -lib/X11/app-defaults/Sunclock +share/sunclock/Sunclockrc +share/sunclock/earthmaps/vmf/standard.vmf +@dirrm share/sunclock/earthmaps/vmf +@dirrm share/sunclock/earthmaps share/sunclock/i18n/Sunclock.de share/sunclock/i18n/Sunclock.en share/sunclock/i18n/Sunclock.es share/sunclock/i18n/Sunclock.fr share/sunclock/i18n/Sunclock.it +share/sunclock/i18n/Sunclock.nl +share/sunclock/i18n/Sunclock.no share/sunclock/i18n/Sunclock.se @dirrm share/sunclock/i18n >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message