diff options
| author | Pawel Pekala <pawel@FreeBSD.org> | 2014-06-16 11:23:39 +0000 |
|---|---|---|
| committer | Pawel Pekala <pawel@FreeBSD.org> | 2014-06-16 11:23:39 +0000 |
| commit | 0d6e593fd0c967e276dcadfd1d7c364c5f2c3c21 (patch) | |
| tree | ce0128186888eadf54b079db82c988fe409f8052 /multimedia/nxtvepg/files/patch-Makefile.bsd | |
| parent | editors/pico-alpine: fix build on 8.4 by fixing masterport mail/alpine (diff) | |
- Fix build with clang (include <wait.h> -> <sys/wait.h>)
- Add staging support
- Convert to new options framework, USES=tk
MFH: 2014Q2
Diffstat (limited to 'multimedia/nxtvepg/files/patch-Makefile.bsd')
| -rw-r--r-- | multimedia/nxtvepg/files/patch-Makefile.bsd | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/multimedia/nxtvepg/files/patch-Makefile.bsd b/multimedia/nxtvepg/files/patch-Makefile.bsd index 6b92722d9b9f..a2470d129ed3 100644 --- a/multimedia/nxtvepg/files/patch-Makefile.bsd +++ b/multimedia/nxtvepg/files/patch-Makefile.bsd @@ -1,37 +1,31 @@ ---- Makefile.bsd.orig 2005-01-01 16:35:26.000000000 -0200 -+++ Makefile.bsd 2009-10-21 22:28:33.000000000 -0200 -@@ -69,15 +69,10 @@ - ECHO ?= @echo - - # Paths --ROOT = +--- Makefile.bsd.orig 2005-01-01 19:35:26.000000000 +0100 ++++ Makefile.bsd 2014-06-16 12:41:56.046094882 +0200 +@@ -73,11 +73,7 @@ exec_prefix = ${prefix} --bindir = $(ROOT)${exec_prefix}/bin --mandir = $(ROOT)${prefix}/man/man1 + bindir = $(ROOT)${exec_prefix}/bin + mandir = $(ROOT)${prefix}/man/man1 -ifeq ($(OS), FreeBSD) -resdir = $(ROOT)/usr/X11R6/lib/X11 -else -+bindir = ${exec_prefix}/bin -+mandir = ${prefix}/man/man1 - resdir = $(LOCALBASE)/lib/X11 +-resdir = $(LOCALBASE)/lib/X11 -endif ++resdir = $(ROOT)${prefix}/lib/X11 # other settings OPTFLAGS = -O -pipe -g -@@ -117,7 +112,7 @@ +@@ -96,7 +92,7 @@ + DEFS += -DTK_LIBRARY_PATH=\"$(TK_LIBRARY_PATH)\" + DEFS += -DTCL_LIBRARY_PATH=\"$(TCL_LIBRARY_PATH)\" - ifndef USER_DBDIR - DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\" --INST_DB_DIR = $(ROOT)$(SYS_DBDIR) -+INST_DB_DIR = $(SYS_DBDIR) - INST_DB_PERM = 0777 - endif +-DEFS += -DX11_APP_DEFAULTS=\"$(resdir)/app-defaults/Nxtvepg\" ++DEFS += -DX11_APP_DEFAULTS=\"$(LOCALBASE)/lib/X11/app-defaults/Nxtvepg\" -@@ -128,7 +123,7 @@ - CFLAGS += $(WARN) $(INCS) $(DEFS) + # enable use of multi-threading + ifdef WANT_THREADS +@@ -129,6 +125,7 @@ LDFLAGS += -lm #LDFLAGS += -pg -- + +BUILD_DIR= ${WRKSRC} all :: printconfig |