diff options
Diffstat (limited to 'wm/notion/patches/patch-system-autodetect.mk')
| -rw-r--r-- | wm/notion/patches/patch-system-autodetect.mk | 70 |
1 files changed, 4 insertions, 66 deletions
diff --git a/wm/notion/patches/patch-system-autodetect.mk b/wm/notion/patches/patch-system-autodetect.mk index ca4452765a2..ef50032ba4a 100644 --- a/wm/notion/patches/patch-system-autodetect.mk +++ b/wm/notion/patches/patch-system-autodetect.mk @@ -1,33 +1,10 @@ -$NetBSD: patch-system-autodetect.mk,v 1.3 2014/05/03 13:01:25 alnsn Exp $ +$NetBSD: patch-system-autodetect.mk,v 1.4 2014/05/09 16:20:24 wiz Exp $ Adapt for pkgsrc. ---- system-autodetect.mk.orig 2013-03-02 21:02:30.000000000 +0000 +--- system-autodetect.mk.orig 2014-01-09 19:02:16.000000000 +0000 +++ system-autodetect.mk -@@ -9,7 +9,7 @@ - # Installation path prefix. Unless you know what you're doing, the default - # of /usr/local is likely the correct choice. - #DIST: PREFIX=/usr/local --PREFIX=/usr/local -+#PREFIX=/usr/local - - # Unless you are creating a package conforming to some OS's standards, you - # probably do not want to modify the following directories: -@@ -17,11 +17,12 @@ PREFIX=/usr/local - # Main binaries - BINDIR=$(PREFIX)/bin - # Configuration .lua files -+EXAMPLEDIR=$(PREFIX)/share/examples/notion - ETCDIR=$(PREFIX)/etc/notion - # Some .lua files and ion-* shell scripts - SHAREDIR=$(PREFIX)/share/notion - # Manual pages --MANDIR=$(PREFIX)/share/man -+MANDIR=$(PREFIX)/man - # Some documents - DOCDIR=$(PREFIX)/share/doc/notion - # Nothing at the moment -@@ -54,7 +55,8 @@ LOCALEDIR=$(PREFIX)/share/locale +@@ -63,7 +63,8 @@ endif # Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this # setting (for e.g. Lua, when not instructed by pkg-config). @@ -37,46 +14,7 @@ Adapt for pkgsrc. ## -@@ -63,18 +65,14 @@ DL_LIBS=-ldl - - # To skip auto-detection of lua uncomment this and edit the variables below to - # suit your installation of lua. --#LUA_MANUAL=1 -+LUA_MANUAL=1 - - # Default to paths and names that should work for a build installed from the - # official Lua 5.1 source tarball. --LUA_DIR=/usr/local --LUA_LIBS=-L$(LUA_DIR)/lib -llua --LUA_INCLUDES = -I$(LUA_DIR)/include -- --ifneq ($(shell which lua),) --LUA=$(LUA_DIR)/bin/lua --LUAC=$(LUA_DIR)/bin/luac --endif -+LUA_LIBS=`pkg-config --libs lua` -+LUA_INCLUDES=`pkg-config --cflags lua` -+LUA=$(LUA_INTERPRETER) -+LUAC=$(LUA_COMPILER) - - # Attempt to autodect lua using pkg-config. - -@@ -132,11 +130,12 @@ endif # lua manual - ## - - # Paths --X11_PREFIX=/usr/X11R6 -+# set by pkgsrc -+#X11_PREFIX=/usr/X11R6 - # SunOS/Solaris - #X11_PREFIX=/usr/openwin - --X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext -+X11_LIBS=${COMPILER_RPATH_FLAG}${X11_PREFIX}/lib -L$(X11_PREFIX)/lib -lX11 -lXext - X11_INCLUDES=-I$(X11_PREFIX)/include - - # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault. -@@ -164,7 +163,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR +@@ -109,7 +110,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR #DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT # On some other systems you may need to explicitly link against libintl. |