ports/79755: Update port: x11-clocks/eyeclock

Sun Apr 10 14:10:22 UTC 2005

>Number:         79755
>Category:       ports
>Synopsis:       Update port: x11-clocks/eyeclock
>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:   Sun Apr 10 14:10:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Support CC/CFLAGS properly

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-clocks/eyeclock/Makefile x11-clocks/eyeclock/Makefile

--- /usr/ports/x11-clocks/eyeclock/Makefile	Fri Dec 24 02:58:53 2004
+++ x11-clocks/eyeclock/Makefile	Sun Apr 10 00:13:04 2005
@@ -8,17 +8,33 @@
 PORTNAME=	eyeclock
 PORTVERSION=	2.0
 CATEGORIES=	x11-clocks
-MASTER_SITES=	http://www.seki.ee.kagu.sut.ac.jp/~sakai/
+MASTER_SITES=	http://download.vector.co.jp/pack/unix/personal/tokei/
+DISTNAME=	eyeclk20
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A clock with eyes following the mouse pointer
 
-#ALL_TARGET=	all
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
 MAN1=		eyeclock.1
-MANCOMPRESSED=	yes
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/eyeclock ${PREFIX}/bin/eyeclock
+.for link in boyclock daemonclock girlclock henohenoclock margueriteclock \
+	octopusclock punpunclock silicagelclock taroclock umeharaclock
+	${LN} -sf eyeclock ${PREFIX}/bin/${link}
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/eyeclock.man ${MANPREFIX}/man/man1/eyeclock.1
+	${INSTALL_DATA} ${WRKSRC}/EyeClock.daemon \
+		${PREFIX}/lib/X11/app-defaults/EyeClock
+	@${MKDIR} ${PREFIX}/lib/X11/EyeClock
+.for file in CHANGE COPYRIGHT EyeClock.daemon EyeClock.normal EyeClock.penguin \
+	Makefile OMAKE.jpn README.jpn xpm/*.xpm
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/X11/EyeClock
+.endfor
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11-clocks/eyeclock/distinfo x11-clocks/eyeclock/distinfo
--- /usr/ports/x11-clocks/eyeclock/distinfo	Wed Mar 31 18:15:49 2004
+++ x11-clocks/eyeclock/distinfo	Sat Apr  9 23:38:11 2005
@@ -1,2 +1,2 @@
-MD5 (eyeclock-2.0.tar.gz) = bd2a6c70c9a13cb80efd7893ece4acbf
-SIZE (eyeclock-2.0.tar.gz) = 171747
+MD5 (eyeclk20.tgz) = bd2a6c70c9a13cb80efd7893ece4acbf
+SIZE (eyeclk20.tgz) = 171747
diff -urN /usr/ports/x11-clocks/eyeclock/files/patch-aa x11-clocks/eyeclock/files/patch-aa
--- /usr/ports/x11-clocks/eyeclock/files/patch-aa	Mon Dec 27 10:10:05 1999
+++ x11-clocks/eyeclock/files/patch-aa	Sun Apr 10 00:14:00 2005
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Dec 25 03:18:57 1999
-+++ Makefile	Sun Dec 26 16:33:49 1999
+--- Makefile.orig	Sat Dec 25 18:18:57 1999
++++ Makefile	Sun Apr 10 00:01:12 2005
 @@ -15,8 +15,8 @@
  ###############################################################################
  
@@ -31,6 +31,57 @@
  
  # Choose icon pixmap from below lines.
  
+@@ -44,33 +44,33 @@
+ all :		eyeclock eyeclock.1.gz makeclock
+ 
+ eyeclock :	main.o Clock.o Hand.o Number.o Eye.o converter.o etc.o
+-		gcc main.o Clock.o Hand.o Number.o Eye.o converter.o etc.o \
++		${CC} main.o Clock.o Hand.o Number.o Eye.o converter.o etc.o \
+ 			-o eyeclock \
+ 			-L${X11BASE}/lib \
+ 			-lm -lX11 -lXt -lXpm
+ 
+ main.o :	main.c Clock.h Hand.h Number.h Eye.h converter.h etc.h fallback_resources.h
+-		gcc -c main.c -O -I${X11BASE}/include \
++		${CC} -c main.c ${CFLAGS} -I${X11BASE}/include \
+ 		-DVERSION=\"${VERSION}\"
+ 
+ Clock.o : Clock.h ClockP.h Clock.c Hand.h Number.h Eye.h converter.h etc.h
+-		gcc -c Clock.c -O -I${X11BASE}/include
++		${CC} -c Clock.c ${CFLAGS} -I${X11BASE}/include
+ 
+ Hand.o :	Hand.h HandP.h Hand.c converter.h etc.h
+-		gcc -c Hand.c -O -I${X11BASE}/include
++		${CC} -c Hand.c ${CFLAGS} -I${X11BASE}/include
+ 
+ Number.o :	Number.h NumberP.h Number.c converter.h etc.h
+-		gcc -c Number.c -O -I${X11BASE}/include
++		${CC} -c Number.c ${CFLAGS} -I${X11BASE}/include
+ 
+ Eye.o :		Eye.h EyeP.h Eye.c converter.h etc.h
+-		gcc -c Eye.c -O -I${X11BASE}/include
++		${CC} -c Eye.c ${CFLAGS} -I${X11BASE}/include
+ 
+ converter.o :	converter.h converter.c etc.h
+-		gcc -c converter.c -O -I${X11BASE}/include \
++		${CC} -c converter.c ${CFLAGS} -I${X11BASE}/include \
+ 		-D${DEFAULT_FACE} -D${DEFAULT_ICON}
+ 
+ etc.o :		etc.h etc.c
+-		gcc -c etc.c -O -I${X11BASE}/include \
++		${CC} -c etc.c ${CFLAGS} -I${X11BASE}/include \
+ 		-DEYECLOCK_LIB=\"${PREFIX}/lib/X11/EyeClock\"
+ 
+ EyeClock :	${DEFAULT_RESOURCE}
+@@ -80,7 +80,7 @@
+ 		cat EyeClock | ./mkfbres > fallback_resources.h
+ 
+ mkfbres :	mkfbres.c
+-		gcc mkfbres.c -o mkfbres
++		${CC} mkfbres.c -o mkfbres
+ 
+ eyeclock.1.gz :	eyeclock.man
+ 		cp eyeclock.man eyeclock.1
 @@ -93,14 +93,15 @@
  backup :
  		cp COPYRIGHT* *.jpn CHANGE EyeClock* Makefile *.h *.c *.man bak
diff -urN /usr/ports/x11-clocks/eyeclock/pkg-descr x11-clocks/eyeclock/pkg-descr
--- /usr/ports/x11-clocks/eyeclock/pkg-descr	Mon Dec 27 10:10:07 1999
+++ x11-clocks/eyeclock/pkg-descr	Sat Apr  9 23:49:12 2005
@@ -8,7 +8,7 @@
 margueriteclock, octopusclock, punpunclock, silicagelclock,
 taroclock, umeharaclock.
 
-WWW: http://www.seki.ee.kagu.sut.ac.jp/~sakai/myfreesoft.html
+WWW: http://hp.vector.co.jp/authors/VA014157/myfreesoft/index.html
 
 - Sakai Hiroaki
 sakai at seki.ee.kagu.sut.ac.jp
>Release-Note:
>Audit-Trail:
>Unformatted:

