diff options
| author | salo <salo> | 2004-05-31 09:50:35 +0000 |
|---|---|---|
| committer | salo <salo> | 2004-05-31 09:50:35 +0000 |
| commit | bd519651652786aa0d10eed7c47d9e5e02a47a23 (patch) | |
| tree | 0a6abc268ee05b69173c5c2055d6d04cabf612b5 /multimedia | |
| parent | be75605e178aacd08cea6cc8e389a268e668fe77 (diff) | |
| download | pkgsrc-bd519651652786aa0d10eed7c47d9e5e02a47a23.tar.gz | |
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 (limited to 'multimedia')
| -rw-r--r-- | multimedia/libmatroska/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/libmatroska/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libmatroska/patches/patch-ac | 33 |
3 files changed, 34 insertions, 10 deletions
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile index 481954f5819..7f9b6d39175 100644 --- a/multimedia/libmatroska/Makefile +++ b/multimedia/libmatroska/Makefile @@ -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 @@ MAINTAINER= tech-pkg@NetBSD.org 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 --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo index 97812a9bf1a..97e577ddac5 100644 --- a/multimedia/libmatroska/distinfo +++ b/multimedia/libmatroska/distinfo @@ -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 --git a/multimedia/libmatroska/patches/patch-ac b/multimedia/libmatroska/patches/patch-ac index 78a1e0cf63b..e232b4c3396 100644 --- a/multimedia/libmatroska/patches/patch-ac +++ b/multimedia/libmatroska/patches/patch-ac @@ -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 |