pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

brlcad: Fix path to mged in NOT_PAX_MPROTECT_SAFE



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Wed Nov 2 22:26:53 2016 +0100
Changeset:	7f2a15d3afd8b482a917d1db890dde9b2129116d

Modified Files:
	brlcad/Makefile
Removed Files:
	i3-git/patches/patch-common.mk

Log Message:
brlcad: Fix path to mged in NOT_PAX_MPROTECT_SAFE

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7f2a15d3afd8b482a917d1db890dde9b2129116d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 brlcad/Makefile                |  2 +-
 i3-git/patches/patch-common.mk | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diffs:
diff --git a/brlcad/Makefile b/brlcad/Makefile
index f0e9f3c..77a3f66 100644
--- a/brlcad/Makefile
+++ b/brlcad/Makefile
@@ -55,7 +55,7 @@ PKGCONFIG_OVERRIDE+=	src/other/libpng/libpng.pc.in
 PKGCONFIG_OVERRIDE+=	src/other/libz/zlib.pc.in
 
 # What else?
-NOT_PAX_MPROTECT_SAFE+=	${BRLCAD_PREFIX:Q}/bin/mged
+NOT_PAX_MPROTECT_SAFE+=	brlcad/bin/mged
 
 BUILD_DEPENDS+=	astyle-[0-9]*:../../devel/astyle
 # BUILD_DEPENDS+=	lemon-[0-9]*:../../devel/lemon # built in
diff --git a/i3-git/patches/patch-common.mk b/i3-git/patches/patch-common.mk
deleted file mode 100644
index 6c29399..0000000
--- a/i3-git/patches/patch-common.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Allow setting VERSION and prevent overwriting it.
-
---- common.mk.orig	2016-09-06 02:03:21.000000000 +0000
-+++ common.mk
-@@ -24,7 +24,7 @@ ifeq ($(wildcard .git),)
-   VERSION := $(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION | cut -d '-' -f 1)
-   I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)'
- else
--  VERSION := $(shell git describe --tags --abbrev=0)
-+  VERSION ?= $(shell git describe --tags --abbrev=0)
-   I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")'
- endif
- 


Home | Main Index | Thread Index | Old Index