summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James (sam_c) <sam@cmpct.info>2020-04-15 19:33:15 +0000
committerJoonas Niilola <juippis@gentoo.org>2020-04-26 16:36:49 +0300
commit9f4569a28161fc2d931863ab8e826d2dd2080e3f (patch)
tree2cfb3b05f347a181086414bcb9cf2f2fff1c9658 /net-irc/ngircd/files/ngircd-25-make-env.patch
parentnet-irc/ngircd: Become proxy maintainer (diff)
downloadgentoo-9f4569a28161fc2d931863ab8e826d2dd2080e3f.tar.gz
gentoo-9f4569a28161fc2d931863ab8e826d2dd2080e3f.tar.bz2
gentoo-9f4569a28161fc2d931863ab8e826d2dd2080e3f.zip
net-irc/ngircd: Bump to 25, GLEP 81
Closes: https://bugs.gentoo.org/696572 Closes: https://bugs.gentoo.org/707634 Signed-off-by: Sam James (sam_c) <sam@cmpct.info> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-irc/ngircd/files/ngircd-25-make-env.patch')
-rw-r--r--net-irc/ngircd/files/ngircd-25-make-env.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/net-irc/ngircd/files/ngircd-25-make-env.patch b/net-irc/ngircd/files/ngircd-25-make-env.patch
new file mode 100644
index 000000000000..e6494c720079
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd-25-make-env.patch
@@ -0,0 +1,75 @@
+--- a/Makefile.am 2016-09-18 18:01:30.000000000 -0000
++++ b/Makefile.am 2020-04-20 14:01:43.166312404 -0000
+@@ -25,13 +25,13 @@
+ rm -f config.log debian
+
+ testsuite:
+- cd src/testsuite && make check
++ cd src/testsuite && ${MAKE} check
+
+ lint:
+- cd src/ngircd && make lint
++ cd src/ngircd && ${MAKE} lint
+
+ srcdoc:
+- cd doc && make srcdoc
++ cd doc && ${MAKE} srcdoc
+
+ have-xcodebuild:
+ @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \
+@@ -66,7 +66,7 @@
+ --out ../../$(distdir).mpkg
+ rm -f $(distdir).mpkg.zip
+ zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg
+- make osxpkg-clean
++ ${MAKE} osxpkg-clean
+
+ osxpkg-clean:
+ [ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest
+@@ -74,12 +74,12 @@
+
+ osxpkg-dest: have-xcodebuild osxpkg-clean clean
+ ./configure --prefix=/opt/ngircd
+- make xcode
+- make -C contrib/MacOSX de.barton.ngircd.plist
++ ${MAKE} xcode
++ ${MAKE} -C contrib/MacOSX de.barton.ngircd.plist
+ mkdir -p ngircd.dest/opt/ngircd/sbin
+- DESTDIR="$$PWD/ngircd.dest" make -C doc install
+- DESTDIR="$$PWD/ngircd.dest" make -C contrib install
+- DESTDIR="$$PWD/ngircd.dest" make -C man install
++ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C doc install
++ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C contrib install
++ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C man install
+ cp contrib/MacOSX/build/Default/ngIRCd \
+ ngircd.dest/opt/ngircd/sbin/ngircd
+ rm ngircd.dest/opt/ngircd/etc/ngircd.conf
+--- a/doc/Makefile.am 2016-01-16 13:23:40.000000000 -0000
++++ b/doc/Makefile.am 2020-04-20 14:05:45.316912143 -0000
+@@ -55,7 +55,7 @@
+ install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
+ $(MKDIR_P) -m 755 $(DESTDIR)$(sysconfdir)
+ @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
+- make install-config; \
++ ${MAKE} install-config; \
+ fi
+ $(MKDIR_P) -m 755 $(DESTDIR)$(docdir)
+ for f in $(static_docs) $(toplevel_docs); do \
+@@ -75,7 +75,7 @@
+ uninstall-hook:
+ rm -rf $(DESTDIR)$(docdir)
+ @if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \
+- make uninstall-config; \
++ ${MAKE} uninstall-config; \
+ else \
+ echo; \
+ echo " ** NOTE: Not uninstalling changed configuration file:"; \
+@@ -87,7 +87,7 @@
+ rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf
+
+ srcdoc:
+- make -C src srcdoc
++ ${MAKE} -C src srcdoc
+
+ .PHONY: install-config uninstall-config srcdoc
+