diff --git a/textproc/html-pretty/Makefile b/textproc/html-pretty/Makefile
index 803af193954f..96e122bc0eff 100644
--- a/textproc/html-pretty/Makefile
+++ b/textproc/html-pretty/Makefile
@@ -1,32 +1,32 @@
PORTNAME= html-pretty
PORTVERSION= 1.01
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc www
MASTER_SITES= http://ftp.math.utah.edu:80/pub/sgml/
DISTNAME= htmlpty-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= HTML and SGML prettyprinter and text-to-HTML/SGML converter
WWW= http://www.math.utah.edu/~beebe/software/html-sgml-tools.html #html-pretty
LICENSE= PD
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
PORTDOCS= *
OPTIONS_DEFINE= DOCS
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
${INSTALL_DATA} ${WRKSRC}/*.html ${WRKSRC}/Docs/*.html \
${STAGEDIR}${DOCSDIR}/html
.for f in AUTHORS BUGS ChangeLog NEWS README THANKS
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
.endfor
.include
diff --git a/textproc/html-pretty/files/patch-Makefile.in b/textproc/html-pretty/files/patch-Makefile.in
index ce7cd1770c13..66b5bc853e69 100644
--- a/textproc/html-pretty/files/patch-Makefile.in
+++ b/textproc/html-pretty/files/patch-Makefile.in
@@ -1,114 +1,116 @@
--- Makefile.in.orig 2001-08-25 21:56:14 UTC
+++ Makefile.in
@@ -34,7 +34,7 @@
### install install htmlpty in system directories
### install-exe install only htmlpty executable
### install-man install only htmlpty manual pages
-### install-lib install only htmlpty library files
+### install-data install only htmlpty data files
### install-ftp install htmlpty in FTP directory
### lint run lint on C source code
### maintainer-clean remove absolutely everything that make
@@ -49,7 +49,7 @@
### uninstall remove htmlpty from system directories
### uninstall-exe remove htmlpty executable from system
### directories
-### uninstall-lib remove htmlpty library files from system
+### uninstall-data remove htmlpty data files from system
### directories
### uninstall-man remove htmlpty manual pages from system
### directories
-@@ -149,21 +149,21 @@
+@@ -149,22 +149,22 @@
#### Start of system configuration section. ####
-prefix = /usr/local
+prefix = @prefix@
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
-datadir = $(prefix)/lib
+datadir = $(prefix)/share
infodir = $(prefix)/info
-libdir = $(prefix)/share/lib
+libdir = $(prefix)/lib
srcdir = @srcdir@
### NB: the default catalog search algorithm in htmlpty is based on
### mapping /the/path/to/bin/htmlpty to
-### /the/path/to/share/lib/htmlpty, so the values of BINDIR and LIBDIR
+### /the/path/to/share/lib/htmlpty, so the values of BINDIR and DATADIR
### are NOT independent.
BINDIR = $(bindir)
-LIBDIR = $(libdir)
+-MANDIR = $(prefix)/man
+DATADIR = $(datadir)
- MANDIR = $(prefix)/man
++MANDIR = $(prefix)/share/man
MANEXT = 1
-@@ -217,7 +217,7 @@ INSTALL = @INSTALL@
+ CC = @CC@
+@@ -217,7 +217,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-LDFLAGS = $(OPT) -L$(prefix)/lib
+LDFLAGS = $(OPT)
LIBS = @LIBS@
VPATH = @srcdir@
@@ -743,32 +743,22 @@ htmlpty.zoo: htmlpty.tar
$(ZOO) v htmlpty-$(VERSION).zoo >htmlpty-$(VERSION).zoo-lst
$(LN) htmlpty-$(VERSION).zoo htmlpty.zoo
-install: htmlpty install-exe install-lib install-man
+install: htmlpty install-exe install-data install-man
### Remove the old executable before installing the new one, so as to
### preserve the link to the old version. We first rename the file
### before deleting it, to deal with systems that do not permit
### deletion of an executable that is in use.
install-exe:
- if test -f $(BINDIR)/$(PROGRAM) ; \
- then \
- $(MV) $(BINDIR)/$(PROGRAM) $(BINDIR)/$(PROGRAM).tmp ; \
- $(RM) $(BINDIR)/$(PROGRAM).tmp ; \
- fi
- $(CP) htmlpty $(BINDIR)/$(PROGRAM)
- -$(CHMOD) 775 $(BINDIR)/$(PROGRAM)
- -$(RM) $(BINDIR)/$(PROGRAM)-$(VERSION)
- $(LN) $(BINDIR)/$(PROGRAM) $(BINDIR)/$(PROGRAM)-$(VERSION)
+ $(INSTALL) -m 755 htmlpty $(DESTDIR)$(BINDIR)/$(PROGRAM)
install-man:
- -$(RM) $(MANDIR)/cat$(MANEXT)/$(PROGRAM).$(MANEXT)
- $(CP) htmlpty.man $(MANDIR)/man$(MANEXT)/$(PROGRAM).$(MANEXT)
- -$(CHMOD) 664 $(MANDIR)/man$(MANEXT)/$(PROGRAM).$(MANEXT)
+ -$(MKDIR) $(DESTDIR)$(MANDIR)/man$(MANEXT)
+ $(INSTALL_DATA) htmlpty.man $(DESTDIR)$(MANDIR)/man$(MANEXT)/$(PROGRAM).$(MANEXT)
-install-lib:
- -$(MKDIR) $(LIBDIR)/$(PROGRAM)
- $(CP) Styles/catalog Styles/*.sty $(LIBDIR)/$(PROGRAM)/
- $(CHMOD) 664 $(LIBDIR)/$(PROGRAM)/*
+install-data:
+ -$(MKDIR) $(DESTDIR)$(DATADIR)/$(PROGRAM)
+ $(INSTALL_DATA) Styles/catalog Styles/*.sty $(DESTDIR)$(DATADIR)/$(PROGRAM)/
install-ftp: htmlpty.tar htmlpty.zip htmlpty.zoo
$(TAR) tvf htmlpty-$(VERSION).tar >$(FTPDIR)/htmlpty-$(VERSION).tar-lst
-@@ -827,14 +817,14 @@ table.o: table.c builtin.h default.h $(H
+@@ -827,14 +817,14 @@ test-version:
test-version:
@echo "Version number is ""'"$(VERSION)"'"
-uninstall: uninstall-exe uninstall-lib uninstall-man
+uninstall: uninstall-exe uninstall-data uninstall-man
uninstall-exe:
-$(RM) $(BINDIR)/$(PROGRAM)
-$(RM) $(BINDIR)/$(PROGRAM)-$(VERSION)
-uninstall-lib:
- -$(RM) -r $(LIBDIR)/$(PROGRAM)
+uninstall-data:
+ -$(RM) -r $(DATADIR)/$(PROGRAM)
uninstall-man:
-$(RM) $(MANDIR)/cat$(MANEXT)/$(PROGRAM).$(MANEXT)
diff --git a/textproc/html-pretty/pkg-plist b/textproc/html-pretty/pkg-plist
index aef300d5144d..b8992e5b277c 100644
--- a/textproc/html-pretty/pkg-plist
+++ b/textproc/html-pretty/pkg-plist
@@ -1,10 +1,10 @@
bin/html-pretty
-man/man1/html-pretty.1.gz
+share/man/man1/html-pretty.1.gz
%%DATADIR%%/catalog
%%DATADIR%%/cougar.sty
%%DATADIR%%/dtd.sty
%%DATADIR%%/html-20.sty
%%DATADIR%%/html-30.sty
%%DATADIR%%/html-32.sty
%%DATADIR%%/html-40.sty
%%DATADIR%%/html-all.sty