Date: Mon, 20 Dec 1999 09:02:24 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org Subject: ports/15586: Update port: x11-clocks/dclock to pl6 Message-ID: <19991220170224.1E95E15315@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 15586 >Category: ports >Synopsis: Update port: x11-clocks/dclock to pl6 >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: Mon Dec 20 09:10:04 PST 1999 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.3-RELEASE i386 >Organization: >Environment: >Description: * Updated version pl4 to pl6 Note: ports/11879 should be superseded by this PR. New file: patches/patch-ab patches/patch-ac Remove file: patches/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-clocks/dclock/Makefile x11-clocks/dclock/Makefile --- /usr/ports/x11-clocks/dclock/Makefile Tue Aug 31 19:19:09 1999 +++ x11-clocks/dclock/Makefile Sun Dec 19 15:52:10 1999 @@ -1,27 +1,25 @@ # New ports collection makefile for: dclock -# Version required: pl4 +# Version required: pl6 # Date created: 15 Aug 1996 # Whom: David Leonard <leonard@dstc.edu.au> # # $FreeBSD: ports/x11-clocks/dclock/Makefile,v 1.9 1999/08/31 06:52:30 mharo Exp $ # -DISTNAME= dclock -PKGNAME= dclock-pl4 +DISTNAME= Dclock +PKGNAME= dclock-pl6 CATEGORIES= x11-clocks -MASTER_SITES= ftp://ftp.x.org/R5contrib/ -EXTRACT_SUFX= .shar.Z +MASTER_SITES= ftp://ftp.demon.co.uk/pub/graphics/systems/X11.old/pub/R6untarred/contrib/programs/ + +PATCH_SITES= ${MASTER_SITE_XCONTRIB} +PATCH_SITE_SUBDIR= R6contrib-fixes +PATCHFILES= Dclock-pl6.patch.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org -USE_XLIB= yes +IGNOREFILES= ${DISTFILES} +USE_IMAKE= yes MAN1= dclock.1 -MANCOMPRESSED= yes - -EXTRACT_CMD= ${GZIP_CMD} -EXTRACT_BEFORE_ARGS= -dc -EXTRACT_AFTER_ARGS= |sh - -NO_WRKSUBDIR= yes -ALL_TARGET= dclock .include <bsd.port.mk> diff -urN /usr/ports/x11-clocks/dclock/files/md5 x11-clocks/dclock/files/md5 --- /usr/ports/x11-clocks/dclock/files/md5 Mon May 4 02:54:47 1998 +++ x11-clocks/dclock/files/md5 Sun Dec 19 15:53:51 1999 @@ -1 +1,2 @@ -MD5 (dclock.shar.Z) = c02279a04e7ca617b327bc4963920593 +MD5 (Dclock-pl6.patch.gz) = 539204f67d1662c5ed738f8b8e9d9bf2 +MD5 (Dclock.tar.gz) = IGNORE diff -urN /usr/ports/x11-clocks/dclock/patches/patch-aa x11-clocks/dclock/patches/patch-aa --- /usr/ports/x11-clocks/dclock/patches/patch-aa Mon Sep 21 19:53:27 1998 +++ x11-clocks/dclock/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,29 +0,0 @@ ---- Makefile.orig Sun Sep 20 19:59:13 1998 -+++ Makefile Sun Sep 20 20:03:13 1998 -@@ -3,12 +3,14 @@ - OBJS= Dclock.o dclock.o - HFILES= Dclock.h DclockP.h patchlevel.h - --CFLAGS= -O --LDFLAGS= --LIBS= -lXt -lX11 -+CFLAGS+= -I${X11BASE}/include -+.if ${PORTOBJFORMAT} == "elf" -+LDFLAGS+=-Wl,-rpath,${X11BASE}/lib -+.endif -+LIBS= -L${X11BASE}/lib -lXt -lX11 - - dclock: ${OBJS} -- cc ${LDFLAGS} ${OBJS} ${LIBS} -o dclock -+ cc -o dclock ${OBJS} ${LIBS} ${LDFLAGS} - - clean: ; rm -f ${OBJS} core dclock - -@@ -16,3 +18,7 @@ - - tar: ; tar fcv - README Makefile dclock.man ${HFILES} ${SRCS} | \ - compress > dclock.tar.Z -+ -+install: -+ install -cs dclock ${PREFIX}/bin -+ gzip -9c < dclock.man > ${PREFIX}/man/man1/dclock.1.gz diff -urN /usr/ports/x11-clocks/dclock/patches/patch-ab x11-clocks/dclock/patches/patch-ab --- /usr/ports/x11-clocks/dclock/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ x11-clocks/dclock/patches/patch-ab Sun Dec 19 15:59:30 1999 @@ -0,0 +1,11 @@ +--- Dclock.h.orig Mon Jun 6 08:00:00 1994 ++++ Dclock.h Sun Dec 19 15:59:17 1999 +@@ -58,7 +58,7 @@ + #define XtNfadeRate "fadeRate" + #define XtNtails "tails" + #define XtNdate "date" +-#define XtNmilitaryTime "militaryTime" ++#define XtNmilitaryTime "miltime" + #define XtNlanguage "language" + #define XtNhours_snd "hours_snd" + #define XtNhalf_hours_snd "half_hours_snd" diff -urN /usr/ports/x11-clocks/dclock/patches/patch-ac x11-clocks/dclock/patches/patch-ac --- /usr/ports/x11-clocks/dclock/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ x11-clocks/dclock/patches/patch-ac Sun Dec 19 16:01:45 1999 @@ -0,0 +1,11 @@ +--- d_clock.c.orig Fri Jun 3 08:00:00 1994 ++++ d_clock.c Sun Dec 19 16:01:36 1999 +@@ -131,7 +131,7 @@ + else + name = argv[0]; + +- toplevel = XtInitialize(name, "DClock", options, XtNumber(options), ++ toplevel = XtInitialize(name, "Dclock", options, XtNumber(options), + &argc, argv); + XtAddActions(actionsList, 1); + >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?19991220170224.1E95E15315>