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.patch40
1 files changed, 25 insertions, 15 deletions
diff --git a/network/gophernicus/Makefile.patch b/network/gophernicus/Makefile.patch
index 2de81cdc9e..32fbe2a9c0 100644
--- a/network/gophernicus/Makefile.patch
+++ b/network/gophernicus/Makefile.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Naur gophernicus-2.5v101/Makefile gophernicus-2.5v101.patched/Makefile
+--- gophernicus-2.5v101/Makefile 2018-07-22 16:36:57.869250006 -0400
++++ gophernicus-2.5v101.patched/Makefile 2018-07-22 17:18:45.765186289 -0400
+@@ -20,10 +20,10 @@
DOCS = LICENSE README INSTALL TODO ChangeLog README.Gophermap gophertag
INSTALL = PATH=$$PATH:/usr/sbin ./install-sh -o 0 -g 0
@@ -15,25 +15,34 @@ diff -Naur gophernicus-2.5.orig/Makefile gophernicus-2.5/Makefile
ROOT = /var/gopher
OSXROOT = /Library/GopherServer
-@@ -62,7 +62,7 @@
+@@ -51,7 +51,7 @@
+ #
+ # Platform support, compatible with both BSD and GNU make
+ #
+-all:
++all: headers
+ @case `uname` in \
+ Darwin) $(MAKE) ROOT="$(OSXROOT)" DESTDIR="$(OSXDEST)" $(BINARY); ;; \
+ Haiku) $(MAKE) EXTRA_LIBS="-lnetwork" $(BINARY); ;; \
+@@ -61,7 +61,7 @@
generic: $(BINARY)
withwrap:
-- $(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LDFLAGS="-lwrap" $(BINARY)
-+ $(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LDFLAGS="-lwrap -lnsl" $(BINARY)
+- $(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LIBS="-lwrap" $(BINARY)
++ $(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LIBS="-lwrap -lnsl" $(BINARY)
#
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
$(NAME).c: $(NAME).h $(HEADERS)
$(BINARY): $(OBJECTS)
-- $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) $(OBJECTS) -o $@
-+ $(CC) $(LDFLAGS) $(OBJECTS) $(EXTRA_LDFLAGS) -o $@
+- $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) $(OBJECTS) $(EXTRA_LIBS) -o $@
++ $(CC) $(LDFLAGS) $(OBJECTS) $(EXTRA_LDFLAGS) $(EXTRA_LIBS) -o $@
.c.o:
$(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DVERSION="\"$(VERSION)\"" -DCODENAME="\"$(CODENAME)\"" -DDEFAULT_ROOT="\"$(ROOT)\"" $< -o $@
-@@ -179,11 +179,10 @@
+@@ -180,12 +180,9 @@
@echo
install-root:
@@ -42,14 +51,14 @@ diff -Naur gophernicus-2.5.orig/Makefile gophernicus-2.5/Makefile
- $(INSTALL) -m 644 $(MAP) $(ROOT); \
- ln -s $(DOCDIR) $(ROOT)/docs; \
- fi
-+ @echo
+- @echo
+ mkdir -p $(DESTDIR)/$(ROOT)
+ $(INSTALL) -m 644 $(MAP) $(DESTDIR)/$(ROOT)
+ ln -s /usr/doc/$(PACKAGE)-$(VERSION) $(DESTDIR)/$(ROOT)/docs
- @echo
install-inetd:
-@@ -201,10 +200,8 @@
+ @echo
+@@ -202,11 +199,8 @@
@echo
install-xinetd:
@@ -57,8 +66,9 @@ diff -Naur gophernicus-2.5.orig/Makefile gophernicus-2.5/Makefile
- sed -e "s/@HOSTNAME@/`hostname`/g" $(NAME).xinetd > $(XINETD)/$(NAME); \
- [ -x /sbin/service ] && /sbin/service xinetd reload; \
- fi
+- @echo
+ mkdir -p $(DESTDIR)/$(XINETD)
+ sed -e "s/@HOSTNAME@/`hostname`/g" $(NAME).xinetd > $(DESTDIR)/$(XINETD)/$(NAME).new
- @echo
install-osx:
+ if [ -d "$(LAUNCHD)" -a ! -f "$(LAUNCHD)/$(PLIST)" ]; then \