Index: Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/libdvdread/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- Makefile 31 Mar 2007 03:35:30 -0000 1.22 +++ Makefile 1 Apr 2007 15:53:17 -0000 @@ -6,7 +6,7 @@ # PORTNAME= libdvdread -PORTVERSION= 0.9.4 +PORTVERSION= 0.9.7 PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -18,7 +18,9 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes + +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} DOC_FILES= AUTHORS COPYING NEWS README TODO @@ -50,24 +52,4 @@ .endif .include - -# FreeBSD byteswap optimized routines -.if ${ARCH} == "i386" -. if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mi486} == "i486") -WITH_OPTIMIZED_BYTESWAP=yes -. endif - -. if defined(WITH_OPTIMIZED_BYTESWAP) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-dvdread::bswap.h -. endif -.endif - -pre-everything:: -.ifndef(WITH_OPTIMIZED_BYTESWAP) - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_OPTIMIZED_BYTESWAP to use optimized byteswap' - @${ECHO_MSG} '===> routines. This works only in the i386 architecture, and' - @${ECHO_MSG} '===> only with 486 processors and above.' -.endif - .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/multimedia/libdvdread/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 11 Nov 2005 06:06:03 -0000 1.6 +++ distinfo 1 Apr 2007 15:53:17 -0000 @@ -1,3 +1,3 @@ -MD5 (libdvdread-0.9.4.tar.gz) = 06353d7b14541ff8b431e69ad404db84 -SHA256 (libdvdread-0.9.4.tar.gz) = bb9027e5753ec5daf0206ca9b642cd7a9d4a3b783f1d38162a9d7b8c10742f30 -SIZE (libdvdread-0.9.4.tar.gz) = 256858 +MD5 (libdvdread-0.9.7.tar.gz) = 078788c9241ae16763529e1235502337 +SHA256 (libdvdread-0.9.7.tar.gz) = e01f70cba5cfbc577b853ae69d73f00db7161e1704dc2359c4377aac4232a184 +SIZE (libdvdread-0.9.7.tar.gz) = 389113 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/multimedia/libdvdread/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- pkg-plist 6 Mar 2003 04:43:00 -0000 1.4 +++ pkg-plist 1 Apr 2007 15:53:17 -0000 @@ -1,7 +1,3 @@ -lib/libdvdread.a -lib/libdvdread.la -lib/libdvdread.so -lib/libdvdread.so.3 include/dvdread/dvd_reader.h include/dvdread/ifo_types.h include/dvdread/ifo_read.h @@ -9,10 +5,15 @@ include/dvdread/nav_types.h include/dvdread/nav_read.h include/dvdread/nav_print.h -%%PORTDOCS%%share/doc/libdvdread/AUTHORS -%%PORTDOCS%%share/doc/libdvdread/COPYING -%%PORTDOCS%%share/doc/libdvdread/NEWS -%%PORTDOCS%%share/doc/libdvdread/README -%%PORTDOCS%%share/doc/libdvdread/TODO -%%PORTDOCS%%@dirrm share/doc/libdvdread +include/dvdread/cmd_print.h +lib/libdvdread.so.5 +lib/libdvdread.so +lib/libdvdread.la +lib/libdvdread.a +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/dvdread Index: files/extra-patch-dvdread::bswap.h =================================================================== RCS file: files/extra-patch-dvdread::bswap.h diff -N files/extra-patch-dvdread::bswap.h --- files/extra-patch-dvdread::bswap.h 23 Nov 2002 21:12:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- dvdread/bswap.h.orig Sat Nov 23 18:53:53 2002 -+++ dvdread/bswap.h Sat Nov 23 18:57:27 2002 -@@ -54,6 +54,14 @@ - * functionality! - */ - -+#elif defined(__FreeBSD__) -+# define _KERNEL -+# define I486_CPU /* Will crash unless 486+ */ -+# include -+# undef _KERNEL -+# undef I486_CPU -+# define FROM_BE_32(x) (ntohl(x)) -+ - #elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) - #define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ Index: files/patch-dvdread::bswap.h =================================================================== RCS file: files/patch-dvdread::bswap.h diff -N files/patch-dvdread::bswap.h --- files/patch-dvdread::bswap.h 14 Nov 2004 03:54:44 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ ---- dvdread/bswap.h.orig Sat Nov 13 17:18:54 2004 -+++ dvdread/bswap.h Sat Nov 13 18:01:26 2004 -@@ -57,7 +57,19 @@ - #include - #define B2N_16(x) x = be16toh(x) - #define B2N_32(x) x = be32toh(x) -+# if __FreeBSD_version >= 510000 - #define B2N_64(x) x = be64toh(x) -+# else -+#define B2N_64(x) x = \ -+ x = ((((x) & 0xff00000000000000) >> 56) | \ -+ (((x) & 0x00ff000000000000) >> 40) | \ -+ (((x) & 0x0000ff0000000000) >> 24) | \ -+ (((x) & 0x000000ff00000000) >> 8) | \ -+ (((x) & 0x00000000ff000000) << 8) | \ -+ (((x) & 0x0000000000ff0000) << 24) | \ -+ (((x) & 0x000000000000ff00) << 40) | \ -+ (((x) & 0x00000000000000ff) << 56)) -+# endif - - /* This is a slow but portable implementation, it has multiple evaluation - * problems so beware. Index: files/patch-dvdread::dvd_input.c =================================================================== RCS file: files/patch-dvdread::dvd_input.c diff -N files/patch-dvdread::dvd_input.c --- files/patch-dvdread::dvd_input.c 20 Jul 2004 15:05:25 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ ---- dvdread/dvd_input.c.orig Sun Jul 13 14:42:27 2003 -+++ dvdread/dvd_input.c Sun Jul 13 14:42:41 2003 -@@ -297,14 +297,7 @@ - - dvdcss_version = (char **)dlsym(dvdcss_library, U_S "dvdcss_interface_2"); - -- if(dlsym(dvdcss_library, U_S "dvdcss_crack")) { -- fprintf(stderr, -- "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n" -- "libdvdread: You should get the latest version from " -- "http://www.videolan.org/\n" ); -- dlclose(dvdcss_library); -- dvdcss_library = NULL; -- } else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek -+ if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek - || !DVDcss_read || !DVDcss_error || !dvdcss_version) { - fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, " - "this shouldn't happen !\n");