From da531702a8c747a93aabc9319965ab66f588c1e0 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Thu, 2 May 2013 19:51:08 +0000 Subject: - Trim old-style header. - Add OPTIONS_DEFINE=DOCS. - Rename files/patch-a[ab]. --- x11-clocks/wmcalclock/Makefile | 26 ++++++++++------ x11-clocks/wmcalclock/files/patch-Makefile | 42 ++++++++++++++++++++++++++ x11-clocks/wmcalclock/files/patch-aa | 42 -------------------------- x11-clocks/wmcalclock/files/patch-ab | 11 ------- x11-clocks/wmcalclock/files/patch-wmCalClock.c | 11 +++++++ 5 files changed, 70 insertions(+), 62 deletions(-) create mode 100644 x11-clocks/wmcalclock/files/patch-Makefile delete mode 100644 x11-clocks/wmcalclock/files/patch-aa delete mode 100644 x11-clocks/wmcalclock/files/patch-ab create mode 100644 x11-clocks/wmcalclock/files/patch-wmCalClock.c (limited to 'x11-clocks') diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile index 4f35ffa36643..9bc09f0c9e34 100644 --- a/x11-clocks/wmcalclock/Makefile +++ b/x11-clocks/wmcalclock/Makefile @@ -1,26 +1,34 @@ -# New ports collection makefile for: wmCalClock -# Date created: 16 March 1999 -# Whom: Kris Kennaway -# +# Created by: Kris Kennaway # $FreeBSD$ -# PORTNAME= wmCalClock PORTVERSION= 1.26 +PORTREVISION= 1 CATEGORIES= x11-clocks windowmaker MASTER_SITES= http://jmpacquet.free.fr/wmcalclock/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Another Window Maker calendar/clock dockapp LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../COPYING -WRKSRC= ${WRKDIR}/${DISTNAME}/Src - USE_XORG= xpm +WRKSRC= ${WRKDIR}/${DISTNAME}/Src +PLIST_FILES= bin/wmCalClock +PORTDOCS= BUGS CHANGES HINTS INSTALL README TODO MAN1= wmCalClock.1 -PLIST_FILES= bin/wmCalClock + +OPTIONS_DEFINE= DOCS + +.include + +.if ${PORT_OPTIONS:MDOCS} +post-install: + @${MKDIR} ${DOCSDIR} + cd ${WRKDIR}/${DISTNAME} && \ + ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} +.endif .include diff --git a/x11-clocks/wmcalclock/files/patch-Makefile b/x11-clocks/wmcalclock/files/patch-Makefile new file mode 100644 index 000000000000..da2526f3ff77 --- /dev/null +++ b/x11-clocks/wmcalclock/files/patch-Makefile @@ -0,0 +1,42 @@ +--- 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 ++INCDIR = -I${LOCALBASE}/include ++DESTDIR= ${PREFIX} ++LIBDIR = -L${LOCALBASE}/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/files/patch-aa b/x11-clocks/wmcalclock/files/patch-aa deleted file mode 100644 index da2526f3ff77..000000000000 --- a/x11-clocks/wmcalclock/files/patch-aa +++ /dev/null @@ -1,42 +0,0 @@ ---- 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 -+INCDIR = -I${LOCALBASE}/include -+DESTDIR= ${PREFIX} -+LIBDIR = -L${LOCALBASE}/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/files/patch-ab b/x11-clocks/wmcalclock/files/patch-ab deleted file mode 100644 index 227ac30c0ff4..000000000000 --- a/x11-clocks/wmcalclock/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- wmCalClock.c.orig Wed May 21 03:34:04 2003 -+++ wmCalClock.c Wed May 21 03:34:07 2003 -@@ -299,7 +299,7 @@ - int i, n, wid, extrady, extradx; - int Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth; - int Hours, Mins, Secs, OldSecs, digit, xoff, D[10], xsize; -- long CurrentLocalTime; -+ time_t CurrentLocalTime; - double UT, TU, TU2, TU3, T0, gmst, jd(), hour24(); - - diff --git a/x11-clocks/wmcalclock/files/patch-wmCalClock.c b/x11-clocks/wmcalclock/files/patch-wmCalClock.c new file mode 100644 index 000000000000..227ac30c0ff4 --- /dev/null +++ b/x11-clocks/wmcalclock/files/patch-wmCalClock.c @@ -0,0 +1,11 @@ +--- wmCalClock.c.orig Wed May 21 03:34:04 2003 ++++ wmCalClock.c Wed May 21 03:34:07 2003 +@@ -299,7 +299,7 @@ + int i, n, wid, extrady, extradx; + int Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth; + int Hours, Mins, Secs, OldSecs, digit, xoff, D[10], xsize; +- long CurrentLocalTime; ++ time_t CurrentLocalTime; + double UT, TU, TU2, TU3, T0, gmst, jd(), hour24(); + + -- cgit v1.2.3