4 files changed, 47 insertions, 55 deletions

diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index 19d918ddb927..50870f92ced0 100644
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@@ -1,15 +1,14 @@
 # New ports collection makefile for:   EyeClock
-# Version required:    1.0
+# Version required:    1.03
 # Date created:        4 September 1998
 # Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/09/17 00:32:54 asami Exp $
+# $Id: Makefile,v 1.4 1998/09/22 22:32:07 asami Exp $
 #
 
-DISTNAME=	eyeclock-1.0
+DISTNAME=	eyeclock-1.03
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.ed.kagu.sut.ac.jp/~j4397617/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
diff --git a/x11-clocks/eyeclock/distinfo b/x11-clocks/eyeclock/distinfo
index e6d5682170b1..da20e64b9edf 100644
--- a/x11-clocks/eyeclock/distinfo
+++ b/x11-clocks/eyeclock/distinfo
@@ -1 +1 @@
-MD5 (eyeclock-1.0.tgz) = 9fd412e6c1299c7e363e95a90355ea10
+MD5 (eyeclock-1.03.tar.gz) = 959565ee7620c540878b286641063ad4
diff --git a/x11-clocks/eyeclock/files/patch-aa b/x11-clocks/eyeclock/files/patch-aa
index 132e959897e0..5ad79cc20724 100644
--- a/x11-clocks/eyeclock/files/patch-aa
+++ b/x11-clocks/eyeclock/files/patch-aa
@@ -1,12 +1,18 @@
---- Makefile.orig	Thu Sep 17 01:42:06 1998
-+++ Makefile	Mon Sep 21 07:45:06 1998
-@@ -1,20 +1,25 @@
-+LIBS=	-L${X11BASE}/lib -lm -lX11 -lXt -lXmu -lXaw -lXpm
+--- 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,${X11BASE}/lib
++LDFLAGS=-Wl,-rpath,${PREFIX}/lib
 +.endif
-+CFLAGS+=-I${X11BASE}/include
-+
++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 \
@@ -14,53 +20,38 @@
 -			-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}
+-		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}
+-		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}
+-		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}
+-		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}
+-		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}
+-		gcc -c eyetime.c -O -I/usr/X11R6/include \
++		gcc -c eyetime.c ${CFLAGS} \
+ 		-DEYECLOCK_LIB=\"${EYECLOCK_LIB}/\"
  clean :
  		rm *.o eyeclock
- backup :
-@@ -36,19 +41,19 @@
- 		cp sample2 sample2.bak
- 		cp sample2.xpm sample2.xpm.bak
+@@ -50,8 +54,7 @@
+ 		cp sample3 sample3.bak
+ 		cp sample3.xpm sample3.xpm.bak
  install :
--		cp eyeclock /usr/X11R6/bin
--		chmod 0755 /usr/X11R6/bin/eyeclock
--		mkdir /usr/X11R6/lib/X11/EyeClock
-+		cp eyeclock ${PREFIX}/bin
-+		chmod 0755 ${PREFIX}/bin/eyeclock
-+		mkdir -p ${PREFIX}/lib/X11/EyeClock
+-		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 \
--			/usr/X11R6/lib/X11/EyeClock
--		chmod 0444 /usr/X11R6/lib/X11/EyeClock/*
--		cp eyeclock.1.gz /usr/X11R6/man/man1
--		chmod 0444 /usr/X11R6/man/man1/eyeclock.1.gz
-+			${PREFIX}/lib/X11/EyeClock
-+		chmod 0444 ${PREFIX}/lib/X11/EyeClock/*
-+		cp eyeclock.1.gz ${PREFIX}/man/man1
-+		chmod 0444 ${PREFIX}/man/man1/eyeclock.1.gz
- uninstall :
--		rm /usr/X11R6/bin/eyeclock
--		rm /usr/X11R6/man/man1/eyeclock.1.gz
--		rm -f -R /usr/X11R6/lib/X11/EyeClock
-+		rm ${PREFIX}/bin/eyeclock
-+		rm ${PREFIX}/man/man1/eyeclock.1.gz
-+		rm -f -R ${PREFIX}/lib/X11/EyeClock
- package :
- 		rm -f eyeclock-1.0/*
- 		cp eyeclock.man eyeclock.1
diff --git a/x11-clocks/eyeclock/pkg-plist b/x11-clocks/eyeclock/pkg-plist
index 8b526e5a3227..b1dd5c9efa6a 100644
--- a/x11-clocks/eyeclock/pkg-plist
+++ b/x11-clocks/eyeclock/pkg-plist
@@ -1,9 +1,11 @@
 bin/eyeclock
+lib/X11/EyeClock/COPYRIGHT.euc
+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/README.euc
-lib/X11/EyeClock/Makefile
-lib/X11/EyeClock/COPYRIGHT.euc
+lib/X11/EyeClock/sample3.xpm
 @dirrm lib/X11/EyeClock