Sun Oct 20 17:48:54 2013 UTC ()
Give rpath options the correct -Wl prefix.


(joerg)
diff -r1.4 -r1.5 pkgsrc/wm/notion/distinfo
diff -r1.1 -r1.2 pkgsrc/wm/notion/patches/patch-system-autodetect.mk
cvs diff -r1.4 -r1.5 pkgsrc/wm/notion/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/notion/distinfo 2013/07/05 14:27:56 1.4
+++ pkgsrc/wm/notion/distinfo 2013/10/20 17:48:54 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2013/07/05 14:27:56 wiz Exp $ 1$NetBSD: distinfo,v 1.5 2013/10/20 17:48:54 joerg Exp $
2 2
3SHA1 (notion-3-2013030200-src.tar.bz2) = 1c5d0cf140d1681a99c0fccbd8979846076d5dca 3SHA1 (notion-3-2013030200-src.tar.bz2) = 1c5d0cf140d1681a99c0fccbd8979846076d5dca
4RMD160 (notion-3-2013030200-src.tar.bz2) = 5330bcd7743b5756faf552912a1c10d481e50e1a 4RMD160 (notion-3-2013030200-src.tar.bz2) = 5330bcd7743b5756faf552912a1c10d481e50e1a
5Size (notion-3-2013030200-src.tar.bz2) = 625211 bytes 5Size (notion-3-2013030200-src.tar.bz2) = 625211 bytes
6SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7 6SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7
7SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89 7SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89
8SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f 8SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f
9SHA1 (patch-system-autodetect.mk) = 3c0e6046950441280fa12495d57bc6afc00ead44 9SHA1 (patch-system-autodetect.mk) = d68a698a20db783de30c85482586681a2250b062
cvs diff -r1.1 -r1.2 pkgsrc/wm/notion/patches/patch-system-autodetect.mk (expand / switch to unified diff)

--- pkgsrc/wm/notion/patches/patch-system-autodetect.mk 2013/07/05 14:27:56 1.1
+++ pkgsrc/wm/notion/patches/patch-system-autodetect.mk 2013/10/20 17:48:54 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-system-autodetect.mk,v 1.1 2013/07/05 14:27:56 wiz Exp $ 1$NetBSD: patch-system-autodetect.mk,v 1.2 2013/10/20 17:48:54 joerg Exp $
2 2
3Adapt for pkgsrc. 3Adapt for pkgsrc.
4 4
5--- system-autodetect.mk.orig 2013-03-02 21:02:30.000000000 +0000 5--- system-autodetect.mk.orig 2013-03-02 21:02:30.000000000 +0000
6+++ system-autodetect.mk 6+++ system-autodetect.mk
7@@ -9,7 +9,7 @@ 7@@ -9,7 +9,7 @@
8 # Installation path prefix. Unless you know what you're doing, the default 8 # Installation path prefix. Unless you know what you're doing, the default
9 # of /usr/local is likely the correct choice. 9 # of /usr/local is likely the correct choice.
10 #DIST: PREFIX=/usr/local 10 #DIST: PREFIX=/usr/local
11-PREFIX=/usr/local 11-PREFIX=/usr/local
12+#PREFIX=/usr/local 12+#PREFIX=/usr/local
13  13
14 # Unless you are creating a package conforming to some OS's standards, you 14 # Unless you are creating a package conforming to some OS's standards, you
@@ -34,27 +34,27 @@ Adapt for pkgsrc. @@ -34,27 +34,27 @@ Adapt for pkgsrc.
34-DL_LIBS=-ldl 34-DL_LIBS=-ldl
35+# set by pkgsrc 35+# set by pkgsrc
36+#DL_LIBS=-ldl 36+#DL_LIBS=-ldl
37  37
38  38
39 ## 39 ##
40@@ -67,8 +69,8 @@ DL_LIBS=-ldl 40@@ -67,8 +69,8 @@ DL_LIBS=-ldl
41  41
42 # Default to paths and names that should work for a build installed from the 42 # Default to paths and names that should work for a build installed from the
43 # official Lua 5.1 source tarball. 43 # official Lua 5.1 source tarball.
44-LUA_DIR=/usr/local 44-LUA_DIR=/usr/local
45-LUA_LIBS=-L$(LUA_DIR)/lib -llua 45-LUA_LIBS=-L$(LUA_DIR)/lib -llua
46+LUA_DIR=$(PREFIX) 46+LUA_DIR=$(PREFIX)
47+LUA_LIBS=${LINKER_RPATH_FLAG}$(LUA_DIR)/lib -L$(LUA_DIR)/lib -llua 47+LUA_LIBS=${COMPILER_RPATH_FLAG}$(LUA_DIR)/lib -L$(LUA_DIR)/lib -llua
48 LUA_INCLUDES = -I$(LUA_DIR)/include 48 LUA_INCLUDES = -I$(LUA_DIR)/include
49  49
50 ifneq ($(shell which lua),) 50 ifneq ($(shell which lua),)
51@@ -132,11 +134,12 @@ endif # lua manual 51@@ -132,11 +134,12 @@ endif # lua manual
52 ## 52 ##
53  53
54 # Paths 54 # Paths
55-X11_PREFIX=/usr/X11R6 55-X11_PREFIX=/usr/X11R6
56+# set by pkgsrc 56+# set by pkgsrc
57+#X11_PREFIX=/usr/X11R6 57+#X11_PREFIX=/usr/X11R6
58 # SunOS/Solaris 58 # SunOS/Solaris
59 #X11_PREFIX=/usr/openwin 59 #X11_PREFIX=/usr/openwin
60  60