summaryrefslogtreecommitdiffstats
path: root/network/gophernicus/Makefile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'network/gophernicus/Makefile.patch')
-rw-r--r--network/gophernicus/Makefile.patch35
1 files changed, 28 insertions, 7 deletions
diff --git a/network/gophernicus/Makefile.patch b/network/gophernicus/Makefile.patch
index b2a5db3e6d..2de81cdc9e 100644
--- a/network/gophernicus/Makefile.patch
+++ b/network/gophernicus/Makefile.patch
@@ -1,34 +1,55 @@
---- Makefile.orig 2012-12-02 09:55:11.000000000 +0200
-+++ Makefile 2012-12-10 13:05:11.000000000 +0200
-@@ -16,9 +16,9 @@
+diff -Naur gophernicus-2.5.orig/Makefile gophernicus-2.5/Makefile
+--- gophernicus-2.5.orig/Makefile 2017-06-24 17:54:48.000000000 +0200
++++ gophernicus-2.5/Makefile 2017-08-05 11:37:14.145035221 +0200
+@@ -17,10 +17,10 @@
DOCS = LICENSE README INSTALL TODO ChangeLog README.Gophermap gophertag
INSTALL = PATH=$$PATH:/usr/sbin ./install-sh -o 0 -g 0
-DESTDIR = /usr
++DESTDIR =
+ OSXDEST = /usr/local
-SBINDIR = $(DESTDIR)/sbin
-DOCDIR = $(DESTDIR)/share/doc/$(PACKAGE)
-+DESTDIR =
+SBINDIR = $(DESTDIR)/usr/sbin
+DOCDIR = $(DESTDIR)/usr/doc/$(PACKAGE)-$(VERSION)
ROOT = /var/gopher
OSXROOT = /Library/GopherServer
-@@ -144,11 +144,9 @@
+@@ -62,7 +62,7 @@
+ generic: $(BINARY)
+
+ withwrap:
+- $(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LDFLAGS="-lwrap" $(BINARY)
++ $(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LDFLAGS="-lwrap -lnsl" $(BINARY)
+
+
+ #
+@@ -86,7 +86,7 @@
+ $(NAME).c: $(NAME).h $(HEADERS)
+
+ $(BINARY): $(OBJECTS)
+- $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) $(OBJECTS) -o $@
++ $(CC) $(LDFLAGS) $(OBJECTS) $(EXTRA_LDFLAGS) -o $@
+
+ .c.o:
+ $(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DVERSION="\"$(VERSION)\"" -DCODENAME="\"$(CODENAME)\"" -DDEFAULT_ROOT="\"$(ROOT)\"" $< -o $@
+@@ -179,11 +179,10 @@
@echo
install-root:
-- if [ ! -d "$(ROOT)" ]; then \
+- if [ ! -d "$(ROOT)" -o ! -f "$(ROOT)/$(MAP)" ]; then \
- mkdir -p $(ROOT); \
- $(INSTALL) -m 644 $(MAP) $(ROOT); \
- ln -s $(DOCDIR) $(ROOT)/docs; \
- fi
++ @echo
+ mkdir -p $(DESTDIR)/$(ROOT)
+ $(INSTALL) -m 644 $(MAP) $(DESTDIR)/$(ROOT)
+ ln -s /usr/doc/$(PACKAGE)-$(VERSION) $(DESTDIR)/$(ROOT)/docs
@echo
install-inetd:
-@@ -166,10 +164,8 @@
+@@ -201,10 +200,8 @@
@echo
install-xinetd: