diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-08-08 09:54:14 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-08-08 09:54:14 +0000 |
| commit | d8e1f0ffc8918a1e3947fb8be62c5ce04c55f6a9 (patch) | |
| tree | 09d6c64aefa4675c801d9ce0c18a735e66055237 /multimedia/vic | |
| parent | 70c0e32987edf8177d5874e2cecb5b2b1beec579 (diff) | |
| download | ports-d8e1f0ffc8918a1e3947fb8be62c5ce04c55f6a9.tar.gz ports-d8e1f0ffc8918a1e3947fb8be62c5ce04c55f6a9.zip | |
- 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)
Notes
Notes:
svn path=/head/; revision=324385
Diffstat (limited to 'multimedia/vic')
| -rw-r--r-- | multimedia/vic/Makefile | 30 | ||||
| -rw-r--r-- | multimedia/vic/files/patch-Makefile.in | 15 |
2 files changed, 25 insertions, 20 deletions
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile index 09cc9010c5a0..dde90bebaca9 100644 --- a/multimedia/vic/Makefile +++ b/multimedia/vic/Makefile @@ -1,42 +1,36 @@ -# Created by: wollman +# Created by: Garrett Wollman <wollman@FreeBSD.org> # $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 <bsd.port.mk> diff --git a/multimedia/vic/files/patch-Makefile.in b/multimedia/vic/files/patch-Makefile.in index a1dd00423658..820839d08213 100644 --- a/multimedia/vic/files/patch-Makefile.in +++ b/multimedia/vic/files/patch-Makefile.in @@ -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 |