- Fix build, adjust staging

- Change pkg-plist

Approved by:	pawel / wg (mentors, implicit)

3 files changed, 9 insertions, 17 deletions

diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index 35463ae5a10d..bfa30bad6e14 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -30,16 +30,12 @@ USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run \
 USE_GL=		glut
 USE_GNOME=	gtk20
 
-MAN1=		leocad.1
-
 PORTDOCS=	CREDITS.txt README.txt TODO.txt
 
-INSTALLS_ICONS=	yes
-ICON_SIZES=	16x16 24x24 32x32 48x48 128x128 256x256
-
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+INSTALLS_ICONS=	yes
+ICON_SIZES=	16x16 24x24 32x32 48x48 128x128 256x256
 
 post-extract:
 	@${UNZIP_CMD} -q -o ${_DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
@@ -63,19 +59,18 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/pieces/* ${STAGEDIR}${DATADIR}
 
 .for s in ${ICON_SIZES}
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}.svg  \
+	${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/
-	@${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
-	${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	@${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_MAN} ${WRKSRC}/docs/leocad.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/leocad/pkg-descr b/cad/leocad/pkg-descr
index 7c1ee627fc9e..61d689708271 100644
--- a/cad/leocad/pkg-descr
+++ b/cad/leocad/pkg-descr
@@ -2,4 +2,4 @@ LeoCAD is a CAD program that can be used to create virtual LEGO models.
 It has an easy to use interface and currently features over 4000 different
 pieces created by the LDraw community.
 
-WWW: http://www.leocad.org
+WWW: http://www.leocad.org/
diff --git a/cad/leocad/pkg-plist b/cad/leocad/pkg-plist
index 3ddcc9301d25..1c355b79aea0 100644
--- a/cad/leocad/pkg-plist
+++ b/cad/leocad/pkg-plist
@@ -1,4 +1,5 @@
 bin/leocad
+man/man1/leocad.1.gz
 share/applications/leocad.desktop
 share/icons/hicolor/128x128/apps/leocad.png
 share/icons/hicolor/16x16/apps/leocad.png
@@ -9,9 +10,5 @@ share/icons/hicolor/48x48/apps/leocad.png
 share/icons/hicolor/scalable/apps/leocad.svg
 share/icons/hicolor/scalable/mimetypes/application-vnd.leocad.svg
 %%DATADIR%%/library.bin
-share/mime/application/vnd.leocad.xml
-share/mime/packages/leocad.xml
 share/pixmaps/leocad.png
-@dirrmtry share/mime/application
-@dirrmtry share/mime
 @dirrm %%DATADIR%%