From bb021c281aa1d30495f023196684ea5970341b94 Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Mon, 20 May 2002 23:30:54 +0000 Subject: Update to 0.1.3 --- multimedia/libmovtar/Makefile | 11 +++++++++-- multimedia/libmovtar/distinfo | 3 +-- multimedia/libmovtar/files/patch-Makefile.in | 15 --------------- multimedia/libmovtar/files/patch-configure.in | 24 ------------------------ multimedia/libmovtar/files/patch-movtar.c | 10 ---------- multimedia/libmovtar/files/patch-movtar_play.c | 13 ------------- multimedia/libmovtar/files/patch-tar.c | 10 ---------- multimedia/libmovtar/pkg-plist | 2 ++ 8 files changed, 12 insertions(+), 76 deletions(-) delete mode 100644 multimedia/libmovtar/files/patch-Makefile.in delete mode 100644 multimedia/libmovtar/files/patch-configure.in delete mode 100644 multimedia/libmovtar/files/patch-movtar.c delete mode 100644 multimedia/libmovtar/files/patch-movtar_play.c delete mode 100644 multimedia/libmovtar/files/patch-tar.c (limited to 'multimedia/libmovtar') diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile index 8919ed57517c..13f32bb4bfd0 100644 --- a/multimedia/libmovtar/Makefile +++ b/multimedia/libmovtar/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libmovtar -PORTVERSION= 0.1.2 +PORTVERSION= 0.1.3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mjpeg @@ -17,7 +17,6 @@ LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12 \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_GTK= yes -USE_AUTOCONF= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-m4data-prefix=${PREFIX}/share @@ -28,4 +27,12 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +post-patch: + @${PERL} -pi -e 's|SDL/|SDL11/|' \ + ${WRKSRC}/rtjpeg/rtjshow.c \ + ${WRKSRC}/movtar_play.c + @${PERL} -pi -e 's|^(LIBS="-ljpeg )|\1 -L${LOCALBASE}/lib|; \ + s|(LIBS -ljpeg)"|\1 -L${LOCALBASE}/lib"|' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + .include diff --git a/multimedia/libmovtar/distinfo b/multimedia/libmovtar/distinfo index 701869069113..0634b8d5c7c6 100644 --- a/multimedia/libmovtar/distinfo +++ b/multimedia/libmovtar/distinfo @@ -1,2 +1 @@ -MD5 (libmovtar-0.1.2.tar.gz) = 852566413e625bb2b089db72a5fabce9 -MD5 (jpeg-mmx-1.1.2.tar.gz) = 63d871b28cb1524b4cf088155688778d +MD5 (libmovtar-0.1.3.tar.gz) = 3810ba83a90c52676014ab1ea6d8cd9f diff --git a/multimedia/libmovtar/files/patch-Makefile.in b/multimedia/libmovtar/files/patch-Makefile.in deleted file mode 100644 index 47614fcf64f4..000000000000 --- a/multimedia/libmovtar/files/patch-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in.orig Fri Nov 16 01:35:11 2001 -+++ Makefile.in Fri Nov 16 01:35:38 2001 -@@ -79,10 +79,10 @@ - bin_SCRIPTS = movtar-config - lib_LIBRARIES = libmovtar.a - libmovtar_a_SOURCES = movtar.c tar.c --INCLUDES = @GLIB_CFLAGS@ @JPEG_INCLUDE@ -+INCLUDES = @GLIB_CFLAGS@ @JPEG_INCLUDE@ -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` ${PTHREAD_CFLAGS} - include_HEADERS = movtar.h - --movtar_play_LDFLAGS = -lSDL -lpthread -ljpeg -+movtar_play_LDFLAGS = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS} -ljpeg - movtar_unify_LDFLAGS = -ljpeg - movtar_yuv422_LDFLAGS = -ljpeg - LDFLAGS = @GLIB_LIBS@ diff --git a/multimedia/libmovtar/files/patch-configure.in b/multimedia/libmovtar/files/patch-configure.in deleted file mode 100644 index ead3cafc9502..000000000000 --- a/multimedia/libmovtar/files/patch-configure.in +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.in.orig Wed Feb 7 09:25:06 2001 -+++ configure.in Tue Oct 16 02:23:14 2001 -@@ -56,7 +56,7 @@ - JPEGDIR="$DEFAULT_JPEGDIR") - - OLDLIBS="$LIBS" --LIBS="-L $JPEGDIR $LIBS" -+LIBS="-L $JPEGDIR $LIBS -L$LOCALBASE/lib" - AC_SUBST(JPEG_INCLUDE) - - AC_CHECK_LIB( jpeg-mmx, jpeg_start_compress, -@@ -75,10 +75,11 @@ - dnl If that can't be found fall back to the system jpeg lib... - if test ${have_jpeg} = "no" - then -+LIBS="$LIBS -L$LOCALBASE/lib" - AC_CHECK_LIB( jpeg, jpeg_start_compress, - [ - have_jpeg="yes" -- LIBS="$LIBS -ljpeg" -+ LIBS="$LIBS -L$LOCALBASE/lib -ljpeg" - ], - [ - have_jpeg="no" diff --git a/multimedia/libmovtar/files/patch-movtar.c b/multimedia/libmovtar/files/patch-movtar.c deleted file mode 100644 index 1905b8670e80..000000000000 --- a/multimedia/libmovtar/files/patch-movtar.c +++ /dev/null @@ -1,10 +0,0 @@ ---- movtar.c.orig Tue Oct 16 00:02:46 2001 -+++ movtar.c Tue Oct 16 00:03:25 2001 -@@ -40,7 +40,6 @@ - #include - #include - #include --#include - - #include "movtar.h" - diff --git a/multimedia/libmovtar/files/patch-movtar_play.c b/multimedia/libmovtar/files/patch-movtar_play.c deleted file mode 100644 index 35dd50aadfff..000000000000 --- a/multimedia/libmovtar/files/patch-movtar_play.c +++ /dev/null @@ -1,13 +0,0 @@ ---- movtar_play.c.orig Tue Oct 16 00:22:46 2001 -+++ movtar_play.c Tue Oct 16 00:25:12 2001 -@@ -9,8 +9,8 @@ - #include - #include - --#include --#include -+#include -+#include - - #define JPEG_INTERNALS - #include diff --git a/multimedia/libmovtar/files/patch-tar.c b/multimedia/libmovtar/files/patch-tar.c deleted file mode 100644 index 3943c45f165f..000000000000 --- a/multimedia/libmovtar/files/patch-tar.c +++ /dev/null @@ -1,10 +0,0 @@ ---- tar.c.orig Tue Oct 16 00:03:05 2001 -+++ tar.c Tue Oct 16 00:03:09 2001 -@@ -16,7 +16,6 @@ - #include - - #include --#include - - #include "movtar.h" - diff --git a/multimedia/libmovtar/pkg-plist b/multimedia/libmovtar/pkg-plist index c155a907d3ab..3f5456d231c3 100644 --- a/multimedia/libmovtar/pkg-plist +++ b/multimedia/libmovtar/pkg-plist @@ -5,6 +5,8 @@ bin/movtar_setinfo bin/movtar_split bin/movtar_unify bin/movtar_yuv422 +bin/pnm2rtj +bin/rtjshow include/movtar.h lib/libmovtar.a share/aclocal/movtar.m4 -- cgit v1.2.3