diff --git a/x11-clocks/washerdryer/Makefile b/x11-clocks/washerdryer/Makefile index cbd82f636d5e..86558647b728 100644 --- a/x11-clocks/washerdryer/Makefile +++ b/x11-clocks/washerdryer/Makefile @@ -6,7 +6,7 @@ # PORTNAME= washerdryer -PORTVERSION= 1.0.1 +PORTVERSION= 1.1 CATEGORIES= x11-clocks windowmaker MASTER_SITES= http://ieng9.ucsd.edu/~m1foley/ DISTNAME= washerDryer-${PORTVERSION} diff --git a/x11-clocks/washerdryer/distinfo b/x11-clocks/washerdryer/distinfo index ab2e30c55422..ab7550dba293 100644 --- a/x11-clocks/washerdryer/distinfo +++ b/x11-clocks/washerdryer/distinfo @@ -1 +1 @@ -MD5 (washerDryer-1.0.1.tar.bz2) = 9b343c80441083ca2fc4141e352e5c37 +MD5 (washerDryer-1.1.tar.bz2) = 444910ff93ff06131a3501d7ff9cac97 diff --git a/x11-clocks/washerdryer/files/patch-Makefile b/x11-clocks/washerdryer/files/patch-Makefile index da7e2494f743..0acc494f0165 100644 --- a/x11-clocks/washerdryer/files/patch-Makefile +++ b/x11-clocks/washerdryer/files/patch-Makefile @@ -1,9 +1,9 @@ ---- Makefile.orig Tue Dec 18 18:49:09 2001 -+++ Makefile Tue Dec 18 18:50:37 2001 +--- Makefile.orig Sun Mar 24 00:48:56 2002 ++++ Makefile Sun Mar 24 02:40:46 2002 @@ -1,16 +1,16 @@ -LIBDIR = -L/usr/X11R6/lib -L/usr/lib -L/opt/gnome/lib --LIBS = -lXpm -lXext -lX11 -lm -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl --CFLAGS = -I/usr/X11R6/include -I/usr/lib/glib/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/opt/gnome/lib/glib/include -I/opt/gnome/include/glib-1.2 -I/opt/gnome/include/gtk-1.2 +-LIBS = -lXpm -lXext -lX11 -lm -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl +-CFLAGS = -I/usr/X11R6/include -I/usr/lib/glib/include -I/opt/gnome/include/gtk-1.2 -I/opt/gnome/include/glib-1.2 -I/opt/gnome/lib/glib/include +LIBDIR = -L${X11BASE}/lib +LIBS = `${GTK_CONFIG} --libs` -lXpm +CFLAGS += `${GTK_CONFIG} --cflags` @@ -17,8 +17,7 @@ + $(CC) -c -Wall $< -o $*.o $(CFLAGS) washerDryer: $(OBJS) -- cc -Wall -pedantic -g -o washerDryer $^ $(LIBDIR) $(LIBS) +- cc -Wall -pedantic -o washerDryer $^ $(LIBDIR) $(LIBS) + $(CC) -o washerDryer $^ $(LIBDIR) $(LIBS) - all:: washerDryer - + all:: washerDryer