- Clarify LICENSE

- Add LICENSE_FILE
- Switch to options helpers
- Regenerate patches with `make makepatch`

2 files changed, 9 insertions, 8 deletions

diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index d3eda110fad9..8ef260e2907c 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -11,7 +11,8 @@ DISTNAME=	awesome-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tiling window manager initially based on a dwm code rewriting
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
 		xmlto:${PORTSDIR}/textproc/xmlto
@@ -59,13 +60,13 @@ post-configure:
 			      /^doc_DATA/s/=.*$$/=/g' \
 		${WRKSRC}/Makefile
 
-post-install:
-	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${ECHO_MSG} "installing example config file to ${EXAMPLESDIR}"
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for example in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${example} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/x11-wm/awesome2/files/patch-Makefile.in b/x11-wm/awesome2/files/patch-Makefile.in
index 5df8c52c8bd4..84a4a62b155e 100644
--- a/x11-wm/awesome2/files/patch-Makefile.in
+++ b/x11-wm/awesome2/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig
+--- Makefile.in.orig	2009-04-18 14:56:52 UTC
 +++ Makefile.in
-@@ -33,12 +33,12 @@
+@@ -33,12 +33,12 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -19,7 +19,7 @@
  @HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesomerc.5
  @HAVE_ASCIIDOC_TRUE@@HAVE_PYTHON_TRUE@am__append_2 = optsdocgen.txt \
  @HAVE_ASCIIDOC_TRUE@@HAVE_PYTHON_TRUE@	rcskeletongen.txt \
-@@ -278,8 +278,8 @@
+@@ -279,8 +279,8 @@ CLEANFILES = awesomerc defconfig.h uicbg
  #       restart the whole dist process from the start and there is none.
  EXTRA_DIST = UPGRADE LICENSE UPGRADE STYLE awesomerc.in \
  	build-utils/uicbgen.sh build-utils/layoutgen.sh \
@@ -30,7 +30,7 @@
  	build-utils/extractuicbdoc.py build-utils/extractoptsdoc.py \
  	build-utils/extractrcskeleton.py build-utils/package-version \
  	awesome.doxygen.in
-@@ -496,17 +496,17 @@
+@@ -497,17 +497,17 @@ widgets/emptybox.$(OBJEXT): widgets/$(am
  	widgets/$(DEPDIR)/$(am__dirstamp)
  widgets/common.$(OBJEXT): widgets/$(am__dirstamp) \
  	widgets/$(DEPDIR)/$(am__dirstamp)