diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-admin/apache-tools/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-admin/apache-tools/files')
-rw-r--r-- | app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch | 41 | ||||
-rw-r--r-- | app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch | 47 |
2 files changed, 0 insertions, 88 deletions
diff --git a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch deleted file mode 100644 index 7bc39527790c..000000000000 --- a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -=== modified file 'support/Makefile.in' ---- a/support/Makefile.in -+++ b/support/Makefile.in -@@ -1,9 +1,10 @@ - DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ -- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std -+ logresolve.pl phf_abuse_log.cgi split-logfile - - CLEAN_TARGETS = suexec - --PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT) -+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \ -+ $(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage - TARGETS = $(PROGRAMS) - - PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) -@@ -12,22 +13,13 @@ - include $(top_builddir)/build/rules.mk - - install: -- @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) - @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) -- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) -- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) -- @for i in apxs apachectl dbmmanage; do \ -+ @for i in $(PROGRAMS) ; do \ - if test -f "$(builddir)/$$i"; then \ - cp -p $$i $(DESTDIR)$(sbindir); \ - chmod 755 $(DESTDIR)$(sbindir)/$$i; \ - fi ; \ - done -- @if test -f "$(builddir)/envvars-std"; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir); \ -- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ -- fi ; \ -- fi - - htpasswd_OBJECTS = htpasswd.lo - htpasswd: $(htpasswd_OBJECTS) - diff --git a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch deleted file mode 100644 index b7d3c274ea48..000000000000 --- a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://bugs.gentoo.org/459446 - -https://raw.github.com/archlinuxcn/repo/master/apache-tools/apache-tools-Makefile.patch - ---- a/support/Makefile.in -+++ b/support/Makefile.in -@@ -1,9 +1,9 @@ - DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ -- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std -+ logresolve.pl phf_abuse_log.cgi split-logfile - - CLEAN_TARGETS = suexec - --bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm -+bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm dbmmanage - sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT) - TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS) - -@@ -15,26 +15,18 @@ - install: - @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) - @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) -- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) -- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) -- @for i in apxs dbmmanage; do \ -+ @for i in $(bin_PROGRAMS); do \ - if test -f "$(builddir)/$$i"; then \ - cp -p $$i $(DESTDIR)$(bindir); \ - chmod 755 $(DESTDIR)$(bindir)/$$i; \ - fi ; \ - done -- @for i in apachectl; do \ -+ @for i in $(sbin_PROGRAMS); do \ - if test -f "$(builddir)/$$i"; then \ - cp -p $$i $(DESTDIR)$(sbindir); \ - chmod 755 $(DESTDIR)$(sbindir)/$$i; \ - fi ; \ - done -- @if test -f "$(builddir)/envvars-std"; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir); \ -- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ -- fi ; \ -- fi - - htpasswd.lo: passwd_common.h - passwd_common.lo: passwd_common.h |