summaryrefslogtreecommitdiff
path: root/devel/libshhopt/files/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libshhopt/files/patch-aa')
-rw-r--r--devel/libshhopt/files/patch-aa54
1 files changed, 33 insertions, 21 deletions
diff --git a/devel/libshhopt/files/patch-aa b/devel/libshhopt/files/patch-aa
index 842646df3318..c008fefe63fc 100644
--- a/devel/libshhopt/files/patch-aa
+++ b/devel/libshhopt/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile Fri Mar 10 11:45:19 2000
-+++ /home/andy/tmp/wrk/Makefile Sun Mar 19 16:34:15 2000
-@@ -6,10 +6,10 @@
+--- Makefile.orig Fri Mar 10 17:45:19 2000
++++ Makefile Tue Jul 4 21:40:24 2000
+@@ -6,7 +6,7 @@
VERSION = $(VERMAJ).$(VERMIN).$(VERPAT)
# Define SHARED as 1 for Linux shared ELF library
@@ -8,41 +8,53 @@
+SHARED = 1
ifeq ($(SHARED),1)
--LIBTARGET = lib$(DIST).so.$(VERSION)
-+LIBTARGET = lib$(DIST).so.$(VERMAJ)
- LIBTARGETSO = lib$(DIST).so
- LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ)
- CCSHRD = -fPIC
-@@ -20,15 +20,16 @@
+ LIBTARGET = lib$(DIST).so.$(VERSION)
+@@ -20,19 +20,19 @@
LIBHEAD = $(DIST).h
TARGETS = $(LIBTARGET)
-INSTBASEDIR = /usr/local
-+PREFIX ?= /usr/local
-+INSTBASEDIR = $(PREFIX)
++INSTBASEDIR = ${PREFIX}
INSTLIBDIR = $(INSTBASEDIR)/lib
INSTINCDIR = $(INSTBASEDIR)/include
-INSTALL = install -m 644
-INSTALLPROG = install -m 755
-+INSTALL = install -c -m 644
-+INSTALLPROG = install -c -m 755
- MKDIRP = install -d -m 755
+-MKDIRP = install -d -m 755
++INSTALL = ${BSD_INSTALL_DATA}
++INSTALLPROG = ${BSD_INSTALL_PROGRAM}
++MKDIRP = mkdir -p
-CC = gcc
--OPTIM = -O2
-+CC ?= gcc
-+OPTIM = $(CFLAGS)
++#CC = gcc
+ OPTIM = -O2
INCDIR = -I.
-@@ -67,9 +68,7 @@
- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
+-CCOPT = -s -Wall $(OPTIM) $(INCDIR)
++CCOPT = $(INCDIR) $(CFLAGS)
+
+ # Object files to store in the library
+ LIBOBJS = shhopt.o
+@@ -45,7 +45,7 @@
+ # separately. This error is harmless.
+ $(LIBTARGET): $(LIBOBJS)
+ ifeq ($(SHARED),1)
+- $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
++ $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS)
+ else
+ ar rc $(LIBTARGET) $(LIBOBJS)
+ ranlib $(LIBTARGET) || true
+@@ -64,12 +64,10 @@
+
+ install: $(LIBTARGET)
+ $(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR)
+- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
++ $(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR)
$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
ifeq ($(SHARED),1)
- ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
-- ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
+ ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
- echo "If you use GNU/Linux, remember to run ldconfig"
-+ ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO)
endif
clean: