diff options
author | cube <cube> | 2003-10-28 12:34:58 +0000 |
---|---|---|
committer | cube <cube> | 2003-10-28 12:34:58 +0000 |
commit | 412b30f11b6fb94165d35a7c1cb84bf2c6adbf32 (patch) | |
tree | 5f0141eafdc054a6c40e0e4266b5851ceb317cb5 /www | |
parent | c4869bedd808986da1f286b5a7bd1422e10429f7 (diff) | |
download | pkgsrc-412b30f11b6fb94165d35a7c1cb84bf2c6adbf32.tar.gz |
Forgotten patch needed by tidy update in previous commit.
Diffstat (limited to 'www')
-rw-r--r-- | www/tidy/patches/patch-ac | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/www/tidy/patches/patch-ac b/www/tidy/patches/patch-ac new file mode 100644 index 00000000000..19a4c5ad422 --- /dev/null +++ b/www/tidy/patches/patch-ac @@ -0,0 +1,72 @@ +$NetBSD: patch-ac,v 1.1 2003/10/28 12:34:58 cube Exp $ + +--- build/gmake/Makefile.orig 2003-04-12 08:57:03.000000000 +0200 ++++ build/gmake/Makefile +@@ -58,8 +58,8 @@ SHELL=/bin/sh + PROJECT=tidy + + # Installation variables. Spaces OK, only dir create and file copy operations. +-runinst_prefix=/usr/local +-devinst_prefix=/usr/local ++runinst_prefix=${PREFIX} ++devinst_prefix=${PREFIX} + + bininst = ${runinst_prefix}/bin + libinst = ${devinst_prefix}/lib +@@ -76,7 +76,7 @@ LIBDIR = ${TOPDIR}/lib + BINDIR = ${TOPDIR}/bin + + # CFLAGS etc.. +-CC= gcc ++#CC= gcc + CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR) + + # OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1 +@@ -107,7 +107,7 @@ LIBPREFIX = lib + LIBSUFFIX = .a + + LIBRARY = $(LIBDIR)/$(LIBPREFIX)$(PROJECT)$(LIBSUFFIX) +-AR=ar -r ++#AR=ar -r + + EXES = $(BINDIR)/$(PROJECT) $(BINDIR)/tab2space + +@@ -148,7 +148,7 @@ all: $(LIBRARY) $(EXES) + + $(LIBRARY): $(OBJFILES) + if [ ! -d $(LIBDIR) ]; then mkdir $(LIBDIR); fi +- $(AR) $@ $(OBJFILES) ++ $(AR) -r $@ $(OBJFILES) + ifdef RANLIB + $(RANLIB) $@ + endif +@@ -177,21 +177,21 @@ clean: + if [ "$(BINDIR)" != "$(TOPDIR)" -a -d $(BINDIR) ]; then rmdir $(BINDIR); fi + + installhdrs: $(HFILES) +- if [ ! -d "$(incinst)" ]; then mkdir -p "$(incinst)"; fi +- cp -f $(HFILES) "$(incinst)/" ++ if [ ! -d "$(incinst)" ]; then $(BSD_INSTALL_DATA_DIR) "$(incinst)"; fi ++ $(BSD_INSTALL_DATA) $(HFILES) "$(incinst)/" + + installib: $(LIBRARY) +- if [ ! -d "$(libinst)" ]; then mkdir -p "$(libinst)"; fi +- cp -f $(LIBRARY) "$(libinst)/" ++ if [ ! -d "$(libinst)" ]; then $(BSD_INSTALL_DATA_DIR) "$(libinst)"; fi ++ $(BSD_INSTALL_DATA) $(LIBRARY) "$(libinst)/" + + installexes: $(EXES) +- if [ ! -d "$(bininst)" ]; then mkdir -p "$(bininst)"; fi +- cp -f $(EXES) "$(bininst)/" ++ if [ ! -d "$(bininst)" ]; then $(BSD_INSTALL_PROGRAM_DIR) "$(bininst)"; fi ++ $(BSD_INSTALL_PROGRAM) $(EXES) "$(bininst)/" + + installmanpage: + if [ -f "$(TOPDIR)/htmldoc/man_page.txt" ] ; then \ +- if [ ! -d "$(maninst)/man1" ]; then mkdir -p "$(maninst)/man1"; fi; \ +- cp -f $(TOPDIR)/htmldoc/man_page.txt "$(maninst)/man1/tidy.1"; \ ++ if [ ! -d "$(maninst)/man1" ]; then $(BSD_INSTALL_MAN_DIR) "$(maninst)/man1"; fi; \ ++ $(BSD_INSTALL_MAN) $(TOPDIR)/htmldoc/man_page.txt "$(maninst)/man1/tidy.1"; \ + fi + + install: installhdrs installib installmanpage installexes |