ports/60627: Update port: x11-clocks/pclock

[KATO Tsuguru]

>Number:         60627
>Category:       ports
>Synopsis:       Update port : x11-clocks/pclock
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 27 06:10:16 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Support CFLAGS properly
- Remove obsolete WWW: line

Remove file:
files/patch-aa


>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-clocks/pclock/Makefile x11-clocks/pclock/Makefile
--- /usr/ports/x11-clocks/pclock/Makefile	Mon Dec 15 18:28:27 2003
+++ x11-clocks/pclock/Makefile	Sat Dec 27 00:28:39 2003
@@ -7,24 +7,29 @@
 
 PORTNAME=	pclock
 PORTVERSION=	0.13.1
+PORTREVISION=	1
 CATEGORIES=	x11-clocks windowmaker afterstep
-MASTER_SITES=	ftp://ftp.kourakos.com/pub/pclock/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Simple analog clock program for the Window Maker dock
 
-USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig/src
+
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_GETOPT_LONG=	yes
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" OBJS="Main.o Graphics.o" \
+		INCDIR="-I. -I${X11BASE}/include ${CPPFLAGS}" \
+		LIBDIR="-L${X11BASE}/lib ${LDFLAGS}"
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/pclock ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/pclock/pixmaps && ${CHMOD} a+rx ${PREFIX}/share/pclock/pixmaps
-	@${ECHO} "===>  Installing sample pixmaps in ${PREFIX}/share/pclock/pixmaps"
-	@${INSTALL_DATA} ${WRKSRC}/XPM/*.xpm ${PREFIX}/share/pclock/pixmaps
+post-extract:
+	cd ${WRKSRC} && ${RM} -f getopt*
 
-post-install:
-	@${ECHO} "===>  Use 'pclock --help' for usage instructions"
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/pclock ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/../XPM/*.xpm ${DATADIR}/pixmaps
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11-clocks/pclock/distinfo x11-clocks/pclock/distinfo
--- /usr/ports/x11-clocks/pclock/distinfo	Sun Aug 13 18:36:12 2000
+++ x11-clocks/pclock/distinfo	Sat Dec 27 00:18:28 2003
@@ -1 +1 @@
-MD5 (pclock-0.13.1.tgz) = c700933e3ec53beed738c5167fc255c1
+MD5 (pclock_0.13.1.orig.tar.gz) = 7d6284d50b7e8c76b1e8b68dad5fe44f
diff -urN /usr/ports/x11-clocks/pclock/files/patch-aa x11-clocks/pclock/files/patch-aa
--- /usr/ports/x11-clocks/pclock/files/patch-aa	Sat Dec  4 09:57:16 1999
+++ x11-clocks/pclock/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,22 +0,0 @@
---- src/Makefile.orig	Fri Dec  3 16:29:46 1999
-+++ src/Makefile	Fri Dec  3 16:33:00 1999
-@@ -1,14 +1,14 @@
--BINDIR = /usr/X11R6/bin
-+BINDIR = ${X11BASE}/bin
- 
- PROG = pclock
- OBJS = Main.o Graphics.o getopt.o getopt1.o
- 
- DEFAULT_XPM = round-3d.xpm
- 
--INCDIR = -I/usr/X11R6/include -I.
--LIBDIR = -L/usr/X11R6/lib
--CC = gcc
--CFLAGS = -O -s -Wall
-+INCDIR = -I${X11BASE}/include -I.
-+LIBDIR = -L${X11BASE}/lib
-+CC ?= gcc
-+CFLAGS = -s -fomit-frame-pointer -Wall
- LIBS = -lXpm -lXext -lX11 -lm
- 
- ###############################################################################
diff -urN /usr/ports/x11-clocks/pclock/pkg-descr x11-clocks/pclock/pkg-descr
--- /usr/ports/x11-clocks/pclock/pkg-descr	Sat Aug 14 17:37:19 1999
+++ x11-clocks/pclock/pkg-descr	Sat Dec 27 00:17:28 2003
@@ -2,6 +2,4 @@
 Window Maker window manager.  Any 64x64 pixmap may be used as a
 background, including tiles.
 
-WWW: http://kraanerg.apex-it.com/~awk/pclock/
-
 - Jim <jim at FreeBSD.org>
diff -urN /usr/ports/x11-clocks/pclock/pkg-plist x11-clocks/pclock/pkg-plist
--- /usr/ports/x11-clocks/pclock/pkg-plist	Sun Aug 13 18:36:13 2000
+++ x11-clocks/pclock/pkg-plist	Sat Dec 27 00:29:34 2003
@@ -1,19 +1,19 @@
 bin/pclock
-share/pclock/pixmaps/glowclock.xpm
-share/pclock/pixmaps/green.xpm
-share/pclock/pixmaps/moonphase.xpm
-share/pclock/pixmaps/oclock.xpm
-share/pclock/pixmaps/radar.xpm
-share/pclock/pixmaps/rolex2.xpm
-share/pclock/pixmaps/rolexgmt.xpm
-share/pclock/pixmaps/round-3d.xpm
-share/pclock/pixmaps/square.xpm
-share/pclock/pixmaps/swatch.xpm
-share/pclock/pixmaps/time-icon.xpm
-share/pclock/pixmaps/will-return.xpm
-share/pclock/pixmaps/wmaker-tile.xpm
-share/pclock/pixmaps/wood-tile.xpm
-share/pclock/pixmaps/wristwatch.xpm
-share/pclock/pixmaps/yellow-diamond.xpm
- at dirrm share/pclock/pixmaps
- at dirrm share/pclock
+%%DATADIR%%/pixmaps/glowclock.xpm
+%%DATADIR%%/pixmaps/green.xpm
+%%DATADIR%%/pixmaps/moonphase.xpm
+%%DATADIR%%/pixmaps/oclock.xpm
+%%DATADIR%%/pixmaps/radar.xpm
+%%DATADIR%%/pixmaps/rolex2.xpm
+%%DATADIR%%/pixmaps/rolexgmt.xpm
+%%DATADIR%%/pixmaps/round-3d.xpm
+%%DATADIR%%/pixmaps/square.xpm
+%%DATADIR%%/pixmaps/swatch.xpm
+%%DATADIR%%/pixmaps/time-icon.xpm
+%%DATADIR%%/pixmaps/will-return.xpm
+%%DATADIR%%/pixmaps/wmaker-tile.xpm
+%%DATADIR%%/pixmaps/wood-tile.xpm
+%%DATADIR%%/pixmaps/wristwatch.xpm
+%%DATADIR%%/pixmaps/yellow-diamond.xpm
+ at dirrm %%DATADIR%%/pixmaps
+ at dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: