diff options
Diffstat (limited to 'multimedia/nxtvepg/files/patch-Makefile')
| -rw-r--r-- | multimedia/nxtvepg/files/patch-Makefile | 72 |
1 files changed, 5 insertions, 67 deletions
diff --git a/multimedia/nxtvepg/files/patch-Makefile b/multimedia/nxtvepg/files/patch-Makefile index d9651c5abdf2..80afbb8de831 100644 --- a/multimedia/nxtvepg/files/patch-Makefile +++ b/multimedia/nxtvepg/files/patch-Makefile @@ -1,7 +1,7 @@ ---- Makefile.orig Sun Dec 8 21:18:25 2002 -+++ Makefile Wed Jan 8 00:31:16 2003 -@@ -32,12 +32,24 @@ - include Makefile.win32 +--- Makefile.orig Thu Oct 9 21:09:22 2003 ++++ Makefile Tue Oct 21 12:57:04 2003 +@@ -43,12 +43,24 @@ + include Makefile.bsd else +ifndef X11BASE @@ -27,38 +27,7 @@ # if you have perl set the path here, else just leave it alone PERL = /usr/bin/perl -@@ -45,22 +57,25 @@ - # select Tcl/Tk version - TCL_VER = 8.3 - --LDLIBS = -ltk$(TCL_VER) -ltcl$(TCL_VER) -L/usr/X11R6/lib -lX11 -lXmu -lm -ldl -+LDLIBS = -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/tcl83 -L$(LOCALBASE)/lib/tk83\ -+ -ltk83 -ltcl83 -L$(X11BASE)/lib -lX11 -lXmu -lm - - # use static libraries for debugging only - #LDLIBS += -Ldbglib -static - --INCS += -I. -I/usr/X11R6/include -+INCS += -I. -I$(X11BASE)/include -I$(LOCALBASE)/include/tcl8.3\ -+ -I$(LOCALBASE)/include/tk8.3 -I $(LOCALBASE)//include -+ - # path to Tcl/Tk headers, if not properly installed - #INCS += -I/usr/local/tcl/tcl8.0/generic -I/usr/local/tcl/tk8.0/generic - - # path to Tcl/Tk script library (Tk is usually in X11/lib/tk#.#) --DEFS += -DTK_LIBRARY_PATH=\"/usr/lib/tk$(TCL_VER)\" --DEFS += -DTCL_LIBRARY_PATH=\"/usr/lib/tcl$(TCL_VER)\" -+DEFS += -DTK_LIBRARY_PATH=\"$(LOCALBASE)/lib/tk$(TCL_VER)\" -+DEFS += -DTCL_LIBRARY_PATH=\"$(LOCALBASE)/lib/tcl$(TCL_VER)\" - - # enable use of multi-threading - DEFS += -DUSE_THREADS --LDLIBS += -lpthread -+LDLIBS += -pthread - - # enable use of daemon and client/server connection - DEFS += -DUSE_DAEMON -@@ -68,10 +83,10 @@ +@@ -92,10 +104,10 @@ # The database directory can be either in the user's $HOME (or relative to any # other env variable) or at a global place like /var/spool (world-writable) # -> uncomment 2 lines below to put the databases in the user's home @@ -72,34 +41,3 @@ DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\" INST_DB_DIR = $(ROOT)$(SYS_DBDIR) INST_DB_PERM = 0777 -@@ -79,8 +94,8 @@ - - WARN = -Wall -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes - #WARN += -Wpointer-arith -Werror --CC = gcc --CFLAGS = -pipe $(WARN) $(INCS) $(DEFS) -O6 -+CC ?= gcc -+CFLAGS += -pipe $(WARN) $(INCS) $(DEFS) - #LDLIBS += -pg - - # ----- don't change anything below ------------------------------------------ -@@ -109,18 +124,7 @@ - nxtvepg: $(OBJS) - $(CC) $(LDFLAGS) -o nxtvepg $(OBJS) $(LDLIBS) - --install: nxtvepg nxtvepg.1 Nxtvepg.ad -- test -d $(bindir) || mkdirhier $(bindir) -- test -d $(mandir) || mkdirhier $(mandir) -- test -d $(resdir) || mkdirhier $(resdir) --ifndef USER_DBDIR -- test -d $(INST_DB_DIR) || mkdirhier $(INST_DB_DIR) -- chmod $(INST_DB_PERM) $(INST_DB_DIR) --endif -- install -c -m 0755 nxtvepg $(bindir) -- install -c -m 0644 nxtvepg.1 $(mandir) -- install -c -m 0644 Nxtvepg.ad $(resdir)/app-defaults/Nxtvepg -- rm -f $(mandir)/nxtvepg.1x -+install: - - .SUFFIXES: .c .o .tcl - |