aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/mpeg4ip/Makefile7
-rw-r--r--multimedia/mpeg4ip/distinfo4
-rw-r--r--multimedia/mpeg4ip/files/patch-config.h.in29
3 files changed, 6 insertions, 34 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 3417a2d86c53..546500c23ad5 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mpeg4ip
-PORTVERSION= 0.9.9
-PORTREVISION= 3
+PORTVERSION= 1.0
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -23,7 +22,6 @@ USE_GMAKE= yes
USE_SDL= sdl
USE_LIBTOOL_VER=13
USE_REINPLACE= yes
-USE_SIZE= yes
CONFIGURE_ARGS= --datadir=${DATADIR} \
--with-glib-prefix=${LOCALBASE} \
--with-gtk-prefix=${X11BASE} \
@@ -32,7 +30,10 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
INSTALLS_SHLIB= yes
+CONFLICTS= faad*
+
DOC_FILES= COPYING README doc/MPEG4IP_Guide.pdf
+PORTDOCS= COPYING MPEG4IP_Guide.pdf README
MAN1= gmp4player.1 mp4creator.1 mp4encode.1 mp4live.1
MAN3= MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \
diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo
index c58ea5d42676..fe8cc1caab0a 100644
--- a/multimedia/mpeg4ip/distinfo
+++ b/multimedia/mpeg4ip/distinfo
@@ -1,2 +1,2 @@
-MD5 (mpeg4ip-0.9.9.tar.gz) = d0d189ecbece96fc8b487f9bd67ff388
-SIZE (mpeg4ip-0.9.9.tar.gz) = 5452600
+MD5 (mpeg4ip-1.0.tar.gz) = 6ac635a1dd02d874054d6092f350157c
+SIZE (mpeg4ip-1.0.tar.gz) = 5442521
diff --git a/multimedia/mpeg4ip/files/patch-config.h.in b/multimedia/mpeg4ip/files/patch-config.h.in
index a46de1ffffec..e69de29bb2d1 100644
--- a/multimedia/mpeg4ip/files/patch-config.h.in
+++ b/multimedia/mpeg4ip/files/patch-config.h.in
@@ -1,29 +0,0 @@
-FreeBSD 5 has getopt.h and getopt_long() but they are not fully compatible
-with GNU getopt. Specifically, FreeBSD 5 does not have getopt_long_only().
-So using stock GNU getopt seems simplest way to solve this issue.
-
---- config.h.in.orig Fri Mar 7 04:38:55 2003
-+++ config.h.in Sat Jul 12 08:04:26 2003
-@@ -12,12 +12,6 @@
- /* Define to 1 if you have the `getopt' function. */
- #undef HAVE_GETOPT
-
--/* Define to 1 if you have the <getopt.h> header file. */
--#undef HAVE_GETOPT_H
--
--/* Define to 1 if you have the `getopt_long' function. */
--#undef HAVE_GETOPT_LONG
--
- /* Define to 1 if you have the `getrusage' function. */
- #undef HAVE_GETRUSAGE
-
-@@ -26,9 +20,6 @@
-
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
--
--/* Define to 1 if you have the `gnugetopt' library (-lgnugetopt). */
--#undef HAVE_LIBGNUGETOPT
-
- /* Define to 1 if you have the `sndfile' library (-lsndfile). */
- #undef HAVE_LIBSNDFILE