7 files changed, 250 insertions, 74 deletions

diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index da23a0374e96..a9570928e314 100644
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:   EyeClock
-# Version required:    1.03
+# Version required:    2.0
 # Date created:        4 September 1998
 # Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eyeclock-1.03
+DISTNAME=	eyeclock-2.0
 CATEGORIES=	x11-clocks
-MASTER_SITES=	http://www.ed.kagu.sut.ac.jp/~j4397617/
+MASTER_SITES=	http://www.seki.ee.kagu.sut.ac.jp/~sakai/
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-ALL_TARGET=	eyeclock
+#ALL_TARGET=	all
+
 USE_X_PREFIX=	yes
 
 MAN1=		eyeclock.1
diff --git a/x11-clocks/eyeclock/distinfo b/x11-clocks/eyeclock/distinfo
index da20e64b9edf..1e63de0524bb 100644
--- a/x11-clocks/eyeclock/distinfo
+++ b/x11-clocks/eyeclock/distinfo
@@ -1 +1 @@
-MD5 (eyeclock-1.03.tar.gz) = 959565ee7620c540878b286641063ad4
+MD5 (eyeclock-2.0.tar.gz) = bd2a6c70c9a13cb80efd7893ece4acbf
diff --git a/x11-clocks/eyeclock/files/patch-aa b/x11-clocks/eyeclock/files/patch-aa
index 5ad79cc20724..c8327404ade1 100644
--- a/x11-clocks/eyeclock/files/patch-aa
+++ b/x11-clocks/eyeclock/files/patch-aa
@@ -1,57 +1,62 @@
---- Makefile.orig	Wed Dec  9 14:20:29 1998
-+++ Makefile	Wed Dec  9 14:30:10 1998
-@@ -1,31 +1,35 @@
--EYECLOCK_PREFIX = /usr/X11R6
-+EYECLOCK_PREFIX = ${PREFIX}
- EYECLOCK_BIN = ${EYECLOCK_PREFIX}/bin
- EYECLOCK_LIB = ${EYECLOCK_PREFIX}/lib/X11/EyeClock
- EYECLOCK_MAN = ${EYECLOCK_PREFIX}/man/man1
- EYECLOCK_TARBALL = eyeclock-1.03
-+LIBS=	-L${PREFIX}/lib -lX11 -lXt -lXmu -lXaw -lXpm -lm
-+.if ${PORTOBJFORMAT} == "elf"
-+LDFLAGS=-Wl,-rpath,${PREFIX}/lib
-+.endif
-+CFLAGS+=-I${PREFIX}/include
- 
- eyeclock :	eyegraph.o eyeinit.o eyemain.o eyequit.o eyestr.o eyetime.o
- 			gcc eyegraph.o eyeinit.o eyemain.o eyequit.o eyestr.o \
- 			eyetime.o \
--			-o eyeclock -O -L/usr/X11R6/lib \
--			-lm -lX11 -lXt -lXmu -lXaw -lXpm
-+			-o eyeclock ${CFLAGS} ${LIBS} ${LDFLAGS}
- eyegraph.o :	eyegraph.c
--		gcc -c eyegraph.c -O -I/usr/X11R6/include \
-+		gcc -c eyegraph.c ${CFLAGS} \
- 		-DEYECLOCK_LIB=\"${EYECLOCK_LIB}/\"
- eyeinit.o :	eyeinit.c
--		gcc -c eyeinit.c -O -I/usr/X11R6/include \
-+		gcc -c eyeinit.c ${CFLAGS} \
- 		-DEYECLOCK_LIB=\"${EYECLOCK_LIB}/\"
- eyemain.o :	eyemain.c
--		gcc -c eyemain.c -O -I/usr/X11R6/include \
-+		gcc -c eyemain.c ${CFLAGS} \
- 		-DEYECLOCK_LIB=\"${EYECLOCK_LIB}/\"
- eyequit.o :	eyequit.c
--		gcc -c eyequit.c -O -I/usr/X11R6/include \
-+		gcc -c eyequit.c ${CFLAGS} \
- 		-DEYECLOCK_LIB=\"${EYECLOCK_LIB}/\"
- eyestr.o :	eyestr.c
--		gcc -c eyestr.c -O -I/usr/X11R6/include \
-+		gcc -c eyestr.c ${CFLAGS} \
- 		-DEYECLOCK_LIB=\"${EYECLOCK_LIB}/\"
- eyetime.o :	eyetime.c
--		gcc -c eyetime.c -O -I/usr/X11R6/include \
-+		gcc -c eyetime.c ${CFLAGS} \
- 		-DEYECLOCK_LIB=\"${EYECLOCK_LIB}/\"
- clean :
- 		rm *.o eyeclock
-@@ -50,8 +54,7 @@
- 		cp sample3 sample3.bak
- 		cp sample3.xpm sample3.xpm.bak
- install :
--		cp eyeclock ${EYECLOCK_BIN}
--		chmod 0755 ${EYECLOCK_BIN}/eyeclock
-+		${INSTALL} -s eyeclock ${EYECLOCK_BIN}
- 		mkdir -p ${EYECLOCK_LIB}
- 		cp COPYRIGHT.euc Makefile README.euc \
- 			sample1 sample1.xpm sample2 sample2.xpm \
+--- Makefile.orig	Sat Dec 25 03:18:57 1999
++++ Makefile	Sun Dec 26 16:33:49 1999
+@@ -15,8 +15,8 @@
+ ###############################################################################
+ 
+ #PREFIX  = /usr/local
+-PREFIX  = /usr/X11R6
+-X11BASE = /usr/X11R6
++#PREFIX  = /usr/X11R6
++#X11BASE = /usr/X11R6
+ BINDIR  = ${PREFIX}/bin
+ LIBDIR  = ${PREFIX}/lib/X11/EyeClock
+ RESDIR  = ${PREFIX}/lib/X11/app-defaults
+@@ -26,15 +26,15 @@
+ 
+ # Choose a default face from below lines.
+ 
+-#DEFAULT_FACE = DEFAULT_FACE_IS_BSD_DAEMON
++DEFAULT_FACE = DEFAULT_FACE_IS_BSD_DAEMON
+ #DEFAULT_FACE = DEFAULT_FACE_IS_PENGUIN
+-DEFAULT_FACE = DEFAULT_FACE_IS_NORMAL
++#DEFAULT_FACE = DEFAULT_FACE_IS_NORMAL
+ 
+ # Choose a default resource file from below lines.
+ 
+-#DEFAULT_RESOURCE = EyeClock.daemon
++DEFAULT_RESOURCE = EyeClock.daemon
+ #DEFAULT_RESOURCE = EyeClock.penguin
+-DEFAULT_RESOURCE = EyeClock.normal
++#DEFAULT_RESOURCE = EyeClock.normal
+ 
+ # Choose icon pixmap from below lines.
+ 
+@@ -93,14 +93,15 @@
+ backup :
+ 		cp COPYRIGHT* *.jpn CHANGE EyeClock* Makefile *.h *.c *.man bak
+ 
+-makeclock :	eyeclock daemonclock penguinclock umeharaclock taroclock boyclock girlclock henohenoclock silicagelclock punpunclock margueriteclock octopusclock
++#makeclock :	eyeclock daemonclock penguinclock umeharaclock taroclock boyclock girlclock henohenoclock silicagelclock punpunclock margueriteclock octopusclock
++makeclock :	eyeclock daemonclock umeharaclock taroclock boyclock girlclock henohenoclock silicagelclock punpunclock margueriteclock octopusclock
+ 
+ daemonclock :
+ 		ln -s eyeclock daemonclock
+ 
+-penguinclock :
+-		ln -s eyeclock penguinclock
+-
++#penguinclock :
++#		ln -s eyeclock penguinclock
++#
+ umeharaclock :
+ 		ln -s eyeclock umeharaclock
+ 
+@@ -131,7 +132,7 @@
+ clearclock :
+ 		rm -f ${BINDIR}/eyeclock
+ 		rm -f ${BINDIR}/daemonclock
+-		rm -f ${BINDIR}/penguinclock
++#		rm -f ${BINDIR}/penguinclock
+ 		rm -f ${BINDIR}/umeharaclock
+ 		rm -f ${BINDIR}/taroclock
+ 		rm -f ${BINDIR}/boyclock
diff --git a/x11-clocks/eyeclock/files/patch-ab b/x11-clocks/eyeclock/files/patch-ab
new file mode 100644
index 000000000000..82004a1beba9
--- /dev/null
+++ b/x11-clocks/eyeclock/files/patch-ab
@@ -0,0 +1,72 @@
+--- main.c.orig	Sun Dec 26 16:34:55 1999
++++ main.c	Sun Dec 26 16:37:01 1999
+@@ -76,7 +76,7 @@
+ /*===========================================================================*/
+ 
+ static Widget toplevel = 0;
+-static Widget clock = 0;
++static Widget myclock = 0;
+ 
+ /*===========================================================================*/
+ /* Number ヴィジェットのヴィジェットごとの名前                               */
+@@ -616,9 +616,9 @@
+   Display * display;
+   int i;
+ 
+-  if (clock)
+-    if (XtIsRealized(clock))
+-      ClockStop(clock);
++  if (myclock)
++    if (XtIsRealized(myclock))
++      ClockStop(myclock);
+ 
+   if (toplevel)
+     if (XtIsRealized(toplevel)) {
+@@ -650,8 +650,8 @@
+   unsigned int width;
+   unsigned int height;
+ 
+-  width  = ClockGetFaceWidth(clock);
+-  height = ClockGetFaceHeight(clock);
++  width  = ClockGetFaceWidth(myclock);
++  height = ClockGetFaceHeight(myclock);
+ 
+   if (width && height)
+     XtVaSetValues(toplevel, XtNwidth, width, XtNheight, height, NULL);
+@@ -730,23 +730,23 @@
+   }
+ 
+   /* Clock ヴィジェットの作成 */
+-  clock = XtCreateManagedWidget("clock", clockWidgetClass, toplevel, NULL, 0);
++  myclock = XtCreateManagedWidget("clock", clockWidgetClass, toplevel, NULL, 0);
+ 
+   /* Hand ヴィジェットの作成 */
+   for (i = 0; hands_default_values[i].name; i++)
+     XtVaCreateManagedWidget(hands_default_values[i].name,
+-			    handWidgetClass, clock,
++			    handWidgetClass, myclock,
+ 			    XtNtype, hands_default_values[i].type, NULL);
+ 
+   /* Number ヴィジェットの作成 */
+   for (i = 0; numbers_default_values[i].name; i++)
+     XtVaCreateManagedWidget(numbers_default_values[i].name,
+-			    numberWidgetClass, clock,
++			    numberWidgetClass, myclock,
+ 			    XtNnumber, numbers_default_values[i].number, NULL);
+ 
+   /* Eye ヴィジェットの作成 */
+   for (i = 0; eyes_name[i]; i++)
+-    XtCreateManagedWidget(eyes_name[i], eyeWidgetClass, clock, NULL, 0);
++    XtCreateManagedWidget(eyes_name[i], eyeWidgetClass, myclock, NULL, 0);
+ 
+   /* ポインタのフォーカスを有効にする */
+   XtVaSetValues(toplevel, XtNinput, True, NULL);
+@@ -788,7 +788,7 @@
+   XSetWMProtocols(display, XtWindow(toplevel), &wm_delete_window, 1);
+ 
+   /* 時計をスタートさせる */
+-  ClockStart(app_context, clock);
++  ClockStart(app_context, myclock);
+ 
+   /* Ctrl-c のトラップ */
+   signal(SIGINT, interrupt_handler);
diff --git a/x11-clocks/eyeclock/pkg-comment b/x11-clocks/eyeclock/pkg-comment
index 9fd5d83bd25d..438a0982d0f6 100644
--- a/x11-clocks/eyeclock/pkg-comment
+++ b/x11-clocks/eyeclock/pkg-comment
@@ -1 +1 @@
-A clock application for X. The eyes follow the mouse
+A clock with eyes following the mouse pointer
diff --git a/x11-clocks/eyeclock/pkg-descr b/x11-clocks/eyeclock/pkg-descr
index 93832a5ffaed..f7af3b34d33c 100644
--- a/x11-clocks/eyeclock/pkg-descr
+++ b/x11-clocks/eyeclock/pkg-descr
@@ -1,3 +1,14 @@
-EyeClock is a simple clock application for X11. You can put an optional 
-picture on the face of the clock. And you can move the eyes of the      
-picture following the mouse.                                            
+EyeClock is a simple clock application for X11. You can put your favorite
+picture on the face of the clock. And you can move the eyes of the
+picture following the mouse pointer.
+See /usr/X11R6/lib/X11/EyeClock/README.jpn for more details.
+
+This port installs below clocks.
+boyclock, daemonclock, eyeclock, girlclock, henohenoclock,
+margueriteclock, octopusclock, punpunclock, silicagelclock,
+taroclock, umeharaclock.
+
+WWW: http://www.seki.ee.kagu.sut.ac.jp/~sakai/myfreesoft.html
+
+- Sakai Hiroaki
+sakai@seki.ee.kagu.sut.ac.jp
diff --git a/x11-clocks/eyeclock/pkg-plist b/x11-clocks/eyeclock/pkg-plist
index b1dd5c9efa6a..c85284946cf3 100644
--- a/x11-clocks/eyeclock/pkg-plist
+++ b/x11-clocks/eyeclock/pkg-plist
@@ -1,11 +1,98 @@
+bin/boyclock
+bin/daemonclock
 bin/eyeclock
