1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00

update to 2.3

PR:		30880
Submitted by:	MAINTAINER
This commit is contained in:
Mario Sergio Fujikawa Ferreira 2001-09-28 02:02:43 +00:00
parent 7699937205
commit 0569f5534c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=48232
3 changed files with 25 additions and 24 deletions

View File

@ -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

View File

@ -1 +1 @@
MD5 (wmtimer-2.2.tar.gz) = c3703ca6cead5fc2a6a3740a28b8acf9
MD5 (wmtimer-2.3.tar.gz) = 84346af2289b3c010d53529bdc260ee7

View File

@ -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)
-wmtimer: $(OBJS)
all: wmtimer
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 \