- Update MASTER_SITES

- Add LICENSE
- Stage support

PR:		187039
Submitted by:	Ports Fury

2 files changed, 78 insertions, 79 deletions

diff --git a/misc/asbutton/Makefile b/misc/asbutton/Makefile
index caff989ccd74..e6d2dd40be0e 100644
--- a/misc/asbutton/Makefile
+++ b/misc/asbutton/Makefile
@@ -5,13 +5,13 @@ PORTNAME=	asbutton
 PORTVERSION=	0.3
 PORTREVISION=	3
 CATEGORIES=	misc windowmaker afterstep
-MASTER_SITES=	http://www.tigr.net/afterstep/download/asbutton/
+MASTER_SITES=	AFTERSTEP/apps/asbutton/ \
+		http://tigr.net/afterstep/download/asbutton/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockapp that displays 4 or 9 buttons to run apps of your choice
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2014-03-07
+LICENSE=	GPLv2
 
 USE_XORG=	x11 xpm
 ALL_TARGET=	asbutton
@@ -19,23 +19,22 @@ MAKE_ARGS=	INCLUDES="-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include" \
 		LIBINC="-L${LOCALBASE}/lib" LIBS="-lm -lX11 -lXpm -lXext" \
 		CCFLAGS="${CFLAGS}"
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
-	@${REINPLACE_CMD} -e 's:gcc :${CC} :' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|gcc |$${CC} |' ${WRKSRC}/Makefile
+
+post-build:
+	@${LN} -sf .asbuttonrc ${WRKSRC}/asbuttonrc
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/asbutton ${PREFIX}/bin
-	@${ECHO} "===>   Installing icons in ${PREFIX}/share/asbutton"
-	@${MKDIR} ${PREFIX}/share/asbutton && ${CHMOD} a+rx ${PREFIX}/share/asbutton
-	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/share/asbutton
-
-post-install:
-	@${ECHO} "===>   Installing sample asbuttonrc in ${PREFIX}/share/examples/asbutton"
-	@${ECHO} "===>   Copy to ~/.asbuttonrc and modify to desired config."
-	@${MKDIR} ${PREFIX}/share/examples/asbutton && ${CHMOD} a+rx ${PREFIX}/share/examples/asbutton
-	${INSTALL_DATA} ${WRKSRC}/.asbuttonrc ${PREFIX}/share/examples/asbutton/asbuttonrc && ${CHMOD} u+rw ${PREFIX}/share/examples/asbutton/asbuttonrc
-	@${ECHO} "===>   Use 'asbutton -h' for help."
-
-.include <bsd.port.post.mk>
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} asbutton \
+		${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/icons && ${INSTALL_DATA} *.xpm \
+		${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} asbuttonrc \
+		${STAGEDIR}${EXAMPLESDIR})
+
+.include <bsd.port.mk>
diff --git a/misc/asbutton/pkg-plist b/misc/asbutton/pkg-plist
index 17909963319b..90e619e7242f 100644
--- a/misc/asbutton/pkg-plist
+++ b/misc/asbutton/pkg-plist
@@ -1,61 +1,61 @@
 bin/asbutton
