diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-admin/apache-tools/files | |
reinit the tree, so we can have metadata
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, 88 insertions, 0 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 new file mode 100644 index 000000000000..7bc39527790c --- /dev/null +++ b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch @@ -0,0 +1,41 @@ +=== 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 new file mode 100644 index 000000000000..b7d3c274ea48 --- /dev/null +++ b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch @@ -0,0 +1,47 @@ +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 |