svn commit: r324138 - head/graphics/white_dune

Alexey Dokuchaev danfe at FreeBSD.org
Fri Aug 2 03:50:48 UTC 2013


Author: danfe
Date: Fri Aug  2 03:50:46 2013
New Revision: 324138
URL: http://svnweb.freebsd.org/changeset/ports/324138

Log:
  - Unbreak parallel (-jX) builds by calling submakes correctly
  - Remove non-working CENKES from MASTER_SITES
  - Use newly proposed LIB_DEPENDS syntax
  - Convert to OptionsNG, wrap one overly long line, misc. cleanups
  
  NB: v0.30pl10 is available from upstream.

Modified:
  head/graphics/white_dune/Makefile

Modified: head/graphics/white_dune/Makefile
==============================================================================
--- head/graphics/white_dune/Makefile	Fri Aug  2 02:50:14 2013	(r324137)
+++ head/graphics/white_dune/Makefile	Fri Aug  2 03:50:46 2013	(r324138)
@@ -1,4 +1,4 @@
-# Created by: ijliao
+# Created by: Ying-Chieh Liao <ijliao at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	white_dune
@@ -7,16 +7,15 @@ DISTVERSION=	0.30pl5
 PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://vrml.cip.ica.uni-stuttgart.de/dune/ CENKES
+MASTER_SITES=	http://vrml.cip.ica.uni-stuttgart.de/dune/
 
 MAINTAINER=	devel at stasyan.com
 COMMENT=	Graphical VRML97 editor and animation tool
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		motif
 USE_XORG=	xft
@@ -30,18 +29,30 @@ CONFIGURE_ARGS=	--with-optimization \
 		--with-vrml97am1url="${DOCSDIR}/vrml97Amendment1" \
 		--with-x3ddrafturl="${DOCSDIR}/x3dDraft" \
 		--with-scriptednodesurl="${DOCSDIR}/scriptedNodes"
-CPPFLAGS+=	`${SDL_CONFIG} --cflags` -DUSBHID_UCR_DATA -DUSBHID_NEW -D__FREEBSD__
+CPPFLAGS+=	`${SDL_CONFIG} --cflags` -DUSBHID_UCR_DATA -DUSBHID_NEW \
+		-D__FREEBSD__
 LDFLAGS+=	`${SDL_CONFIG} --libs`
 ALL_TARGET=	dune
+REINPLACE_ARGS=	-i ''
 
 MAN1=		dune.1 illegal2vrml.1
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+# Try to fix parallel builds (-jX) by calling submakes correctly
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile\* | ${XARGS} ${REINPLACE_CMD} -E \
+		's,cd (.+) *(;|&&) *(make|\$$\(MAKE\)),$$(MAKE) -C \1,'
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/dune ${PREFIX}/bin/
-	@cd ${WRKSRC}/bin/&&${INSTALL_SCRIPT} dune4kids illegal2vrml ${PREFIX}/bin/
-	@cd ${WRKSRC}/man/&&${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1/
-.ifndef NOPORTDOCS
-	@cd ${WRKSRC}/docs/&&${COPYTREE_SHARE} . ${DOCSDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/dune ${PREFIX}/bin
+	cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} dune4kids illegal2vrml \
+		${PREFIX}/bin
+	cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
+.if ${PORT_OPTIONS:MDOCS}
+	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>


More information about the svn-ports-head mailing list