1: Stagify.

2: use options helper to handle PORTDOCS.

Approved by:	portmgr@ (blanket approval)

4 files changed, 72 insertions, 17 deletions

diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index cb4613e818cb..7f44d1686ff8 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -13,15 +13,16 @@ COMMENT=	Window manager that makes your desktop look like an Amiga(TM)
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 ice sm xext xmu
-MAN1=		amiwm.1
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "===>  Copying documents to ${DOCSDIR}"
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
-	@${INSTALL_DATA} ${WRKSRC}/README.modules ${DOCSDIR}/README.modules
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
+	@${INSTALL_DATA} ${WRKSRC}/README.modules ${STAGEDIR}${DOCSDIR}/README.modules
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/amiwm/files/patch-Makefile.in b/x11-wm/amiwm/files/patch-Makefile.in
new file mode 100644
index 000000000000..83dd1a3991ec
--- /dev/null
+++ b/x11-wm/amiwm/files/patch-Makefile.in
@@ -0,0 +1,64 @@
+--- Makefile.in.orig	2010-07-20 00:07:34.000000000 +0800
++++ Makefile.in	2014-07-02 09:42:52.170996007 +0800
+@@ -43,7 +43,7 @@ DISTFILES = README README.modules INSTAL
+ 
+ PACKAGENAME = amiwm
+ 
+-AMIWM_HOME = $(libdir)/amiwm
++AMIWM_HOME = $(libdir)/X11/amiwm
+ 
+ all : lib_all
+ 	@$(MAKE) local_all
+@@ -88,32 +88,32 @@ kbdlexer.c : kbdlexer.l
+ 	$(LEX) -t $< > kbdlexer.c
+ 
+ install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
+-	-mkdir -p $(AMIWM_HOME)
+-	$(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice
+-	$(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd
++	-mkdir -p $(DESTDIR)$(AMIWM_HOME)
++	$(INSTALL) $(STRIPFLAG) requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice
++	$(INSTALL) $(STRIPFLAG) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd
+ 	for module in $(MODULES); do \
+ 	  if [ "$$module" = "$(srcdir)/Background" ]; then \
+-	    $(INSTALL) $$module $(AMIWM_HOME)/Background; \
++	    $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/Background; \
+ 	  else \
+-	    $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_HOME)/$$module; \
++	    $(INSTALL) $(STRIPFLAG) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \
+ 	  fi; \
+ 	done
+-	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(AMIWM_HOME)/system.amiwmrc
+-	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(AMIWM_HOME)/def_tool.info
+-	$(INSTALL) -m 644 $(srcdir)/system.map $(AMIWM_HOME)/system.map
+-	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(AMIWM_HOME)/magicwb.map
+-	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(AMIWM_HOME)/schwartz.map
+-	$(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession
+-	$(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2
+-	$(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc
+-	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(AMIWM_HOME)/amiwm-init
+-	-mkdir -p $(bindir)
+-	$(INSTALL) $(STRIPFLAG) amiwm $(bindir)/amiwm
+-	$(INSTALL) $(STRIPFLAG) ppmtoinfo $(bindir)/ppmtoinfo
++	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc
++	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info
++	$(INSTALL) -m 644 $(srcdir)/system.map $(DESTDIR)$(AMIWM_HOME)/system.map
++	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map
++	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map
++	$(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession
++	$(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2
++	$(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc
++	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init
++	-mkdir -p $(DESTDIR)$(bindir)
++	$(INSTALL) $(STRIPFLAG) amiwm $(DESTDIR)$(bindir)/amiwm
++	$(INSTALL) $(STRIPFLAG) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo
+ 	$(RM) $(bindir)/requestchoice
+-	$(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice
+-	-mkdir -p $(mandir)/man1
+-	$(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1
++	$(LN_S) $(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice
++	-mkdir -p $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -m 644 $(srcdir)/amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1
+ 
+ fs-install : Filesystem
+ 	$(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem
diff --git a/x11-wm/amiwm/files/patch-aa b/x11-wm/amiwm/files/patch-aa
deleted file mode 100644
index aadaacbb951b..000000000000
--- a/x11-wm/amiwm/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Nov 21 00:36:13 1998
-+++ Makefile.in	Sat Nov 21 00:36:20 1998
-@@ -42,7 +42,7 @@
- 
- PACKAGENAME = amiwm
- 
--AMIWM_HOME = $(libdir)/amiwm
-+AMIWM_HOME = $(libdir)/X11/amiwm
- 
- all : $(PROGS) $(MODULES)
- 
diff --git a/x11-wm/amiwm/pkg-plist b/x11-wm/amiwm/pkg-plist
index dececc0d7429..26d065e8619a 100644
--- a/x11-wm/amiwm/pkg-plist
+++ b/x11-wm/amiwm/pkg-plist
@@ -14,6 +14,7 @@ lib/X11/amiwm/requestchoice
 lib/X11/amiwm/schwartz.map
 lib/X11/amiwm/system.amiwmrc
 lib/X11/amiwm/system.map
+man/man1/amiwm.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.modules
 @dirrm lib/X11/amiwm