diff options
-rw-r--r-- | MOVED | 1 | ||||
-rw-r--r-- | graphics/Makefile | 1 | ||||
-rw-r--r-- | graphics/xvid/Makefile | 63 | ||||
-rw-r--r-- | graphics/xvid/distinfo | 1 | ||||
-rw-r--r-- | graphics/xvid/files/config.h.in | 14 | ||||
-rw-r--r-- | graphics/xvid/files/configure.in | 12 | ||||
-rw-r--r-- | graphics/xvid/files/patch-src:portab.h | 58 | ||||
-rw-r--r-- | graphics/xvid/pkg-descr | 6 | ||||
-rw-r--r-- | graphics/xvid/pkg-plist | 4 | ||||
-rw-r--r-- | multimedia/Makefile | 1 |
10 files changed, 2 insertions, 159 deletions
@@ -188,3 +188,4 @@ astro/kstars|misc/kdeedu3|2003-03-02|kstars included in kdeedu package devel/ruby-testunit||2003-03-03|integrated into ruby16-shim-ruby18 graphics/qdraw||2003-03-24|obsolete x11-fm/rox-base||2003-03-24|obsolete +graphics/xvid|multimedia/xvid|2003-03-30|new category diff --git a/graphics/Makefile b/graphics/Makefile index 2168cd712551..185989d8f89d 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -446,7 +446,6 @@ SUBDIR += xtheater SUBDIR += xv SUBDIR += xv-m17n - SUBDIR += xvid SUBDIR += xwpick SUBDIR += xzgv SUBDIR += zimg diff --git a/graphics/xvid/Makefile b/graphics/xvid/Makefile deleted file mode 100644 index 22a213df7fd2..000000000000 --- a/graphics/xvid/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# New ports collection makefile for: xvid -# Date created: 04 April 2002 -# Whom: Michael Nottebrock <michaelnottebrock@gmx.net> et al -# -# $FreeBSD$ -# - -PORTNAME= xvid -PORTVERSION= 0.9.0 -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= graphics -MASTER_SITES= http://files.xvid.org/downloads/ -DISTNAME= xvidcore-${PORTVERSION} - -MAINTAINER= michaelnottebrock@gmx.net -COMMENT= An opensource MPEG-4 codec, based on OpenDivx - -BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm - -ONLY_FOR_ARCHS= i386 sparc64 -USE_AUTOCONF_VER= 253 -USE_PERL5_BUILD=yes -USE_GMAKE= yes -INSTALLS_SHLIB= yes -USE_REINPLACE= yes - -CONFIGURE_WRKSRC= ${WRKDIR} -WRKSRC= ${WRKDIR}/${DISTNAME}/build/generic - -# XXX - compatility header installed for mplayer-devel port's benefit -EXTRA_HEADER_FILES= divx4.h - -# trick to detect existence of stdint.h -# amongst other things -pre-configure: -.for file in configure.in config.h.in - @ ${CP} ${FILESDIR}/${file} ${WRKDIR} -.endfor - -post-patch: -.for file in Makefile.linuxx86 Makefile.sparc - ${REINPLACE_CMD} -e 's|-lc||' ${WRKSRC}/$(file) -.endfor - -do-install: - @ ${INSTALL_DATA} ${WRKSRC}/libxvidcore.so ${PREFIX}/lib/libxvidcore.so.0 - @ ${LN} -s libxvidcore.so.0 ${PREFIX}/lib/libxvidcore.so - @ ${INSTALL_DATA} ${WRKSRC}/../../src/xvid.h ${PREFIX}/include -# XXX - compatility header installed for mplayer's benefit -.for header in ${EXTRA_HEADER_FILES} - @ ${INSTALL_DATA} ${WRKSRC}/../../src/${header} ${PREFIX}/include -.endfor - -.include <bsd.port.pre.mk> - -.if ${ARCH:L} == i386 -MAKEFILE= Makefile.linuxx86 -.elif ${ARCH:L} == sparc64 -MAKEFILE= Makefile.sparc -.endif - -.include <bsd.port.post.mk> diff --git a/graphics/xvid/distinfo b/graphics/xvid/distinfo deleted file mode 100644 index ca845674745a..000000000000 --- a/graphics/xvid/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (xvidcore-0.9.0.tar.gz) = 8d0cd15a9d935ec46d3b67eddf188c4a diff --git a/graphics/xvid/files/config.h.in b/graphics/xvid/files/config.h.in deleted file mode 100644 index eb38bce90bde..000000000000 --- a/graphics/xvid/files/config.h.in +++ /dev/null @@ -1,14 +0,0 @@ -/* Define as 1 if you have sys/endian.h. */ -#undef HAVE_SYS_ENDIAN_H - -/* Define as 1 if you have sys/param.h. */ -#undef HAVE_SYS_PARAM_H - -/* Define as 1 if you have stdint.h. */ -#undef HAVE_STDINT_H - -/* Define as 1 if you have inttypes.h. */ -#undef HAVE_INTTYPES_H - -/* Define size of uintptr_t type. */ -#undef SIZEOF_UINTPTR_T diff --git a/graphics/xvid/files/configure.in b/graphics/xvid/files/configure.in deleted file mode 100644 index db732af19e66..000000000000 --- a/graphics/xvid/files/configure.in +++ /dev/null @@ -1,12 +0,0 @@ -dnl Process this file with autoconf to produce a configure header -AC_INIT(config.h.in) - -dnl Check for and header files -AC_CHECK_HEADERS(sys/endian.h sys/param.h stdint.h inttypes.h) - -dnl Check size of pointer for cache size -AC_CHECK_SIZEOF(uintptr_t) - -AC_CONFIG_HEADER([config.h]) - -AC_OUTPUT(config.h) diff --git a/graphics/xvid/files/patch-src:portab.h b/graphics/xvid/files/patch-src:portab.h deleted file mode 100644 index 4879792de98f..000000000000 --- a/graphics/xvid/files/patch-src:portab.h +++ /dev/null @@ -1,58 +0,0 @@ ---- ../../src/portab.h.orig Sat Nov 23 22:50:14 2002 -+++ ../../src/portab.h Fri Jan 3 14:40:18 2003 -@@ -83,6 +83,14 @@ - * Types used in XviD sources - ****************************************************************************/ - -+#if defined(HAVE_SYS_PARAM_H) -+#include <sys/param.h> -+#endif -+ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000 && defined(HAVE_SYS_ENDIAN_H) -+#include <sys/endian.h> -+#endif -+ - /*---------------------------------------------------------------------------- - | Standard Unix include file (sorry, we put all unix into "linux" case) - *---------------------------------------------------------------------------*/ -@@ -90,8 +98,15 @@ - #if defined(LINUX) || defined(BEOS) || defined(FREEBSD) - - /* All (u)int(size)_t types are defined here */ --# include <inttypes.h> - -+#include "../../config.h" -+ -+#if defined(HAVE_STDINT_H) -+#include <stdint.h> -+#elif defined(HAVE_INTTYPES_H) -+#include <inttypes.h> -+#endif -+ - /*---------------------------------------------------------------------------- - | msvc (lacks such a header file) - *---------------------------------------------------------------------------*/ -@@ -139,6 +154,9 @@ - #elif defined(ARCH_IA64) - # define CACHE_LINE 32 - # define ptr_t uint64_t -+#elif defined(__FreeBSD__) -+# define CACHE_LINE (SIZEOF_UINTPTR_T * 4) -+# define ptr_t uintptr_t - #else - # error Architecture not supported. - #endif -@@ -341,6 +359,13 @@ - { - return 0; - } -+ -+/*---------------------------------------------------------------------------- -+ | FreeBSD specific macros/functions -+ *---------------------------------------------------------------------------*/ -+# elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 && defined(HAVE_SYS_ENDIAN_H) -+# define BSWAP(a) (be32toh(x)) -+# error Missing EMMS() definition for this architecture. - - /*---------------------------------------------------------------------------- - | XviD + gcc unsupported Architecture diff --git a/graphics/xvid/pkg-descr b/graphics/xvid/pkg-descr deleted file mode 100644 index f1cbaa81b88c..000000000000 --- a/graphics/xvid/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -An opensource MPEG-4 codec, based on OpenDivx - -WWW: http://www.xvid.org/ - -- Michael Nottebrock -michaelnottebrock@gmx.net diff --git a/graphics/xvid/pkg-plist b/graphics/xvid/pkg-plist deleted file mode 100644 index a9433f44f490..000000000000 --- a/graphics/xvid/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -include/divx4.h -include/xvid.h -lib/libxvidcore.so -lib/libxvidcore.so.0 diff --git a/multimedia/Makefile b/multimedia/Makefile index 9a3fd815c7dc..0af7999b4435 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -58,5 +58,6 @@ SUBDIR += xmms-avi SUBDIR += xmps-opendivx-plugin SUBDIR += xmps-win32-plugin + SUBDIR += xvid .include <bsd.port.subdir.mk> |