From 83d1dc5e7824cbee1ea06f4baaedcf7a2b6254e8 Mon Sep 17 00:00:00 2001
From: vanilla <vanilla@FreeBSD.org>
Date: Tue, 1 Jul 2014 13:16:49 +0000
Subject: 1: Stagify. 2: use options helper.

Approved by:	portmgr@ (blanket approval)
---
 x11-fm/twander/Makefile             | 11 +++++------
 x11-fm/twander/files/patch-Makefile | 13 +++++++++++++
 x11-fm/twander/pkg-descr            |  2 +-
 x11-fm/twander/pkg-plist            |  1 +
 4 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 x11-fm/twander/files/patch-Makefile

diff --git a/x11-fm/twander/Makefile b/x11-fm/twander/Makefile
index 03e574c8048e..4776a1e3453a 100644
--- a/x11-fm/twander/Makefile
+++ b/x11-fm/twander/Makefile
@@ -14,16 +14,15 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkin
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 
 USE_PYTHON=	yes
+OPTIONS_DEFINE=	DOCS
 
-MANCOMPRESSED=	yes
-MAN1=		twander.1
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in READ-1ST.txt WHATSNEW.txt .twander twander-license.txt twander.html twander.pdf twander.ps twander.txt
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/x11-fm/twander/files/patch-Makefile b/x11-fm/twander/files/patch-Makefile
new file mode 100644
index 000000000000..f4d274c935a2
--- /dev/null
+++ b/x11-fm/twander/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig	2014-07-01 21:05:14.490108757 +0800
++++ Makefile	2014-07-01 21:05:33.578108694 +0800
+@@ -6,7 +6,7 @@ all: # Just need to create the compiled 
+ 	@python -OOOO -c"import py_compile;py_compile.compile('twander.py')"
+ 
+ install:
+-	${BSD_INSTALL_SCRIPT} ./twander.py   ${PREFIX}/bin
+-	${BSD_INSTALL_SCRIPT} ./twander.pyo  ${PREFIX}/bin
+-	${BSD_INSTALL_MAN}    ./twander.1.gz ${PREFIX}/man/man1
++	${BSD_INSTALL_SCRIPT} ./twander.py   $(DESTDIR)${PREFIX}/bin
++	${BSD_INSTALL_SCRIPT} ./twander.pyo  $(DESTDIR)${PREFIX}/bin
++	${BSD_INSTALL_MAN}    ./twander.1.gz $(DESTDIR)${PREFIX}/man/man1
+ 
diff --git a/x11-fm/twander/pkg-descr b/x11-fm/twander/pkg-descr
index 73af48f0eb41..57f9ddcfa8a2 100644
--- a/x11-fm/twander/pkg-descr
+++ b/x11-fm/twander/pkg-descr
@@ -21,4 +21,4 @@ appropriate to their needs.  As with the navigation commands,
 user-defined commands can be invoked with either the keyboard (a
 single keystroke) or the mouse (a menu selection).
 
-WWW:  http://www.tundraware.com/Software/twander/
+WWW: http://www.tundraware.com/Software/twander/
diff --git a/x11-fm/twander/pkg-plist b/x11-fm/twander/pkg-plist
index 7b0afb564aa6..26a45f6d39a1 100644
--- a/x11-fm/twander/pkg-plist
+++ b/x11-fm/twander/pkg-plist
@@ -1,5 +1,6 @@
 bin/twander.py
 bin/twander.pyo
+man/man1/twander.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/READ-1ST.txt
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt
 %%PORTDOCS%%%%DOCSDIR%%/twander-license.txt
-- 
cgit