Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Oct 2013 23:23:56 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330790 - head/multimedia/libdv
Message-ID:  <201310182323.r9INNuv9089757@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-# 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 <bsd.port.mk>
+
+# 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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310182323.r9INNuv9089757>