-share/asbutton/asb4-1.xpm
-share/asbutton/asb4-2.xpm
-share/asbutton/asb4-3.xpm
-share/asbutton/asb4-4.xpm
-share/asbutton/asb4-blank.xpm
-share/asbutton/asb4-bullethole.xpm
-share/asbutton/asb4-corel.xpm
-share/asbutton/asb4-filingcabinet.xpm
-share/asbutton/asb4-gear.xpm
-share/asbutton/asb4-gnu-button-thang.xpm
-share/asbutton/asb4-gnu-defaultapp.xpm
-share/asbutton/asb4-gqview.xpm
-share/asbutton/asb4-gv.xpm
-share/asbutton/asb4-info.xpm
-share/asbutton/asb4-info2.xpm
-share/asbutton/asb4-netscape.xpm
-share/asbutton/asb4-network.xpm
-share/asbutton/asb4-package.xpm
-share/asbutton/asb4-redhat.xpm
-share/asbutton/asb4-term-bsd.xpm
-share/asbutton/asb4-term-linux.xpm
-share/asbutton/asb4-turn.xpm
-share/asbutton/asb4-vim.xpm
-share/asbutton/asb4-wilbur.xpm
-share/asbutton/asb4-xmms.xpm
-share/asbutton/asb4-xv.xpm
-share/asbutton/asb9-1.xpm
-share/asbutton/asb9-2.xpm
-share/asbutton/asb9-3.xpm
-share/asbutton/asb9-4.xpm
-share/asbutton/asb9-5.xpm
-share/asbutton/asb9-6.xpm
-share/asbutton/asb9-7.xpm
-share/asbutton/asb9-8.xpm
-share/asbutton/asb9-9.xpm
-share/asbutton/asb9-blank.xpm
-share/asbutton/asb9-bullethole.xpm
-share/asbutton/asb9-corel.xpm
-share/asbutton/asb9-filecabinet.xpm
-share/asbutton/asb9-gear.xpm
-share/asbutton/asb9-gnu-button-thang.xpm
-share/asbutton/asb9-gnu-defaultapp.xpm
-share/asbutton/asb9-gqview.xpm
-share/asbutton/asb9-gv.xpm
-share/asbutton/asb9-info.xpm
-share/asbutton/asb9-info2.xpm
-share/asbutton/asb9-netscape.xpm
-share/asbutton/asb9-network.xpm
-share/asbutton/asb9-package.xpm
-share/asbutton/asb9-redhat.xpm
-share/asbutton/asb9-term-bsd.xpm
-share/asbutton/asb9-term-linux.xpm
-share/asbutton/asb9-turn.xpm
-share/asbutton/asb9-vim.xpm
-share/asbutton/asb9-wilbur.xpm
-share/asbutton/asb9-xmms.xpm
-share/asbutton/asb9-xv.xpm
-share/examples/asbutton/asbuttonrc
-@dirrm share/asbutton
-@dirrm share/examples/asbutton
+%%DATADIR%%/asb4-1.xpm
+%%DATADIR%%/asb4-2.xpm
+%%DATADIR%%/asb4-3.xpm
+%%DATADIR%%/asb4-4.xpm
+%%DATADIR%%/asb4-blank.xpm
+%%DATADIR%%/asb4-bullethole.xpm
+%%DATADIR%%/asb4-corel.xpm
+%%DATADIR%%/asb4-filingcabinet.xpm
+%%DATADIR%%/asb4-gear.xpm
+%%DATADIR%%/asb4-gnu-button-thang.xpm
+%%DATADIR%%/asb4-gnu-defaultapp.xpm
+%%DATADIR%%/asb4-gqview.xpm
+%%DATADIR%%/asb4-gv.xpm
+%%DATADIR%%/asb4-info.xpm
+%%DATADIR%%/asb4-info2.xpm
+%%DATADIR%%/asb4-netscape.xpm
+%%DATADIR%%/asb4-network.xpm
+%%DATADIR%%/asb4-package.xpm
+%%DATADIR%%/asb4-redhat.xpm
+%%DATADIR%%/asb4-term-bsd.xpm
+%%DATADIR%%/asb4-term-linux.xpm
+%%DATADIR%%/asb4-turn.xpm
+%%DATADIR%%/asb4-vim.xpm
+%%DATADIR%%/asb4-wilbur.xpm
+%%DATADIR%%/asb4-xmms.xpm
+%%DATADIR%%/asb4-xv.xpm
+%%DATADIR%%/asb9-1.xpm
+%%DATADIR%%/asb9-2.xpm
+%%DATADIR%%/asb9-3.xpm
+%%DATADIR%%/asb9-4.xpm
+%%DATADIR%%/asb9-5.xpm
+%%DATADIR%%/asb9-6.xpm
+%%DATADIR%%/asb9-7.xpm
+%%DATADIR%%/asb9-8.xpm
+%%DATADIR%%/asb9-9.xpm
+%%DATADIR%%/asb9-blank.xpm
+%%DATADIR%%/asb9-bullethole.xpm
+%%DATADIR%%/asb9-corel.xpm
+%%DATADIR%%/asb9-filecabinet.xpm
+%%DATADIR%%/asb9-gear.xpm
+%%DATADIR%%/asb9-gnu-button-thang.xpm
+%%DATADIR%%/asb9-gnu-defaultapp.xpm
+%%DATADIR%%/asb9-gqview.xpm
+%%DATADIR%%/asb9-gv.xpm
+%%DATADIR%%/asb9-info.xpm
+%%DATADIR%%/asb9-info2.xpm
+%%DATADIR%%/asb9-netscape.xpm
+%%DATADIR%%/asb9-network.xpm
+%%DATADIR%%/asb9-package.xpm
+%%DATADIR%%/asb9-redhat.xpm
+%%DATADIR%%/asb9-term-bsd.xpm
+%%DATADIR%%/asb9-term-linux.xpm
+%%DATADIR%%/asb9-turn.xpm
+%%DATADIR%%/asb9-vim.xpm
+%%DATADIR%%/asb9-wilbur.xpm
+%%DATADIR%%/asb9-xmms.xpm
+%%DATADIR%%/asb9-xv.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asbuttonrc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%DATADIR%%