diff options
| author | adam <adam@pkgsrc.org> | 2013-07-02 19:47:48 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2013-07-02 19:47:48 +0000 |
| commit | 5fa9bd0e236214d2f5fa7a79d46d1e4516c4c465 (patch) | |
| tree | bb2c88fceb451639c1cfa29ee8904ecde050afe2 | |
| parent | e990273ace37ac6230f290ae9c0da5d66e931d37 (diff) | |
| download | pkgsrc-5fa9bd0e236214d2f5fa7a79d46d1e4516c4c465.tar.gz | |
Removed patch-makefile in favour if MAKEFLAGS
| -rw-r--r-- | archivers/unrar/Makefile | 3 | ||||
| -rw-r--r-- | archivers/unrar/distinfo | 3 | ||||
| -rw-r--r-- | archivers/unrar/patches/patch-makefile | 21 |
3 files changed, 3 insertions, 24 deletions
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index aec209f229c..11d48bde22c 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2013/07/02 06:40:56 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2013/07/02 19:47:48 adam Exp $ DISTNAME= unrarsrc-5.0.7 PKGNAME= ${DISTNAME:S/src//} @@ -23,6 +23,7 @@ USE_LANGUAGES= c++ USE_TOOLS+= gmake MAKE_FILE= makefile +MAKEFLAGS+= CXX=${CXX:Q} CXXFLAGS=${CXXFLAGS:Q} LDFLAGS=${LDFLAGS:Q} WRKSRC= ${WRKDIR}/unrar diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo index 41aaf6c2bb2..bda35ea034a 100644 --- a/archivers/unrar/distinfo +++ b/archivers/unrar/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.48 2013/07/02 10:30:23 adam Exp $ +$NetBSD: distinfo,v 1.49 2013/07/02 19:47:48 adam Exp $ SHA1 (unrarsrc-5.0.7.tar.gz) = 7d1cd96d29695e90df4aaef426e7068b241e2528 RMD160 (unrarsrc-5.0.7.tar.gz) = fd3a3ba33e1250e0b9680138a22241a26ee5722e Size (unrarsrc-5.0.7.tar.gz) = 208034 bytes -SHA1 (patch-makefile) = f63828cfc5bfc470e7e61396d2775e1f1e0ef9e9 diff --git a/archivers/unrar/patches/patch-makefile b/archivers/unrar/patches/patch-makefile deleted file mode 100644 index 442acabe34b..00000000000 --- a/archivers/unrar/patches/patch-makefile +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-makefile,v 1.1 2013/07/02 10:30:23 adam Exp $ - -Don't set compiler, nor compiler flags. -Don't overwrite linker flags. - ---- makefile.orig 2013-07-02 10:24:50.000000000 +0000 -+++ makefile -@@ -2,12 +2,10 @@ - # Makefile for UNIX - unrar - - # Linux using GCC --CXX=g++ --CXXFLAGS=-O2 - LIBFLAGS=-fPIC - DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP - STRIP=strip --LDFLAGS=-pthread -+LDFLAGS+=-pthread - DESTDIR=/usr - - # Linux using LCC |