summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhorben <khorben>2015-08-06 21:41:43 +0000
committerkhorben <khorben>2015-08-06 21:41:43 +0000
commit311682d91e11aae9d619d18c43fb13a710487468 (patch)
tree0d32885e89f59252638e950a93659ddf05974a7d
parentef84bec2c0a31edfa664668a99aa64858bb6da92 (diff)
downloadpkgsrc-311682d91e11aae9d619d18c43fb13a710487468.tar.gz
Add support for CFLAGS
No functional change intended.
-rw-r--r--sysutils/wmSMPmon/Makefile4
-rw-r--r--time/wmitime/distinfo4
-rw-r--r--time/wmitime/patches/patch-aa17
3 files changed, 19 insertions, 6 deletions
diff --git a/sysutils/wmSMPmon/Makefile b/sysutils/wmSMPmon/Makefile
index a9caf95440d..9a060954ae5 100644
--- a/sysutils/wmSMPmon/Makefile
+++ b/sysutils/wmSMPmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/23 19:51:34 asau Exp $
+# $NetBSD: Makefile,v 1.13 2015/08/06 21:46:03 khorben Exp $
DISTNAME= wmSMPmon-2.3
PKGREVISION= 1
@@ -11,6 +11,8 @@ COMMENT= Dockable CPU (SMP) monitor
WRKSRC= ${WRKDIR}/wmSMPmon-2.x/wmSMPmon
+MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
+
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
do-install:
diff --git a/time/wmitime/distinfo b/time/wmitime/distinfo
index 4a3baf63bbb..44bfb6a46b3 100644
--- a/time/wmitime/distinfo
+++ b/time/wmitime/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2013/11/07 00:49:46 joerg Exp $
+$NetBSD: distinfo,v 1.3 2015/08/06 21:41:43 khorben Exp $
SHA1 (wmitime-0.3.tar.gz) = 64bb07c5eccce5592088cfccc87836f66695e07c
RMD160 (wmitime-0.3.tar.gz) = b2301a15ef159d2d55418ae5fbf914bedc388478
Size (wmitime-0.3.tar.gz) = 21442 bytes
SHA1 (patch-.._wmgeneral_list.h) = 3833c707c4eaf8ef8297eb5b5658db14d70e24ee
-SHA1 (patch-aa) = 9e2dc61ca81e403b142238aaaacd73297cc55e37
+SHA1 (patch-aa) = e3dfcd4a36cb282a80f63534222d727d4a73f891
diff --git a/time/wmitime/patches/patch-aa b/time/wmitime/patches/patch-aa
index eb9339179db..65a73be5e99 100644
--- a/time/wmitime/patches/patch-aa
+++ b/time/wmitime/patches/patch-aa
@@ -1,6 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2013/11/06 00:35:20 khorben Exp $
+$NetBSD: patch-aa,v 1.2 2015/08/06 21:41:43 khorben Exp $
-Implements PKG_DESTDIR_SUPPORT
+- implements PKG_DESTDIR_SUPPORT
+- adds support for CFLAGS
+- removes duplicate library while linking
--- Makefile.orig 1999-03-29 03:51:39.000000000 +0000
+++ Makefile
@@ -11,10 +13,19 @@ Implements PKG_DESTDIR_SUPPORT
+LIBDIR = ${LDFLAGS}
LIBS = -lXpm -lXext -lX11 -lm
-FLAGS = -O2
-+FLAGS = -O2 ${BUILDLINK_CPPFLAGS}
++FLAGS = ${BUILDLINK_CPPFLAGS} ${CFLAGS}
OBJS = wmitime.o \
../wmgeneral/wmgeneral.o \
../wmgeneral/misc.o \
+@@ -12,7 +12,7 @@ OBJS = wmitime.o \
+ cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
+
+ wmtime: $(OBJS)
+- cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
++ cc $(FLAGS) -D$(LANG) -o wmitime $^ $(LIBDIR) $(LIBS)
+
+ all:: wmtime
+
@@ -24,9 +24,8 @@ clean::
rm -f *~