diff options
Diffstat (limited to 'net/openser/files/patch-Makefile.defs')
| -rw-r--r-- | net/openser/files/patch-Makefile.defs | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/net/openser/files/patch-Makefile.defs b/net/openser/files/patch-Makefile.defs index 2c7700ecea72..b29f880efa50 100644 --- a/net/openser/files/patch-Makefile.defs +++ b/net/openser/files/patch-Makefile.defs @@ -1,17 +1,18 @@ ---- Makefile.defs.orig Fri Oct 28 18:32:39 2005 -+++ Makefile.defs Sun Oct 30 20:09:02 2005 -@@ -147,13 +147,13 @@ +--- Makefile.defs.orig Wed Mar 15 12:38:03 2006 ++++ Makefile.defs Wed Mar 15 13:19:16 2006 +@@ -167,13 +167,13 @@ TAR ?= tar endif -INSTALL-TOUCH = touch # used to create the file first (good to -+INSTALL-TOUCH = : # used to create the file first (good to - # make solaris install work) +- # make solaris install work) -INSTALL-CFG = $(INSTALL) -m 644 -INSTALL-BIN = $(INSTALL) -m 755 -INSTALL-MODULES = $(INSTALL) -m 755 -INSTALL-DOC = $(INSTALL) -m 644 -INSTALL-MAN = $(INSTALL) -m 644 ++INSTALL-TOUCH = : # used to create the file first (good to ++ # make solaris install work) +INSTALL-CFG = $(BSD_INSTALL_DATA) +INSTALL-BIN = $(BSD_INSTALL_PROGRAM) +INSTALL-MODULES = $(BSD_INSTALL_PROGRAM) @@ -20,34 +21,8 @@ #set some vars from the environment (and not make builtins) CC := $(shell echo "$${CC}") -@@ -449,7 +449,7 @@ - found_lock_method=yes - endif - --CFLAGS= -+saved_CFLAGS:=$(CFLAGS) - LDFLAGS= - # setting CFLAGS - ifeq ($(mode), release) -@@ -970,7 +970,8 @@ - ifneq ($(found_lock_method), yes) - DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems - found_lock_method=yes -- LIBS= -pthread -lfl #dlopen is in libc -+ saved_CFLAGS+= $(PTHREAD_CFLAGS) -+ LIBS= $(PTHREAD_LIBS) -lfl #dlopen is in libc - else - LIBS= -lfl #dlopen is in libc - endif -@@ -1045,10 +1046,15 @@ - endif - endif +@@ -1123,8 +1123,8 @@ -+CFLAGS= $(saved_CFLAGS) -I$(LOCALBASE)/include -+MOD_CFLAGS= -fPIC $(CFLAGS) -+LDFLAGS= -L$(LOCALBASE)/lib -+MOD_LDFLAGS= -shared $(LDFLAGS) -+ #add libssl if needed ifneq ($(TLS),) -DEFS+= -I$(LOCALBASE)/ssl/include |