[pkgsrc/trunk]: pkgsrc/multimedia/libmatroska Pass CXXFLAGS and LDFLAGS to Ma...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b0c7f40a0cbb
branches:  trunk
changeset: 475970:b0c7f40a0cbb
user:      salo <salo%pkgsrc.org@localhost>
date:      Mon May 31 09:50:35 2004 +0000

description:
Pass CXXFLAGS and LDFLAGS to Makefile, usa more buildlink variables.
Allow both overwrite and pkgviews installation.
Based on patch sent by Joachim Kuebart via PR pkg/25752.

diffstat:

 multimedia/libmatroska/Makefile         |   7 +++++--
 multimedia/libmatroska/distinfo         |   4 ++--
 multimedia/libmatroska/patches/patch-ac |  33 +++++++++++++++++++++++++++------
 3 files changed, 34 insertions(+), 10 deletions(-)

diffs (83 lines):

diff -r 2f6e913b2dfa -r b0c7f40a0cbb multimedia/libmatroska/Makefile
--- a/multimedia/libmatroska/Makefile   Mon May 31 09:17:38 2004 +0000
+++ b/multimedia/libmatroska/Makefile   Mon May 31 09:50:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/05/16 09:49:14 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/31 09:50:35 salo Exp $
 #
 
 DISTNAME=      libmatroska-0.7.0
@@ -9,12 +9,15 @@
 HOMEPAGE=      http://www.matroska.org/
 COMMENT=       Extensible open standard Audio/Video container format
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 USE_BUILDLINK3=        yes
 USE_GNU_TOOLS+=        make
 USE_LANGUAGES= c++
 
 NO_CONFIGURE=  yes
-MAKEFLAGS+=    prefix="${PREFIX}"
+MAKEFLAGS+=    prefix=${PREFIX:Q}
+MAKE_ENV+=     CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q}
 BUILD_DIRS=    ${WRKDIR}/${DISTNAME}/make/linux
 
 ONLY_FOR_COMPILER=     gcc
diff -r 2f6e913b2dfa -r b0c7f40a0cbb multimedia/libmatroska/distinfo
--- a/multimedia/libmatroska/distinfo   Mon May 31 09:17:38 2004 +0000
+++ b/multimedia/libmatroska/distinfo   Mon May 31 09:50:35 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2004/05/16 09:50:57 grant Exp $
+$NetBSD: distinfo,v 1.4 2004/05/31 09:50:35 salo Exp $
 
 SHA1 (libmatroska-0.7.0.tar.gz) = 51997ad2834a08a86e2e163c037aa841aa1cb0bb
 Size (libmatroska-0.7.0.tar.gz) = 100316 bytes
 SHA1 (patch-aa) = 1b39f10c5d50091d7875d5e60c3e9b09d187a7a1
 SHA1 (patch-ab) = 41178badc83063d898939ac6a334bf6af73d0f42
-SHA1 (patch-ac) = b3f5aff05ea55ca3dbdc6f0f20656080b1dfff3d
+SHA1 (patch-ac) = 5887db675a216e97c7ac47b485a0bf033571479a
diff -r 2f6e913b2dfa -r b0c7f40a0cbb multimedia/libmatroska/patches/patch-ac
--- a/multimedia/libmatroska/patches/patch-ac   Mon May 31 09:17:38 2004 +0000
+++ b/multimedia/libmatroska/patches/patch-ac   Mon May 31 09:50:35 2004 +0000
@@ -1,13 +1,34 @@
-$NetBSD: patch-ac,v 1.1 2004/05/16 09:50:58 grant Exp $
+$NetBSD: patch-ac,v 1.2 2004/05/31 09:50:35 salo Exp $
 
---- make/linux/Makefile.orig   2004-01-05 22:28:43.000000000 +1100
-+++ make/linux/Makefile
-@@ -21,7 +21,7 @@ DEP=$(CXX) -MM
+--- make/linux/Makefile.orig   2004-01-05 12:28:43.000000000 +0100
++++ make/linux/Makefile        2004-05-31 01:20:58.000000000 +0200
+@@ -15,13 +15,13 @@
+ includedir=$(prefix)/include/matroska
+ 
+ # Programs
+-CXX=g++
+-LD=g++
++#CXX=g++
++LD=$(CXX)
+ DEP=$(CXX) -MM
  DEPEND = makedepend
- AR = ar rcvu
- RANLIB = ranlib
+-AR = ar rcvu
+-RANLIB = ranlib
 -INSTALL = install
++AR += rcvu
++#RANLIB = ranlib
 +INSTALL = $(BSD_INSTALL)
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
+@@ -36,8 +36,8 @@
+ ifeq (yes,$(DEBUG))
+ DEBUGFLAGS=-g -DDEBUG
+ endif
+-CXXFLAGS=$(DEBUGFLAGS) -Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE -Wshadow
+-LDFLAGS=-L. -L$(LIBEBML_LIB_DIR)
++CXXFLAGS+= $(DEBUGFLAGS) -Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE -Wshadow
++LDFLAGS+= -L. -L$(LIBEBML_LIB_DIR)
+ 
+ SRC_DIR=$(CWD)/../../src/
+ INCLUDE_DIR=$(CWD)/../../matroska