Thu Aug 6 21:41:43 2015 UTC ()
Add support for CFLAGS

No functional change intended.


(khorben)
diff -r1.2 -r1.3 pkgsrc/time/wmitime/distinfo
diff -r1.1 -r1.2 pkgsrc/time/wmitime/patches/patch-aa
cvs diff -r1.2 -r1.3 pkgsrc/time/wmitime/distinfo (expand / switch to unified diff)

--- pkgsrc/time/wmitime/distinfo 2013/11/07 00:49:46 1.2
+++ pkgsrc/time/wmitime/distinfo 2015/08/06 21:41:43 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2013/11/07 00:49:46 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2015/08/06 21:41:43 khorben Exp $
2 2
3SHA1 (wmitime-0.3.tar.gz) = 64bb07c5eccce5592088cfccc87836f66695e07c 3SHA1 (wmitime-0.3.tar.gz) = 64bb07c5eccce5592088cfccc87836f66695e07c
4RMD160 (wmitime-0.3.tar.gz) = b2301a15ef159d2d55418ae5fbf914bedc388478 4RMD160 (wmitime-0.3.tar.gz) = b2301a15ef159d2d55418ae5fbf914bedc388478
5Size (wmitime-0.3.tar.gz) = 21442 bytes 5Size (wmitime-0.3.tar.gz) = 21442 bytes
6SHA1 (patch-.._wmgeneral_list.h) = 3833c707c4eaf8ef8297eb5b5658db14d70e24ee 6SHA1 (patch-.._wmgeneral_list.h) = 3833c707c4eaf8ef8297eb5b5658db14d70e24ee
7SHA1 (patch-aa) = 9e2dc61ca81e403b142238aaaacd73297cc55e37 7SHA1 (patch-aa) = e3dfcd4a36cb282a80f63534222d727d4a73f891
cvs diff -r1.1 -r1.2 pkgsrc/time/wmitime/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/time/wmitime/patches/Attic/patch-aa 2013/11/06 00:35:20 1.1
+++ pkgsrc/time/wmitime/patches/Attic/patch-aa 2015/08/06 21:41:43 1.2
@@ -1,29 +1,40 @@ @@ -1,29 +1,40 @@
1$NetBSD: patch-aa,v 1.1 2013/11/06 00:35:20 khorben Exp $ 1$NetBSD: patch-aa,v 1.2 2015/08/06 21:41:43 khorben Exp $
2 2
3Implements PKG_DESTDIR_SUPPORT 3- implements PKG_DESTDIR_SUPPORT
 4- adds support for CFLAGS
 5- removes duplicate library while linking
4 6
5--- Makefile.orig 1999-03-29 03:51:39.000000000 +0000 7--- Makefile.orig 1999-03-29 03:51:39.000000000 +0000
6+++ Makefile 8+++ Makefile
7@@ -1,7 +1,7 @@ 9@@ -1,7 +1,7 @@
8-#LANG = fr 10-#LANG = fr
9-LIBDIR = -L/usr/X11R6/lib 11-LIBDIR = -L/usr/X11R6/lib
10+LANG = en  12+LANG = en
11+LIBDIR = ${LDFLAGS}  13+LIBDIR = ${LDFLAGS}
12 LIBS = -lXpm -lXext -lX11 -lm 14 LIBS = -lXpm -lXext -lX11 -lm
13-FLAGS = -O2 15-FLAGS = -O2
14+FLAGS = -O2 ${BUILDLINK_CPPFLAGS}  16+FLAGS = ${BUILDLINK_CPPFLAGS} ${CFLAGS}
15 OBJS = wmitime.o \ 17 OBJS = wmitime.o \
16 ../wmgeneral/wmgeneral.o \ 18 ../wmgeneral/wmgeneral.o \
17 ../wmgeneral/misc.o \ 19 ../wmgeneral/misc.o \
 20@@ -12,7 +12,7 @@ OBJS = wmitime.o \
 21 cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
 22
 23 wmtime: $(OBJS)
 24- cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
 25+ cc $(FLAGS) -D$(LANG) -o wmitime $^ $(LIBDIR) $(LIBS)
 26
 27 all:: wmtime
 28
18@@ -24,9 +24,8 @@ clean:: 29@@ -24,9 +24,8 @@ clean::
19 rm -f *~ 30 rm -f *~
20  31
21 install:: wmitime 32 install:: wmitime
22- cp -f wmitime /usr/local/bin/ 33- cp -f wmitime /usr/local/bin/
23- chmod 755 /usr/local/bin/wmitime 34- chmod 755 /usr/local/bin/wmitime
24- chown root:root /usr/local/bin/wmitime 35- chown root:root /usr/local/bin/wmitime
25+ mkdir -p $(DESTDIR)$(PREFIX)/bin 36+ mkdir -p $(DESTDIR)$(PREFIX)/bin
26+ install -m 755 wmitime $(DESTDIR)$(PREFIX)/bin/wmitime 37+ install -m 755 wmitime $(DESTDIR)$(PREFIX)/bin/wmitime
27 # cp wminetrc $(HOME)/.wminetrc 38 # cp wminetrc $(HOME)/.wminetrc
28 # chmod 600 $(HOME)/.wminetrc 39 # chmod 600 $(HOME)/.wminetrc
29 # cp wminetrc /etc/wminetrc 40 # cp wminetrc /etc/wminetrc