diff options
| author | snj <snj@pkgsrc.org> | 2004-03-07 01:34:04 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2004-03-07 01:34:04 +0000 |
| commit | 7c01787f94ff545fb6e525d2d349efcec1e82cbe (patch) | |
| tree | 8c300ae423caae1ed759ea3793f39853cdf05798 | |
| parent | 908aef88a967dcdeb0a6c78d8933cf6b890cf59f (diff) | |
| download | pkgsrc-7c01787f94ff545fb6e525d2d349efcec1e82cbe.tar.gz | |
Use bl3 and honor CFLAGS.
| -rw-r--r-- | sysutils/mbmon/Makefile.common | 3 | ||||
| -rw-r--r-- | sysutils/mbmon/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/mbmon/patches/patch-aa | 19 | ||||
| -rw-r--r-- | sysutils/xmbmon/Makefile | 3 |
4 files changed, 18 insertions, 11 deletions
diff --git a/sysutils/mbmon/Makefile.common b/sysutils/mbmon/Makefile.common index 75e99312d59..9ad06036238 100644 --- a/sysutils/mbmon/Makefile.common +++ b/sysutils/mbmon/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2004/03/07 01:06:45 fvdl Exp $ +# $NetBSD: Makefile.common,v 1.9 2004/03/07 01:34:04 snj Exp $ # DISTNAME= xmbmon203 @@ -13,6 +13,7 @@ MAINTAINER= tech-pkg@NetBSD.org #MAKEFILE= Makefile.NetBSD GNU_CONFIGURE= yes +USE_BUILDLINK3= yes DISTINFO_FILE?= ${.CURDIR}/../../sysutils/mbmon/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/mbmon/patches diff --git a/sysutils/mbmon/distinfo b/sysutils/mbmon/distinfo index 4d75c981763..f6c7f326615 100644 --- a/sysutils/mbmon/distinfo +++ b/sysutils/mbmon/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2004/03/07 01:23:13 snj Exp $ +$NetBSD: distinfo,v 1.6 2004/03/07 01:34:04 snj Exp $ SHA1 (xmbmon203.tar.gz) = 009ccd550d4aa1acc830948d5be304f142c78341 Size (xmbmon203.tar.gz) = 113252 bytes -SHA1 (patch-aa) = bae95384b190801af7913ca79c29caa509488195 +SHA1 (patch-aa) = f7329f826e61cb6803d49a1d9e78fc55edde1098 SHA1 (patch-ab) = bfc75d75dfc1d976d3920ff4fb56dcbe45f06421 SHA1 (patch-ac) = cf9dedf838f26092472ac8eff35138313b894445 SHA1 (patch-ad) = ed9b64a127af6e70e7d9d9e095bdb88cb6de11ea diff --git a/sysutils/mbmon/patches/patch-aa b/sysutils/mbmon/patches/patch-aa index e5c22176205..7bed8b1346d 100644 --- a/sysutils/mbmon/patches/patch-aa +++ b/sysutils/mbmon/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2003/08/23 16:41:59 recht Exp $ +$NetBSD: patch-aa,v 1.4 2004/03/07 01:34:04 snj Exp $ ---- Makefile.in.orig 2003-07-04 05:13:45.000000000 +0200 -+++ Makefile.in 2003-08-23 18:35:34.000000000 +0200 -@@ -15,15 +15,15 @@ +--- Makefile.in.orig 2003-07-03 20:13:45.000000000 -0700 ++++ Makefile.in 2004-03-06 17:27:16.000000000 -0800 +@@ -15,20 +15,19 @@ DEFS=-DHAVE_CONFIG_H -Wall @HOSTDEF@ @@ -20,8 +20,15 @@ $NetBSD: patch-aa,v 1.3 2003/08/23 16:41:59 recht Exp $ +LIBS=-Wl,-R${LIBDIR} -L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm #CC=/compat/linux/usr/bin/gcc - CC=@CC@ -@@ -38,8 +38,8 @@ +-CC=@CC@ +-CFLAGS=-O3 $(INCLUDES) $(DEFS) +-CFLAGSX=-O3 $(XINCLUDES) $(DEFS) ++CFLAGS+= $(INCLUDES) $(DEFS) ++CFLAGSX= $(CFLAGS) $(XINCLUDES) + LDFLAGS=-s + + LINT=lint +@@ -38,8 +37,8 @@ RM=rm -f INSTALL=install INST_DIR=/usr/local/bin diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile index fd64853de6e..5adb01a8276 100644 --- a/sysutils/xmbmon/Makefile +++ b/sysutils/xmbmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/08/23 16:42:00 recht Exp $ +# $NetBSD: Makefile,v 1.3 2004/03/07 01:34:04 snj Exp $ # .include "../../sysutils/mbmon/Makefile.common" @@ -8,7 +8,6 @@ PKGNAME= xmbmon-203 COMMENT= X11-based motherboard monitoring utility USE_X11= yes -USE_BUILDLINK2= yes ALL_TARGET= xmbmon |