Date: Thu, 27 Sep 2001 20:07:52 -0400 (EDT) From: Patrick Li <pat@databits.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/30880: Update port x11-clocks/wmtimer Message-ID: <200109280007.f8S07qo49229@cc92687-a.wlgrv1.pa.home.com>
next in thread | raw e-mail | index | archive | help
>Number: 30880 >Category: ports >Synopsis: Update port x11-clocks/wmtimer >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Sep 27 17:10:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Patrick Li >Release: FreeBSD 4.4-STABLE i386 >Organization: N/A >Environment: System: FreeBSD bottlenek 4.4-STABLE FreeBSD 4.4-STABLE #0: Fri Sep 21 14:27:29 EDT 2001 root@:/usr/src/sys/compile/BOTTLENEK i386 >Description: Just another update. >How-To-Repeat: N/A >Fix: diff -ruN /usr/ports/x11-clocks/wmtimer/Makefile wmtimer/Makefile --- /usr/ports/x11-clocks/wmtimer/Makefile Wed May 2 21:29:59 2001 +++ wmtimer/Makefile Thu Sep 27 19:57:40 2001 @@ -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_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 @@ .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 -ruN /usr/ports/x11-clocks/wmtimer/distinfo wmtimer/distinfo --- /usr/ports/x11-clocks/wmtimer/distinfo Mon Aug 20 09:14:11 2001 +++ wmtimer/distinfo Thu Sep 27 17:59:56 2001 @@ -1 +1 @@ -MD5 (wmtimer-2.2.tar.gz) = c3703ca6cead5fc2a6a3740a28b8acf9 +MD5 (wmtimer-2.3.tar.gz) = 84346af2289b3c010d53529bdc260ee7 diff -ruN /usr/ports/x11-clocks/wmtimer/files/patch-wmtimer::Makefile wmtimer/files/patch-wmtimer::Makefile --- /usr/ports/x11-clocks/wmtimer/files/patch-wmtimer::Makefile Tue May 1 13:16:31 2001 +++ wmtimer/files/patch-wmtimer::Makefile Thu Sep 27 19:56:35 2001 @@ -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 \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200109280007.f8S07qo49229>