diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-09-28 02:02:43 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-09-28 02:02:43 +0000 |
| commit | 0569f5534c0e5b734b31e80dfd61a00385940a90 (patch) | |
| tree | edf82ff399d4591e758eae245dcde28b1d80e356 /x11-clocks | |
| parent | Add NO_PACKAGE (diff) | |
update to 2.3
PR: 30880
Submitted by: MAINTAINER
Notes
Notes:
svn path=/head/; revision=48232
Diffstat (limited to 'x11-clocks')
| -rw-r--r-- | x11-clocks/wmtimer/Makefile | 12 | ||||
| -rw-r--r-- | x11-clocks/wmtimer/distinfo | 2 | ||||
| -rw-r--r-- | x11-clocks/wmtimer/files/patch-wmtimer::Makefile | 35 |
3 files changed, 25 insertions, 24 deletions
diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile index 8ad6d582f9e7..3f66ba4b4ea4 100644 --- a/x11-clocks/wmtimer/Makefile +++ b/x11-clocks/wmtimer/Makefile @@ -6,7 +6,7 @@ # PORTNAME= wmtimer -PORTVERSION= 2.2 +PORTVERSION= 2.3 CATEGORIES= x11-clocks windowmaker MASTER_SITES= http://home.dwave.net/~jking/wmtimer/ @@ -18,6 +18,8 @@ USE_GMAKE= yes USE_X_PREFIX= yes USE_XPM= yes USE_GTK= yes +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" .if !defined(BATCH) HAS_CONFIGURE= yes @@ -25,14 +27,6 @@ IS_INTERACTIVE= yes .endif # !BATCH pre-patch: - @${PERL} -pi -n \ - -e "s!CFLAGS =! CFLAGS \+=!;" \ - -e "s!-I/usr/lib/glib/include!`${GTK_CONFIG} --cflags` `${GLIB_CONFIG} --cflags`!;" \ - -e "s!-lgtk -lgdk -rdynamic -lgmodule -lglib -ldl!`${GTK_CONFIG} --libs` `${GLIB_CONFIG} --libs`!;" \ - -e "s!/usr/X11R6/lib!${X11BASE}/lib!;" \ - -e "s!/usr/X11R6/include!${X11BASE}/include!;" \ - -e "s!/usr/lib!${LOCALBASE}/lib!;" \ - ${WRKSRC}/Makefile .if defined(IS_INTERACTIVE) @${PERL} -pi -ne "s!/bin/bash!${SH}!" ${WRKSRC}/configure .endif # IS_INTERACTIVE diff --git a/x11-clocks/wmtimer/distinfo b/x11-clocks/wmtimer/distinfo index bf3bbe9407d3..7fab2a17abdd 100644 --- a/x11-clocks/wmtimer/distinfo +++ b/x11-clocks/wmtimer/distinfo @@ -1 +1 @@ -MD5 (wmtimer-2.2.tar.gz) = c3703ca6cead5fc2a6a3740a28b8acf9 +MD5 (wmtimer-2.3.tar.gz) = 84346af2289b3c010d53529bdc260ee7 diff --git a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile b/x11-clocks/wmtimer/files/patch-wmtimer::Makefile index f8a809436961..7ed46b55403a 100644 --- a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile +++ b/x11-clocks/wmtimer/files/patch-wmtimer::Makefile @@ -1,20 +1,27 @@ ---- Makefile.orig Wed Dec 20 19:58:58 2000 -+++ Makefile Thu Apr 26 22:45:10 2001 -@@ -7,13 +7,9 @@ +--- Makefile.orig Thu Sep 27 19:46:25 2001 ++++ Makefile Thu Sep 27 19:48:29 2001 +@@ -1,19 +1,19 @@ +-LIBDIR = -L/usr/X11R6/lib -L/usr/lib +-LIBS = -lXpm -lXext -lX11 -lm `gtk-config --libs` -lpthread ++LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib ++LIBS = -lXpm -lXext -lX11 -lm `${GTK_CONFIG} --libs` ${PTHREAD_LIBS} + +-CFLAGS = -g -I/usr/X11R6/include `gtk-config --cflags` ++CFLAGS += -I${X11BASE}/include `${GTK_CONFIG} --cflags` ${PTHREAD_CFLAGS} -Wall + OBJS = wmtimer.o \ + ../wmgeneral/wmgeneral.o \ + ../wmgeneral/misc.o \ ../wmgeneral/list.o .c.o: -- cc -c -O2 -Wall $< -o $*.o $(CFLAGS) -+ $(CC) -c -Wall $< -o $*.o $(CFLAGS) +- $(CC) -c -O2 -Wall $< -o $*.o $(CFLAGS) ++ $(CC) -c $< -o $*.o $(CFLAGS) + + all: wmtimer --wmtimer: $(OBJS) + wmtimer: $(OBJS) - cc -Wall -g -o wmtimer $^ $(LIBDIR) $(LIBS) -+all: wmtimer ++ $(CC) -o wmtimer $^ $(LIBDIR) $(LIBS) --clean:: -- for i in $(OBJS) ; do \ -- rm -f $$i; \ -- done -- rm -f wmtimer -+wmtimer: $(OBJS) -+ $(CC) -Wall -g -o wmtimer $^ $(LIBDIR) $(LIBS) + clean:: + for i in $(OBJS) ; do \ |