[43636] trunk/dports/x11/eyeclock

[jeremyhu at macports.org]

Revision: 43636
          http://trac.macports.org/changeset/43636
Author:   jeremyhu at macports.org
Date:     2008-12-12 11:50:38 -0800 (Fri, 12 Dec 2008)
Log Message:
-----------
eyeclock: universal, parallel, added missing dependencies, leech off FreeBSD since upstream 404s

Modified Paths:
--------------
    trunk/dports/x11/eyeclock/Portfile
    trunk/dports/x11/eyeclock/files/patch-Makefile

Modified: trunk/dports/x11/eyeclock/Portfile
===================================================================
--- trunk/dports/x11/eyeclock/Portfile	2008-12-12 19:30:08 UTC (rev 43635)
+++ trunk/dports/x11/eyeclock/Portfile	2008-12-12 19:50:38 UTC (rev 43636)
@@ -3,6 +3,7 @@
 PortSystem       1.0
 name             eyeclock
 version          2.0
+revision         1
 categories       x11
 maintainers      nomaintainer
 description      A clock with eyes following the mouse pointer
@@ -12,10 +13,30 @@
     move the eyes of the picture following the mouse pointer.
 homepage         http://web.ffn.ne.jp/~hsakai/myfreesoft/index.html#3
 platforms        darwin
-master_sites     http://web.ffn.ne.jp/~hsakai/myfreesoft/
+master_sites     http://ftp8.ua.freebsd.org/FreeBSD/distfiles/
 checksums        md5 bd2a6c70c9a13cb80efd7893ece4acbf
 patchfiles       patch-Makefile
+
+depends_lib \
+	lib:libXpm.4:xpm \
+	lib:libXt.6:xorg-libXt
+
 use_configure    no
+use_parallel_build yes
+
 build.args       PREFIX=${prefix}
-destroot.destdir PREFIX=${destroot}${prefix} \
-    RESDIR=${destroot}/usr/X11R6/lib/X11/app-defaults
+destroot.destdir PREFIX=${destroot}${prefix}
+
+build.target-append OCFLAGS="${configure.cflags}" OLDFLAGS="${configure.ldflags}"
+
+variant universal {
+	build.target-append OCFLAGS="${configure.cflags} ${configure.universal_cflags}" OLDFLAGS="${configure.ldflags} ${configure.universal_ldflags}"
+}
+
+pre-build {
+	if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+		build.target-append X11BASE=${prefix}
+	} else {
+		build.target-append X11BASE=${x11prefix}
+	}
+}

Modified: trunk/dports/x11/eyeclock/files/patch-Makefile
===================================================================
--- trunk/dports/x11/eyeclock/files/patch-Makefile	2008-12-12 19:30:08 UTC (rev 43635)
+++ trunk/dports/x11/eyeclock/files/patch-Makefile	2008-12-12 19:50:38 UTC (rev 43636)
@@ -1,22 +1,58 @@
---- Makefile-orig	Fri Jan  9 06:18:13 2004
-+++ Makefile	Fri Jan  9 06:20:14 2004
-@@ -18,9 +18,9 @@
- PREFIX  = /usr/X11R6
- X11BASE = /usr/X11R6
+--- Makefile.orig	2008-12-12 11:46:12.000000000 -0800
++++ Makefile	2008-12-12 11:47:21.000000000 -0800
+@@ -20,10 +20,13 @@ X11BASE = /usr/X11R6
  BINDIR  = ${PREFIX}/bin
--LIBDIR  = ${PREFIX}/lib/X11/EyeClock
-+LIBDIR  = ${PREFIX}/share/eyeclock
+ LIBDIR  = ${PREFIX}/lib/X11/EyeClock
  RESDIR  = ${PREFIX}/lib/X11/app-defaults
 -MANDIR  = ${PREFIX}/man/man1
 +MANDIR  = ${PREFIX}/share/man/man1
  PKGNAME = eyeclock-2.0
  VERSION = EyeClock-2.0
  
-@@ -71,13 +71,13 @@
++CFLAGS = -O2 -I$(X11BASE)/include $(OCFLAGS)
++LDFLAGS = -L$(X11BASE)/lib $(OLDFLAGS)
++
+ # Choose a default face from below lines.
  
+ #DEFAULT_FACE = DEFAULT_FACE_IS_BSD_DAEMON
+@@ -46,38 +49,38 @@ 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 \
+ 			-o eyeclock \
+-			-L${X11BASE}/lib \
++			$(LDFLAGS) \
+ 			-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 \
++		gcc -c main.c $(CFLAGS) \
+ 		-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
++		gcc -c Clock.c $(CFLAGS)
+ 
+ Hand.o :	Hand.h HandP.h Hand.c converter.h etc.h
+-		gcc -c Hand.c -O -I${X11BASE}/include
++		gcc -c Hand.c $(CFLAGS)
+ 
+ Number.o :	Number.h NumberP.h Number.c converter.h etc.h
+-		gcc -c Number.c -O -I${X11BASE}/include
++		gcc -c Number.c $(CFLAGS)
+ 
+ Eye.o :		Eye.h EyeP.h Eye.c converter.h etc.h
+-		gcc -c Eye.c -O -I${X11BASE}/include
++		gcc -c Eye.c $(CFLAGS)
+ 
+ converter.o :	converter.h converter.c etc.h
+-		gcc -c converter.c -O -I${X11BASE}/include \
++		gcc -c converter.c $(CFLAGS) \
+ 		-D${DEFAULT_FACE} -D${DEFAULT_ICON}
+ 
  etc.o :		etc.h etc.c
- 		gcc -c etc.c -O -I${X11BASE}/include \
+-		gcc -c etc.c -O -I${X11BASE}/include \
 -		-DEYECLOCK_LIB=\"${PREFIX}/lib/X11/EyeClock\"
++		gcc -c etc.c $(CFLAGS) \
 +		-DEYECLOCK_LIB=\"${LIBDIR}\"
  
  EyeClock :	${DEFAULT_RESOURCE}
@@ -29,7 +65,7 @@
  
  mkfbres :	mkfbres.c
  		gcc mkfbres.c -o mkfbres
-@@ -148,7 +148,8 @@
+@@ -148,7 +151,8 @@ install :	eyeclock makeclock clearclock
  		chmod 0755 ${BINDIR}/eyeclock
  		cp COPYRIGHT README.jpn CHANGE OMAKE.jpn Makefile EyeClock.* \
  			xpm/*.xpm ${LIBDIR}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081212/ef94837e/attachment-0001.html>