svn commit: r317144 - in head/x11-clocks/wmcalclock: . files

[Hiroki Sato]

Author: hrs
Date: Thu May  2 19:51:08 2013
New Revision: 317144
URL: http://svnweb.freebsd.org/changeset/ports/317144

Log:
  - Trim old-style header.
  - Add OPTIONS_DEFINE=DOCS.
  - Rename files/patch-a[ab].

Added:
  head/x11-clocks/wmcalclock/files/patch-Makefile
     - copied unchanged from r316855, head/x11-clocks/wmcalclock/files/patch-aa
  head/x11-clocks/wmcalclock/files/patch-wmCalClock.c
     - copied unchanged from r316855, head/x11-clocks/wmcalclock/files/patch-ab
Deleted:
  head/x11-clocks/wmcalclock/files/patch-aa
  head/x11-clocks/wmcalclock/files/patch-ab
Modified:
  head/x11-clocks/wmcalclock/Makefile

Modified: head/x11-clocks/wmcalclock/Makefile
==============================================================================
--- head/x11-clocks/wmcalclock/Makefile	Thu May  2 19:41:06 2013	(r317143)
+++ head/x11-clocks/wmcalclock/Makefile	Thu May  2 19:51:08 2013	(r317144)
@@ -1,26 +1,34 @@
-# New ports collection makefile for:   wmCalClock
-# Date created:        16 March 1999
-# Whom:                Kris Kennaway <kris at FreeBSD.org>
-#
+# Created by: Kris Kennaway <kris at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	wmCalClock
 PORTVERSION=	1.26
+PORTREVISION=	1
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://jmpacquet.free.fr/wmcalclock/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	hrs at 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 <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKDIR}/${DISTNAME} && \
+		${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>

Copied: head/x11-clocks/wmcalclock/files/patch-Makefile (from r316855, head/x11-clocks/wmcalclock/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-clocks/wmcalclock/files/patch-Makefile	Thu May  2 19:51:08 2013	(r317144, copy of r316855, head/x11-clocks/wmcalclock/files/patch-aa)
@@ -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 
+ 

Copied: head/x11-clocks/wmcalclock/files/patch-wmCalClock.c (from r316855, head/x11-clocks/wmcalclock/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-clocks/wmcalclock/files/patch-wmCalClock.c	Thu May  2 19:51:08 2013	(r317144, copy of r316855, head/x11-clocks/wmcalclock/files/patch-ab)
@@ -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();
+ 
+