Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Feb 2016 10:17:42 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r409328 - in head/textproc/html-pretty: . files
Message-ID:  <201602221017.u1MAHgCh009843@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Feb 22 10:17:42 2016
New Revision: 409328
URL: https://svnweb.freebsd.org/changeset/ports/409328

Log:
  - Switch to options helpers
  - Simplify installation
  - Regenerate patches with `make makepatch`

Modified:
  head/textproc/html-pretty/Makefile
  head/textproc/html-pretty/files/patch-Makefile.in

Modified: head/textproc/html-pretty/Makefile
==============================================================================
--- head/textproc/html-pretty/Makefile	Mon Feb 22 10:16:18 2016	(r409327)
+++ head/textproc/html-pretty/Makefile	Mon Feb 22 10:17:42 2016	(r409328)
@@ -18,17 +18,17 @@ GNU_CONFIGURE=	yes
 
 PORTDOCS=	*
 
-DOCFILES=	AUTHORS BUGS COPYING ChangeLog NEWS README THANKS
+OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/*.html \
-		${STAGEDIR}${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/Docs/*.html \
+	${INSTALL_DATA} ${WRKSRC}/*.html ${WRKSRC}/Docs/*.html \
 		${STAGEDIR}${DOCSDIR}/html
-	for docfile in ${DOCFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$docfile ${STAGEDIR}${DOCSDIR}/; \
-	done
+.for f in AUTHORS BUGS ChangeLog NEWS README THANKS
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
+.endfor
 
 .include <bsd.port.mk>

Modified: head/textproc/html-pretty/files/patch-Makefile.in
==============================================================================
--- head/textproc/html-pretty/files/patch-Makefile.in	Mon Feb 22 10:16:18 2016	(r409327)
+++ head/textproc/html-pretty/files/patch-Makefile.in	Mon Feb 22 10:17:42 2016	(r409328)
@@ -1,5 +1,5 @@
---- ./Makefile.in.orig	2001-08-25 21:56:14.000000000 +0000
-+++ ./Makefile.in	2014-01-28 15:44:55.000000000 +0000
+--- 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
@@ -45,7 +45,7 @@
  MANDIR          = $(prefix)/man
  MANEXT		= 1
  
-@@ -217,7 +217,7 @@
+@@ -217,7 +217,7 @@ INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA    = @INSTALL_DATA@
  
@@ -54,7 +54,7 @@
  LIBS            = @LIBS@
  
  VPATH           = @srcdir@
-@@ -743,32 +743,22 @@
+@@ -743,32 +743,22 @@ htmlpty.zoo:	htmlpty.tar
  	$(ZOO) v htmlpty-$(VERSION).zoo >htmlpty-$(VERSION).zoo-lst
  	$(LN) htmlpty-$(VERSION).zoo htmlpty.zoo
  
@@ -94,7 +94,7 @@
  
  install-ftp:	htmlpty.tar htmlpty.zip htmlpty.zoo
  	$(TAR) tvf htmlpty-$(VERSION).tar >$(FTPDIR)/htmlpty-$(VERSION).tar-lst
-@@ -827,14 +817,14 @@
+@@ -827,14 +817,14 @@ table.o:	table.c builtin.h default.h $(H
  test-version:
  	@echo "Version number is ""'"$(VERSION)"'"
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602221017.u1MAHgCh009843>