diff options
| author | Kevin Lo <kevlo@FreeBSD.org> | 2000-08-12 07:52:14 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@FreeBSD.org> | 2000-08-12 07:52:14 +0000 |
| commit | 04c0cc7a15244ff975585462dcd7ae8ff9105809 (patch) | |
| tree | 8a49a6083dadb0076e7a608422058793058c5186 /x11-clocks | |
| parent | - Support X11BASE properly (diff) | |
- Support X11BASE properly
- Remove USE_GMAKE
- WindowMaker -> Window Maker
PR: 20551
Submitted by: Ports Fury
Diffstat (limited to 'x11-clocks')
| -rw-r--r-- | x11-clocks/wmcalclock/Makefile | 6 | ||||
| -rw-r--r-- | x11-clocks/wmcalclock/files/patch-aa | 45 | ||||
| -rw-r--r-- | x11-clocks/wmcalclock/pkg-comment | 2 | ||||
| -rw-r--r-- | x11-clocks/wmcalclock/pkg-descr | 2 |
4 files changed, 40 insertions, 15 deletions
diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile index 0da027632bd8..e891b00a6c37 100644 --- a/x11-clocks/wmcalclock/Makefile +++ b/x11-clocks/wmcalclock/Makefile @@ -16,14 +16,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/Src 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 --git a/x11-clocks/wmcalclock/files/patch-aa b/x11-clocks/wmcalclock/files/patch-aa index 287bf2dc6255..a028f58e2fd1 100644 --- a/x11-clocks/wmcalclock/files/patch-aa +++ b/x11-clocks/wmcalclock/files/patch-aa @@ -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 --git a/x11-clocks/wmcalclock/pkg-comment b/x11-clocks/wmcalclock/pkg-comment index ac1b4064a2fa..c25bd589ee92 100644 --- a/x11-clocks/wmcalclock/pkg-comment +++ b/x11-clocks/wmcalclock/pkg-comment @@ -1 +1 @@ -Another WindowMaker calendar/clock dockapp +Another Window Maker calendar/clock dockapp diff --git a/x11-clocks/wmcalclock/pkg-descr b/x11-clocks/wmcalclock/pkg-descr index 2d8beb39e505..15ed68e3e7d1 100644 --- a/x11-clocks/wmcalclock/pkg-descr +++ b/x11-clocks/wmcalclock/pkg-descr @@ -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 |