Date: Fri, 11 Aug 2000 16:55:55 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/20551: Update port: x11-clocks/wmcalclock Message-ID: <20000811235555.A9B5C37BC56@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 20551
>Category: ports
>Synopsis: Update port: x11-clocks/wmcalclock
>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 11 17:00:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support X11BASE properly
- Remove USE_GMAKE
- WindowMaker -> Window Maker
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-clocks/wmcalclock/Makefile x11-clocks/wmcalclock/Makefile
--- /usr/ports/x11-clocks/wmcalclock/Makefile Thu Aug 3 21:36:29 2000
+++ x11-clocks/wmcalclock/Makefile Sat Aug 12 01:02:04 2000
@@ -16,14 +16,8 @@
USE_X_PREFIX= yes
USE_XPM= yes
-USE_GMAKE= yes
-
ALL_TARGET= clean all
MAN1= wmCalClock.1
-
-do-install:
- ${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/
- ${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/
.include <bsd.port.mk>
diff -urN /usr/ports/x11-clocks/wmcalclock/patches/patch-aa x11-clocks/wmcalclock/patches/patch-aa
--- /usr/ports/x11-clocks/wmcalclock/patches/patch-aa Tue Mar 16 19:47:12 1999
+++ x11-clocks/wmcalclock/patches/patch-aa Sat Aug 12 01:01:43 2000
@@ -1,11 +1,42 @@
---- Makefile.orig Fri Feb 19 03:13:16 1999
-+++ Makefile Tue Mar 16 21:07:25 1999
-@@ -1,5 +1,6 @@
+--- Makefile.orig Sat Mar 27 15:46:38 1999
++++ Makefile Sat Aug 12 01:01:35 2000
+@@ -1,8 +1,8 @@
-CC = gcc
-CFLAGS = -O2 -Wall
+-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
+-DESTDIR= /usr/X11R6
+-LIBDIR = -L/usr/X11R6/lib
+CC ?= gcc
+CFLAGS ?= -O2
-+CFLAGS += -Wall
- INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
- DESTDIR= /usr/X11R6
- LIBDIR = -L/usr/X11R6/lib
++INCDIR = -I${X11BASE}/include
++DESTDIR= ${PREFIX}
++LIBDIR = -L${X11BASE}/lib
+
+ # for Linux
+ LIBS = -lXpm -lX11 -lXext
+@@ -15,14 +15,14 @@
+
+
+ .c.o:
+- $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
++ $(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)
+
+
+ all: wmCalClock.o wmCalClock
+
+ wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
+ wmCalClock: $(OBJS)
+- $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
++ $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $(OBJS) $(LIBDIR) $(LIBS)
+
+ clean:
+ for i in $(OBJS) ; do \
+@@ -31,6 +31,6 @@
+ rm -f wmCalClock
+
+ install:: wmCalClock
+- install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
+- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
++ ${BSD_INSTALL_PROGRAM} wmCalClock $(DESTDIR)/bin
++ ${BSD_INSTALL_MAN} wmCalClock.1 $(DESTDIR)/man/man1
+
diff -urN /usr/ports/x11-clocks/wmcalclock/pkg/COMMENT x11-clocks/wmcalclock/pkg/COMMENT
--- /usr/ports/x11-clocks/wmcalclock/pkg/COMMENT Sun Jun 27 04:18:07 1999
+++ x11-clocks/wmcalclock/pkg/COMMENT Sat Aug 12 04:39:45 2000
@@ -1 +1 @@
-Another WindowMaker calendar/clock dockapp
+Another Window Maker calendar/clock dockapp
diff -urN /usr/ports/x11-clocks/wmcalclock/pkg/DESCR x11-clocks/wmcalclock/pkg/DESCR
--- /usr/ports/x11-clocks/wmcalclock/pkg/DESCR Sat Jan 22 22:25:34 2000
+++ x11-clocks/wmcalclock/pkg/DESCR Sat Aug 12 04:39:54 2000
@@ -1,3 +1,3 @@
-Another WindowMaker calendar/clock dockapp.
+Another Window Maker calendar/clock dockapp.
WWW: http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
>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?20000811235555.A9B5C37BC56>