svn commit: r324038 - head/x11-toolkits/v

[Alexey Dokuchaev]

Author: danfe
Date: Wed Jul 31 12:01:01 2013
New Revision: 324038
URL: http://svnweb.freebsd.org/changeset/ports/324038

Log:
  - Unbreak parallel (-jX) builds by calling make(1) correctly and adding
    missing target dependencies
  - Remove check for alpha: unfortunately it'd EOLed long time ago
  - Provide an OPTION for OpenGL support, default to on
  - Move WRKSRC where it belongs, mute MKDIR's, pad pkg-message output
  - Use canonical form of sf.net URL in port description

Modified:
  head/x11-toolkits/v/Makefile
  head/x11-toolkits/v/pkg-descr

Modified: head/x11-toolkits/v/Makefile
==============================================================================
--- head/x11-toolkits/v/Makefile	Wed Jul 31 11:57:45 2013	(r324037)
+++ head/x11-toolkits/v/Makefile	Wed Jul 31 12:01:01 2013	(r324038)
@@ -12,29 +12,37 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${E
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	C++ GUI development framework for X11 and Microsoft Windows
 
-WRKSRC=		${WRKDIR}/home/vgui
-
-USE_XORG=	x11 xt xmu xaw
 USES=		gmake
-MAKE_JOBS_UNSAFE=	yes
+USE_XORG=	x11 xt xmu xaw
 MAKE_ENV=	INSTALLDIR=${PREFIX} HOMEV=${WRKSRC}
 USE_DOS2UNIX=	yes
 
-.include <bsd.port.pre.mk>
+WRKSRC=		${WRKDIR}/home/vgui
 
-.if ${ARCH} == "alpha"
-BROKEN=		compiler error in function fixup_memory_subreg
+OPTIONS_DEFINE=	OPENGL # DOCS (commented out, see below)
+OPTIONS_DEFAULT=	OPENGL
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPENGL}
+USE_GL=		glu
 .endif
 
-# For gmake>=3.82
 post-patch:
+# For gmake>=3.82
 	@${REINPLACE_CMD} -e 's/^	cd/#	cd/' ${WRKSRC}/srcx/Makefile
+# Fix parallel builds: call make(1) correctly, register target dependencies
+	@${REINPLACE_CMD} -E 's/cd (.+) ; (\$$\(MAKE\))/\2 -C \1/' \
+		${WRKSRC}/Makefile
+	@${ECHO_CMD} test appgen iconed draw bmp2vbm examp drawex icons \
+		tutor: srcx >> ${WRKSRC}/Makefile
 
 do-configure:
 	${CP} ${WRKSRC}/configs/ConfigX.mk ${WRKSRC}/Config.mk
 
 pre-build:
-	${MKDIR} ${WRKSRC}/obj/bsd ${WRKSRC}/objm/bsd ${WRKSRC}/lib/bsd ${WRKSRC}/bin/bsd
+	@${MKDIR} ${WRKSRC}/obj/bsd ${WRKSRC}/objm/bsd ${WRKSRC}/lib/bsd \
+		${WRKSRC}/bin/bsd
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/viconedx ${PREFIX}/bin
@@ -48,23 +56,25 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/vtestlibx ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/lib/libVx.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/libVxgl.a ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/include/v
+	@${MKDIR} ${PREFIX}/include/v
 	${INSTALL_DATA} ${WRKSRC}/includex/v/*.h ${PREFIX}/include/v
 	${INSTALL_DATA} ${WRKSRC}/includex/v/*.cxx ${PREFIX}/include/v
 
 post-install:
 	${RANLIB} ${PREFIX}/lib/libVx.a
 	${RANLIB} ${PREFIX}/lib/libVxgl.a
-#.ifdef NOPORTDOCS
+#.if ${PORT_OPTIONS:MDOCS}
 #	@${ECHO_MSG} "==> Extra documentation WILL NOT be installed."
 #.else
 #	@${ECHO_MSG} "==> Installing extra docs under ${PREFIX}/share/doc/v..."
-##	${MKDIR} ${PREFIX}/share/doc/v
+##	@${MKDIR} ${PREFIX}/share/doc/v
 #	${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/v
 #	${FIND} ${PREFIX}/share/doc/v -type d -exec ${CHMOD} 755 {} \;
 #	${FIND} ${PREFIX}/share/doc/v -type f -exec ${CHMOD} 644 {} \;
 #	@${ECHO_MSG} "==> Extra docs installed.  Note, you will need *tex to read 'em."
 #.endif
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11-toolkits/v/pkg-descr
==============================================================================
--- head/x11-toolkits/v/pkg-descr	Wed Jul 31 11:57:45 2013	(r324037)
+++ head/x11-toolkits/v/pkg-descr	Wed Jul 31 12:01:01 2013	(r324038)
@@ -8,4 +8,4 @@ toolkits on both environments).
 Full documentation, many code examples, and the V toolkit for Windows
 systems is available at the V web site:
 
-WWW: http://vgui.sf.net
+WWW: http://vgui.sourceforge.net/