From owner-svn-ports-all@FreeBSD.ORG Thu Aug 8 09:54:15 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E7FE836E; Thu, 8 Aug 2013 09:54:14 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D58F8248B; Thu, 8 Aug 2013 09:54:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r789sEkC094922; Thu, 8 Aug 2013 09:54:14 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r789sEfq094920; Thu, 8 Aug 2013 09:54:14 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201308080954.r789sEfq094920@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 8 Aug 2013 09:54:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324385 - in head/multimedia/vic: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Aug 2013 09:54:15 -0000 Author: danfe Date: Thu Aug 8 09:54:14 2013 New Revision: 324385 URL: http://svnweb.freebsd.org/changeset/ports/324385 Log: - Unbreak parallel (-jX) builds (have to use GNU make; also fix Makefile.in to be potentially less prone to races) and drop MAKE_JOBS_UNSAFE - Cleanup Makefile while here (fix header and COMMENT, remove long gone `mbone' from CATEGORIES, always enable IPv6) - Remove post-install target: binaries are stripped automatically during installation (see the build log) - Fix the build against Clang (must specify type for for all declarations) Modified: head/multimedia/vic/Makefile head/multimedia/vic/files/patch-Makefile.in Modified: head/multimedia/vic/Makefile ============================================================================== --- head/multimedia/vic/Makefile Thu Aug 8 09:45:09 2013 (r324384) +++ head/multimedia/vic/Makefile Thu Aug 8 09:54:14 2013 (r324385) @@ -1,42 +1,36 @@ -# Created by: wollman +# Created by: Garrett Wollman # $FreeBSD$ PORTNAME= vic PORTVERSION= 2.8.1.1.6 PORTREVISION= 2 -CATEGORIES= multimedia mbone tk ipv6 +CATEGORIES= multimedia tk ipv6 MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/ DISTNAME= ${PORTNAME}-2.8ucl1.1.6 MAINTAINER= mi@aldan.algebra.com -COMMENT= MBONE video tool +COMMENT= MBone video conferencing tool -BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= uclmmbase:${PORTSDIR}/devel/uclmmbase +BUILD_DEPENDS= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat +LIB_DEPENDS= libuclmmbase.so:${PORTSDIR}/devel/uclmmbase +USES= gmake # parallel builds (-jX) are broken with BSD make(1) +USE_AUTOTOOLS= autoconf213 USE_TK= 84 USE_TK_BUILD= 84 - -MAKE_JOBS_UNSAFE= yes - -USE_AUTOTOOLS= autoconf213 USE_XORG= xext -CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \ +CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \ -x-includes=${LOCALBASE}/include \ -without-ucltcl \ -with-tcl=${LOCALBASE} \ -without-ucltk \ - -with-tk=${LOCALBASE} -.ifndef (NO_INET6) -CONFIGURE_ARGS+=-enable-ipv6 -.endif + -with-tk=${LOCALBASE} \ + -enable-ipv6 + MAN1= vic.1 post-patch: + @${REINPLACE_CMD} -e 's,^main,int &,' ${WRKSRC}/tcl/tcl2cpp/tcl2cpp.c ${RM} ${WRKSRC}/md5* -post-install: - ${STRIP_CMD} ${PREFIX}/bin/vic - ${STRIP_CMD} ${PREFIX}/bin/histtolut - .include Modified: head/multimedia/vic/files/patch-Makefile.in ============================================================================== --- head/multimedia/vic/files/patch-Makefile.in Thu Aug 8 09:45:09 2013 (r324384) +++ head/multimedia/vic/files/patch-Makefile.in Thu Aug 8 09:54:14 2013 (r324385) @@ -52,13 +52,24 @@ clean: rm -f *.o codec/jpeg/*.o codec/p64/*.o codec/h263/*.o \ +@@ -347,8 +341,8 @@ + vic vic.dyn vic.xil h261_play h261_dump jpeg_play cb_wish \ + mkcube rgb-cube.ppm yuv-map.ppm cm0.c cm1.c ppmtolut \ + config.cache config.log domake.* dotar.* +- cd codec/tmn && $(MAKE) clean +- cd codec/tmndec && $(MAKE) clean ++ $(MAKE) -C codec/tmn clean ++ $(MAKE) -C codec/tmndec clean + rm -f codec/tmn-x/*.o codec/tmn-x/*.a + + realclean: @@ -410,7 +404,7 @@ codec/tmn-x/libh263coder.a: - (cd codec/tmn-x; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" ) -+ (cd codec/tmn-x; $(MAKE) CC=$(CC) CCOPT="$(CFLAGS)" ) ++ $(MAKE) -C codec/tmn-x CC=$(CC) CCOPT="$(CFLAGS)" codec/tmndec/libh263.a: - (cd codec/tmndec; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" -f Makefile.lib) -+ (cd codec/tmndec; $(MAKE) CC=$(CC) CCOPT="$(CFLAGS)" -f Makefile.lib) ++ $(MAKE) -C codec/tmndec CC=$(CC) CCOPT="$(CFLAGS)" -f Makefile.lib