- Add staging support

- Remove leading article from COMMENT
- Sort pkg-plist

2 files changed, 31 insertions, 33 deletions

diff --git a/deskutils/cycle/Makefile b/deskutils/cycle/Makefile
index 5d267822fe55..779fbd5618cc 100644
--- a/deskutils/cycle/Makefile
+++ b/deskutils/cycle/Makefile
@@ -8,48 +8,45 @@ CATEGORIES=	deskutils biology python
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A calendar program for women
+COMMENT=	Calendar program for women
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_PYTHON_RUN=	yes
 USE_WX=		2.6+
 WX_COMPS=	python
 NO_BUILD=	yes
 
-MAN1=		${PORTNAME}.1
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,"msg","${PREFIX}/share/locale",' \
 		-e 's,"","${DOCSDIR}", ; s,"icons","${DATADIR}/icons",' \
 		-e 's,"bitmaps","${DATADIR}/bitmaps",' ${WRKSRC}/set_dir.py
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${PREFIX}/bin/${PORTNAME}
-	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/cal_year.py ${WRKSRC}/dialogs.py \
-		${WRKSRC}/p_rotor.py ${WRKSRC}/save_load.py \
-		${WRKSRC}/set_dir.py ${WRKSRC}/setup.py \
-			${PREFIX}/lib/${PORTNAME}
-	@${MKDIR} ${DATADIR}/bitmaps ${DATADIR}/icons/mini \
-		${DATADIR}/icons/large
-	${INSTALL_DATA} ${WRKSRC}/bitmaps/*.[pb]* ${DATADIR}/bitmaps
-	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/icons/mini/*.xpm ${DATADIR}/icons/mini
-	${INSTALL_DATA} ${WRKSRC}/icons/large/*.xpm ${DATADIR}/icons/large
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	(cd ${WRKSRC} && ${INSTALL_DATA} cal_year.py dialogs.py p_rotor.py \
+		save_load.py set_dir.py setup.py \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME})
+	@${MKDIR} ${STAGEDIR}${DATADIR}/bitmaps ${STAGEDIR}${DATADIR}/icons/mini \
+		${STAGEDIR}${DATADIR}/icons/large
+	${INSTALL_DATA} ${WRKSRC}/bitmaps/*.[pb]* ${STAGEDIR}${DATADIR}/bitmaps
+	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${STAGEDIR}${DATADIR}/icons
+	${INSTALL_DATA} ${WRKSRC}/icons/mini/*.xpm ${STAGEDIR}${DATADIR}/icons/mini
+	${INSTALL_DATA} ${WRKSRC}/icons/large/*.xpm ${STAGEDIR}${DATADIR}/icons/large
 # These locale directories are not part of mtree(8) template yet
 .for l in ca cs gl sk
-	@${MKDIR} ${PREFIX}/share/locale/${l}/LC_MESSAGES
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${l}/LC_MESSAGES
 .endfor
 .for l in ca cs de es gl ru sk
 	${INSTALL_DATA} ${WRKSRC}/msg/${l}/LC_MESSAGES/${PORTNAME}.mo \
-		${PREFIX}/share/locale/${l}/LC_MESSAGES
+		${STAGEDIR}${PREFIX}/share/locale/${l}/LC_MESSAGES
 .endfor
 # Docs are kind of mandatory here since they are used as internal help
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README*.html ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README*.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/deskutils/cycle/pkg-plist b/deskutils/cycle/pkg-plist
index bce517118ed7..08f6e8bd301c 100644
--- a/deskutils/cycle/pkg-plist
+++ b/deskutils/cycle/pkg-plist
@@ -5,7 +5,7 @@ lib/cycle/p_rotor.py
 lib/cycle/save_load.py
 lib/cycle/set_dir.py
 lib/cycle/setup.py
-@dirrm lib/cycle
+man/man1/cycle.1.gz
 %%DATADIR%%/bitmaps/curr.png
 %%DATADIR%%/bitmaps/dec.png
 %%DATADIR%%/bitmaps/exit.png
@@ -14,14 +14,12 @@ lib/cycle/setup.py
 %%DATADIR%%/bitmaps/legend.png
 %%DATADIR%%/bitmaps/set.png
 %%DATADIR%%/bitmaps/smiles.bmp
-@dirrm %%DATADIR%%/bitmaps
-%%DATADIR%%/icons/mini/cycle.xpm
-@dirrm %%DATADIR%%/icons/mini
-%%DATADIR%%/icons/large/cycle.xpm
-@dirrm %%DATADIR%%/icons/large
 %%DATADIR%%/icons/cycle.xpm
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
+%%DATADIR%%/icons/large/cycle.xpm
+%%DATADIR%%/icons/mini/cycle.xpm
+%%DOCSDIR%%/README.html
+%%DOCSDIR%%/README_de.html
+%%DOCSDIR%%/README_ru.html
 share/locale/ca/LC_MESSAGES/cycle.mo
 share/locale/cs/LC_MESSAGES/cycle.mo
 share/locale/de/LC_MESSAGES/cycle.mo
@@ -29,7 +27,10 @@ share/locale/es/LC_MESSAGES/cycle.mo
 share/locale/gl/LC_MESSAGES/cycle.mo
 share/locale/ru/LC_MESSAGES/cycle.mo
 share/locale/sk/LC_MESSAGES/cycle.mo
-%%DOCSDIR%%/README.html
-%%DOCSDIR%%/README_de.html
-%%DOCSDIR%%/README_ru.html
 @dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/icons/mini
+@dirrm %%DATADIR%%/icons/large
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/bitmaps
+@dirrm %%DATADIR%%
+@dirrm lib/cycle