diff options
| author | wiz <wiz> | 2010-12-25 11:02:02 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-12-25 11:02:02 +0000 |
| commit | 8db7d317be2500de0f3abc0390e8ec0cda1fb0d6 (patch) | |
| tree | 046f4758f6fbb9f219b0146be24347f7d7a96816 /sysutils/cdrtools | |
| parent | 3b423c76b8f19a3608d9bd578e0dc445a2f9f508 (diff) | |
| download | pkgsrc-8db7d317be2500de0f3abc0390e8ec0cda1fb0d6.tar.gz | |
Get rid of annoying beep by using the flag provided by upstream
instead of a patch.
Diffstat (limited to 'sysutils/cdrtools')
| -rw-r--r-- | sysutils/cdrtools/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/cdrtools/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/cdrtools/patches/patch-aa | 15 |
3 files changed, 4 insertions, 19 deletions
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index bfb4de6f1a3..870b23949ec 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2010/12/22 10:34:14 wiz Exp $ +# $NetBSD: Makefile,v 1.78 2010/12/25 11:02:02 wiz Exp $ DISTNAME= cdrtools-3.01a02 PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/} @@ -34,6 +34,7 @@ MAKE_ENV+= MAKEPROG="gmake" MAKE_ENV+= COPTX=${CFLAGS:Q} MAKE_ENV+= LDOPTX=${LDFLAGS:Q} MAKE_ENV+= INS_BASE=${PREFIX:Q} +MAKE_FLAGS+= GMAKE_NOWARN=true # do we want to compile shared libraries? # needs changes in the install target and PLIST #MAKE_ENV+= LINKMODE=dynamic @@ -92,7 +93,7 @@ do-configure: ln -sf i386-$$suffix ${MACHINE}-$$suffix; \ fi; \ done; \ - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} config + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config post-build: cd ${WRKSRC}; \ diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo index f6e04ff5e4e..bdcc912e4dd 100644 --- a/sysutils/cdrtools/distinfo +++ b/sysutils/cdrtools/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.55 2010/12/25 07:11:26 dholland Exp $ +$NetBSD: distinfo,v 1.56 2010/12/25 11:02:02 wiz Exp $ SHA1 (cdrtools-3.01a02.tar.bz2) = 36b318a913d0db6cc86940a0ad6e2adea19b3324 RMD160 (cdrtools-3.01a02.tar.bz2) = 6b1876b1d9a5fa000229a7187d72b13dcf6971bf Size (cdrtools-3.01a02.tar.bz2) = 1994677 bytes -SHA1 (patch-aa) = bd2cff555dfb8684d92ade4689d2ffb3d1054d1a diff --git a/sysutils/cdrtools/patches/patch-aa b/sysutils/cdrtools/patches/patch-aa deleted file mode 100644 index 7c518d06c0e..00000000000 --- a/sysutils/cdrtools/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.11 2010/12/25 07:11:26 dholland Exp $ - -Suppress annoying beeping during build. - ---- RULES/mk-gmake.id.orig 2009-09-09 12:29:28.000000000 +0000 -+++ RULES/mk-gmake.id -@@ -51,7 +51,7 @@ MAKEPROG= gmake - ifndef ARCH_DONE - - ifndef GMAKE_NOWARN --__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 2) -+#__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 2) - endif - - _MACHCMD= (mach || uname -p || true) 2> /dev/null |