From owner-svn-ports-all@FreeBSD.ORG Fri Oct 18 23:23:57 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1B3F6606; Fri, 18 Oct 2013 23:23:57 +0000 (UTC) (envelope-from bapt@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 EDE7225D9; Fri, 18 Oct 2013 23:23:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9INNuBO089759; Fri, 18 Oct 2013 23:23:56 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9INNuv9089757; Fri, 18 Oct 2013 23:23:56 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201310182323.r9INNuv9089757@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 18 Oct 2013 23:23:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330790 - head/multimedia/libdv 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: Fri, 18 Oct 2013 23:23:57 -0000 Author: bapt Date: Fri Oct 18 23:23:56 2013 New Revision: 330790 URL: http://svnweb.freebsd.org/changeset/ports/330790 Log: Enable stage Move docs informations into plist Unconditionnaly install docs in stage Modified: head/multimedia/libdv/Makefile head/multimedia/libdv/pkg-plist Modified: head/multimedia/libdv/Makefile ============================================================================== --- head/multimedia/libdv/Makefile Fri Oct 18 23:22:03 2013 (r330789) +++ head/multimedia/libdv/Makefile Fri Oct 18 23:23:56 2013 (r330790) @@ -23,23 +23,13 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHR LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} USE_LDCONFIG= yes -PORTDOCS= AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \ +DOCS= AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \ README.dvconnect README.encoder TODO OPTIONS_DEFINE= SDL DOCS -.include - -# XXX - work around compiler bug -# Optimizations -O{1,s,2,3} work -# However, lack of -O{1,s,2,3} or -O0 BREAK the build -# Therefore, make sure we have AT LEAST -O and avoid -O0 -CFLAGS:= -O ${CFLAGS:N-O0} - -.if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl -CONFIGURE_ARGS+= --enable-sdl -.endif +SDL_USE= sdl +SDL_CONFIGURE_ENABLE= sdl post-patch: @${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|' \ @@ -53,15 +43,19 @@ post-patch: ${WRKSRC}/encodedv/dvconnect.c # XXX - revise at every port update # protect popt from prefix changes - @${REINPLACE_CMD} -E -e 's|(@REQUIRES_NOPKGCONFIG@)|-L${LOCALBASE}/include \1|' \ + @${REINPLACE_CMD} -E -e 's|(@REQUIRES_NOPKGCONFIG@)|-L${PREFIX}/include \1|' \ ${WRKSRC}/libdv.pc.in post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for doc in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} -.endfor -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdv.so.4 .include + +# XXX - work around compiler bug +# Optimizations -O{1,s,2,3} work +# However, lack of -O{1,s,2,3} or -O0 BREAK the build +# Therefore, make sure we have AT LEAST -O and avoid -O0 +CFLAGS:= -O ${CFLAGS:N-O0} + Modified: head/multimedia/libdv/pkg-plist ============================================================================== --- head/multimedia/libdv/pkg-plist Fri Oct 18 23:22:03 2013 (r330789) +++ head/multimedia/libdv/pkg-plist Fri Oct 18 23:23:56 2013 (r330790) @@ -11,4 +11,14 @@ libdata/pkgconfig/libdv.pc man/man1/dubdv.1.gz man/man1/dvconnect.1.gz man/man1/encodedv.1.gz +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.dvconnect +%%PORTDOCS%%%%DOCSDIR%%/README.encoder +%%PORTDOCS%%%%DOCSDIR%%/TODO @dirrm include/libdv +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%