svn commit: r328214 - in head/graphics: animorph makehuman mhgui

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Sep 24 23:24:51 2013
New Revision: 328214
URL: http://svnweb.freebsd.org/changeset/ports/328214

Log:
  - Support staging
  - Relax gcc requirement to `any'
  - Use new LIB_DEPENDS syntax
  - Convert USE_GMAKE to USES

Deleted:
  head/graphics/makehuman/pkg-plist
Modified:
  head/graphics/animorph/Makefile
  head/graphics/animorph/pkg-plist
  head/graphics/makehuman/Makefile
  head/graphics/mhgui/Makefile

Modified: head/graphics/animorph/Makefile
==============================================================================
--- head/graphics/animorph/Makefile	Tue Sep 24 22:53:40 2013	(r328213)
+++ head/graphics/animorph/Makefile	Tue Sep 24 23:24:51 2013	(r328214)
@@ -12,24 +12,19 @@ COMMENT=	Morphing engine for MakeHuman
 LICENSE=	LGPL21
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		pkgconfig
+USES=		pkgconfig gmake
 USE_LDCONFIG=	yes
-USE_GCC=	yes # otherwise graphics/makehuman won't link
+USE_GCC=	any # otherwise graphics/makehuman won't link
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^libanimorphdocdir =/ s|doc/|share/doc/|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/^pkgconfigdir =/ s|\$$(libdir)|\$$(exec_prefix)/libdata|' ${WRKSRC}/Makefile.in
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-libanimorphdocDATA||' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/animorph/pkg-plist
==============================================================================
--- head/graphics/animorph/pkg-plist	Tue Sep 24 22:53:40 2013	(r328213)
+++ head/graphics/animorph/pkg-plist	Tue Sep 24 23:24:51 2013	(r328214)
@@ -40,12 +40,4 @@ lib/libanimorph.la
 lib/libanimorph.so
 lib/libanimorph.so.0
 libdata/pkgconfig/animorph.pc
- at comment %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
- at comment %%PORTDOCS%%%%DOCSDIR%%/COPYING
- at comment %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
- at comment %%PORTDOCS%%%%DOCSDIR%%/INSTALL
- at comment %%PORTDOCS%%%%DOCSDIR%%/NEWS
- at comment %%PORTDOCS%%%%DOCSDIR%%/README
- at comment %%PORTDOCS%%%%DOCSDIR%%/TODO
- at comment %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/animorph

Modified: head/graphics/makehuman/Makefile
==============================================================================
--- head/graphics/makehuman/Makefile	Tue Sep 24 22:53:40 2013	(r328213)
+++ head/graphics/makehuman/Makefile	Tue Sep 24 23:24:51 2013	(r328214)
@@ -10,20 +10,21 @@ MASTER_SITES=	SF/${PORTNAME}/MakeHuman%2
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Application for parametrical modeling of 3D humanoid characters
 
-LIB_DEPENDS=	animorph:${PORTSDIR}/graphics/animorph \
-		mhgui:${PORTSDIR}/graphics/mhgui
+LIB_DEPENDS=	libanimorph.so:${PORTSDIR}/graphics/animorph \
+		libmhgui.so:${PORTSDIR}/graphics/mhgui
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_GL=		glut
-USE_GCC=	yes # Animation.cpp:94:26: error: variable length array of non-POD element type 'Animorph::BodySettings'
+USE_GCC=	any # Animation.cpp:94:26: error: variable length array of non-POD element type 'Animorph::BodySettings'
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
+PORTDATA=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -33,12 +34,9 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^makehuman_pixmapsdir =/ s|pixmaps/makehuman|makehuman/pixmaps|' ${WRKSRC}/pixmaps/Makefile.in
 	@${REINPLACE_CMD} -e '/^packagepixmapsdir=/ s|pixmaps/\$${PACKAGE}|$${PACKAGE}/pixmaps|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^makehumandocdir =/ s|doc/|share/doc/|' ${WRKSRC}/Makefile.in
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-makehumandocDATA||' ${WRKSRC}/Makefile.in
-.endif
 
 post-install:
-	${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 -n 10 ${CHMOD} 0755
-	${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 -n 10 ${CHMOD} 0644
+	${FIND} ${STAGEDIR}${DATADIR} -type d -print0 | ${XARGS} -0 -n 10 ${CHMOD} 0755
+	${FIND} ${STAGEDIR}${DATADIR} -type f -print0 | ${XARGS} -0 -n 10 ${CHMOD} 0644
 
 .include <bsd.port.mk>

Modified: head/graphics/mhgui/Makefile
==============================================================================
--- head/graphics/mhgui/Makefile	Tue Sep 24 22:53:40 2013	(r328213)
+++ head/graphics/mhgui/Makefile	Tue Sep 24 23:24:51 2013	(r328214)
@@ -12,30 +12,25 @@ COMMENT=	GUI widget library for MakeHuma
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	animorph:${PORTSDIR}/graphics/animorph \
-		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libanimorph.so:${PORTSDIR}/graphics/animorph \
+		libpng15.so:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		pkgconfig
+USES=		pkgconfig gmake
 USE_LDCONFIG=	yes
 USE_XORG=	xi xmu ice sm
 USE_GL=		glut
-USE_GCC=	yes # otherwise graphics/makehuman won't link
+USE_GCC=	any # otherwise graphics/makehuman won't link
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^libmhguidocdir =/ s|doc/|share/doc/|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/^pkgconfigdir =/ s|\$$(libdir)|\$$(exec_prefix)/libdata|' ${WRKSRC}/Makefile.in
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-libmhguidocDATA||' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>