-lib/X11/EyeClock/COPYRIGHT.euc
+bin/girlclock
+bin/henohenoclock
+bin/margueriteclock
+bin/octopusclock
+bin/punpunclock
+bin/silicagelclock
+bin/taroclock
+bin/umeharaclock
+lib/X11/EyeClock/CHANGE
+lib/X11/EyeClock/COPYRIGHT
+lib/X11/EyeClock/EyeClock.daemon
+lib/X11/EyeClock/EyeClock.normal
+lib/X11/EyeClock/EyeClock.penguin
 lib/X11/EyeClock/Makefile
-lib/X11/EyeClock/README.euc
-lib/X11/EyeClock/sample1
-lib/X11/EyeClock/sample2
-lib/X11/EyeClock/sample3
-lib/X11/EyeClock/sample1.xpm
-lib/X11/EyeClock/sample2.xpm
-lib/X11/EyeClock/sample3.xpm
+lib/X11/EyeClock/OMAKE.jpn
+lib/X11/EyeClock/README.jpn
+lib/X11/EyeClock/angry_left_eye.xpm
+lib/X11/EyeClock/angry_right_eye.xpm
+lib/X11/EyeClock/boy_face.xpm
+lib/X11/EyeClock/boy_left_core.xpm
+lib/X11/EyeClock/boy_left_eye.xpm
+lib/X11/EyeClock/boy_right_core.xpm
+lib/X11/EyeClock/boy_right_eye.xpm
+lib/X11/EyeClock/daemon_face.xpm
+lib/X11/EyeClock/daemon_icon_face.xpm
+lib/X11/EyeClock/daemon_left_eye.xpm
+lib/X11/EyeClock/daemon_right_eye.xpm
+lib/X11/EyeClock/default_icon_face.xpm
+lib/X11/EyeClock/default_left_core.xpm
+lib/X11/EyeClock/default_right_core.xpm
+lib/X11/EyeClock/girl_face.xpm
+lib/X11/EyeClock/girl_left_core.xpm
+lib/X11/EyeClock/girl_left_eye.xpm
+lib/X11/EyeClock/girl_right_core.xpm
+lib/X11/EyeClock/girl_right_eye.xpm
+lib/X11/EyeClock/henoheno_face.xpm
+lib/X11/EyeClock/henoheno_left_core.xpm
+lib/X11/EyeClock/henoheno_right_core.xpm
+lib/X11/EyeClock/marguerite_face.xpm
+lib/X11/EyeClock/marguerite_left_core.xpm
+lib/X11/EyeClock/marguerite_left_eye.xpm
+lib/X11/EyeClock/marguerite_right_core.xpm
+lib/X11/EyeClock/marguerite_right_eye.xpm
+lib/X11/EyeClock/number_01.xpm
+lib/X11/EyeClock/number_02.xpm
+lib/X11/EyeClock/number_03.xpm
+lib/X11/EyeClock/number_04.xpm
+lib/X11/EyeClock/number_05.xpm
+lib/X11/EyeClock/number_06.xpm
+lib/X11/EyeClock/number_07.xpm
+lib/X11/EyeClock/number_08.xpm
+lib/X11/EyeClock/number_09.xpm
+lib/X11/EyeClock/number_10.xpm
+lib/X11/EyeClock/number_11.xpm
+lib/X11/EyeClock/number_12.xpm
+lib/X11/EyeClock/number_big.xpm
+lib/X11/EyeClock/number_needle_00.xpm
+lib/X11/EyeClock/number_needle_01.xpm
+lib/X11/EyeClock/number_needle_02.xpm
+lib/X11/EyeClock/number_needle_03.xpm
+lib/X11/EyeClock/number_needle_04.xpm
+lib/X11/EyeClock/number_needle_05.xpm
+lib/X11/EyeClock/number_r01.xpm
+lib/X11/EyeClock/number_r02.xpm
+lib/X11/EyeClock/number_r03.xpm
+lib/X11/EyeClock/number_r04.xpm
+lib/X11/EyeClock/number_r05.xpm
+lib/X11/EyeClock/number_r06.xpm
+lib/X11/EyeClock/number_r07.xpm
+lib/X11/EyeClock/number_r08.xpm
+lib/X11/EyeClock/number_r09.xpm
+lib/X11/EyeClock/number_r10.xpm
+lib/X11/EyeClock/number_r11.xpm
+lib/X11/EyeClock/number_r12.xpm
+lib/X11/EyeClock/number_small.xpm
+lib/X11/EyeClock/octopus_face.xpm
+lib/X11/EyeClock/octopus_left_core.xpm
+lib/X11/EyeClock/octopus_left_eye.xpm
+lib/X11/EyeClock/octopus_right_core.xpm
+lib/X11/EyeClock/octopus_right_eye.xpm
+lib/X11/EyeClock/penguin_face.xpm
+lib/X11/EyeClock/penguin_left_eye.xpm
+lib/X11/EyeClock/penguin_right_eye.xpm
+lib/X11/EyeClock/silicagel_face.xpm
+lib/X11/EyeClock/silicagel_left_core.xpm
+lib/X11/EyeClock/silicagel_left_eye.xpm
+lib/X11/EyeClock/silicagel_right_core.xpm
+lib/X11/EyeClock/silicagel_right_eye.xpm
+lib/X11/EyeClock/taro_face.xpm
+lib/X11/EyeClock/taro_left_core.xpm
+lib/X11/EyeClock/taro_left_eye.xpm
+lib/X11/EyeClock/taro_right_core.xpm
+lib/X11/EyeClock/taro_right_eye.xpm
+lib/X11/app-defaults/EyeClock
 @dirrm lib/X11/EyeClock