diff options
author | Alexander Langer <alex@FreeBSD.org> | 2000-06-28 13:34:38 +0000 |
---|---|---|
committer | Alexander Langer <alex@FreeBSD.org> | 2000-06-28 13:34:38 +0000 |
commit | 0d731daf26f42272f5017a8ed13501bc198f0e02 (patch) | |
tree | 457342d7af8a5dc19d254f34faa577333abf5607 /multimedia/mpegedit | |
parent | 880e802fac49f014716bdaf7218e0f77d629af04 (diff) | |
download | ports-0d731daf26f42272f5017a8ed13501bc198f0e02.tar.gz ports-0d731daf26f42272f5017a8ed13501bc198f0e02.zip |
- Support CC/CXX/CFLAGS/CXXFLAGS/MAKE properly
- Support NOPORTDOCS
- Remove USE_GMAKE
- Add WWW: line into pkg/DESCR
- Add pnm.1 LIB_DEPENDS
PR: 19344
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=29938
Diffstat (limited to 'multimedia/mpegedit')
-rw-r--r-- | multimedia/mpegedit/Makefile | 20 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-aj | 79 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-ar | 58 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-as | 10 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-at | 11 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-au | 42 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-av | 11 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-aw | 11 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-ax | 11 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-ay | 26 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-az | 39 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-ba | 42 | ||||
-rw-r--r-- | multimedia/mpegedit/files/patch-bb | 33 | ||||
-rw-r--r-- | multimedia/mpegedit/pkg-descr | 2 |
14 files changed, 356 insertions, 39 deletions
diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile index 1449155ff478..26dba411b0f9 100644 --- a/multimedia/mpegedit/Makefile +++ b/multimedia/mpegedit/Makefile @@ -1,6 +1,6 @@ -# New ports collection makefile for: mpegedit -# Date created: Thu Aug 1 10:50:57 CDT 1996 -# Whom: erich@FreeBSD.org +# New ports collection makefile for: mpegedit +# Date created: Thu Aug 1 10:50:57 CDT 1996 +# Whom: erich@FreeBSD.org # # $FreeBSD$ # @@ -13,9 +13,19 @@ DISTNAME= ${PORTNAME}_v${PORTVERSION} MAINTAINER= ports@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/include/pbmplus.h:${PORTSDIR}/graphics/netpbm +LIB_DEPENDS= pnm.1:${PORTSDIR}/graphics/netpbm USE_X_PREFIX= yes -USE_GMAKE= yes + +post-extract: + @find ${WRKSRC} -name '.depend' | xargs ${RM} -f + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/mpeg_edit ${PREFIX}/bin +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/mpeg_edit + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mpeg_edit + ${INSTALL_DATA} ${WRKSRC}/manual.ps ${PREFIX}/share/doc/mpeg_edit +.endif .include <bsd.port.mk> diff --git a/multimedia/mpegedit/files/patch-aj b/multimedia/mpegedit/files/patch-aj index 817fa6897b42..99b05d98e172 100644 --- a/multimedia/mpegedit/files/patch-aj +++ b/multimedia/mpegedit/files/patch-aj @@ -1,31 +1,26 @@ ---- Makefile.orig Sun Jul 23 11:00:40 1995 -+++ Makefile Sun Oct 11 23:07:08 1998 -@@ -23,17 +23,17 @@ +--- Makefile.orig Mon Jul 24 01:00:40 1995 ++++ Makefile Thu Jun 15 08:53:48 2000 +@@ -23,8 +23,8 @@ # # Mr A S R Ashley B.Eng (Hons) 23rd July 1995 - CC = gcc - CPP = g++ -- RM = rm -f -+CC = gcc -O -I$(X11BASE)/include -+CPP = g++ -O -I$(X11BASE)/include -+RM = rm -f ++# CC = gcc ++ CPP = ${CXX} + RM = rm -f DEPFILE = Dependancies -- SUBDIRS = ui MpegCodec editor xuseless -+SUBDIRS = ui MpegCodec editor xuseless - HEADERS = --SOURCES = main.C globals/version.c --OBJS = main.o globals/version.o -+SOURCES = main.C globals/version.c -+OBJS = main.o globals/version.o +@@ -33,7 +33,7 @@ + SOURCES = main.C globals/version.c + OBJS = main.o globals/version.o ARCHIVES = editor/editor.a ui/ui.a MpegCodec/mpeg.a - LIBS = -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm + LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm # # CPPFLAGS -Wall all warnings # -pipe speeds up compilation (remove only if not using g++) -@@ -55,9 +55,9 @@ +@@ -55,11 +55,11 @@ # PBMDIR The location of the pbmplus header files, which is # /usr/include/gr on my Linux machine. @@ -33,38 +28,37 @@ +PBMDIR = $(LOCALBASE)/include INCLUDES = -Iglobals -Iui -IMpegCodec -IMpegCodec/decoder \ - -IMpegCodec/encoder -Ieditor -+ -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include - CPPFLAGS = -Wall -pipe -O4 - CFLAGS = -Wall -pipe -O4 +-CPPFLAGS = -Wall -pipe -O4 +-CFLAGS = -Wall -pipe -O4 ++ -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include ++CPPFLAGS = ${CXXFLAGS} ++#CFLAGS = -Wall -pipe -O4 SHMEM = -DSH_MEM -@@ -70,22 +70,27 @@ + CACHE_FLAGS = -DCACHE_SIZE=12288 -DCACHE_GRANULARITY=5 + +@@ -70,22 +70,22 @@ all: mpeg_edit -ui.a: -+install: -+ install -cs mpeg_edit $(PREFIX)/bin -+ mkdir -p $(PREFIX)/share/doc/mpeg_edit -+ install -c -m 644 README manual.ps $(PREFIX)/share/doc/mpeg_edit -+ +- cd ui && make ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ +ui/ui.a: - cd ui && make ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ ++ cd ui && $(MAKE) ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ CFLAGS="$(CFLAGS)" && cd .. -- + -mpeg.a: -+ +- cd MpegCodec && make mpeg.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ +MpegCodec/mpeg.a: - cd MpegCodec && make mpeg.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ ++ cd MpegCodec && $(MAKE) mpeg.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ CFLAGS="$(CFLAGS)" CACHE_FLAGS="$(CACHE_FLAGS)" && cd .. -- + -editor.a: -+ +- cd editor && make editor.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ +editor/editor.a: - cd editor && make editor.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ ++ cd editor && $(MAKE) editor.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ CFLAGS="$(CFLAGS)" SHMEM="$(SHMEM)" PBMDIR="$(PBMDIR)" && cd .. -- + -mpeg_edit: ui.a mpeg.a editor.a $(DEPFILE) $(OBJS) -+ +mpeg_edit: $(ARCHIVES) $(DEPFILE) $(OBJS) $(CPP) -o mpeg_edit $(OBJS) $(ARCHIVES) $(LIBS) @@ -73,7 +67,24 @@ $(CPP) -o ppmtorle ppmtorle.o MpegCodec/frame.o editor/yuv.o $(LIBS) globals/version.o: $(ARCHIVES) -@@ -107,10 +112,10 @@ +@@ -93,24 +93,24 @@ + + clean: + $(RM) mpeg_edit main.o globals/version.o +- set -e; for i in $(SUBDIRS); do cd $$i && make clean && cd .. ; done ++ set -e; for i in $(SUBDIRS); do cd $$i && $(MAKE) clean && cd .. ; done + + dep: FORCE +- set -e; for i in $(SUBDIRS) ; do cd $$i && make dep EXTRA="$(EXTRA)" \ ++ set -e; for i in $(SUBDIRS) ; do cd $$i && $(MAKE) dep EXTRA="$(EXTRA)" \ + CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" SHMEM="$(SHMEM)" \ + PBMDIR="$(PBMDIR)" && cd .. ; done + $(RM) $(DEPFILE) +- make $(DEPFILE) ++ $(MAKE) $(DEPFILE) + + FORCE: + $(DEPFILE): set -e; for i in $(SOURCES) ; do $(CPP) $(INCLUDES) -M $$i >>$(DEPFILE) ; done diff --git a/multimedia/mpegedit/files/patch-ar b/multimedia/mpegedit/files/patch-ar new file mode 100644 index 000000000000..0ce818430deb --- /dev/null +++ b/multimedia/mpegedit/files/patch-ar @@ -0,0 +1,58 @@ +--- MpegCodec/Makefile.orig Mon Jul 24 00:03:22 1995 ++++ MpegCodec/Makefile Thu Jun 15 09:01:03 2000 +@@ -25,12 +25,12 @@ + # + + AR = ar r +-CC = gcc +-CPP = g++ ++#CC = gcc ++CPP = ${CXX} + RM = rm -f + RANLIB = ranlib + +-INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder ++INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -I$(X11BASE)/include + DEPFILE = Dependancies + SUBDIRS = decoder encoder + HEADERS = bstream.H frame.H mpeg.H +@@ -48,32 +48,32 @@ + + force: + $(RM) mpeg.a +- make mpeg.a ++ $(MAKE) mpeg.a + + mpeg.a: $(DEPFILE) $(OBJS) + $(RM) $@ + $(AR) $@ $(OBJS) +- set -e; for i in $(SUBDIRS); do cd $$i && make ar CFLAGS="$(CFLAGS)" ; cd ..; done ++ set -e; for i in $(SUBDIRS); do cd $$i && $(MAKE) ar CFLAGS="$(CFLAGS)" ; cd ..; done + $(RANLIB) $@ + + clean: +- set -e; for i in $(SUBDIRS); do cd $$i && make clean && cd ..; done ++ set -e; for i in $(SUBDIRS); do cd $$i && $(MAKE) clean && cd ..; done + rm -f mpeg.a $(OBJS) $(DEPFILE) + + FORCE: + + + dep: FORCE +- set -e; for i in $(SUBDIRS); do cd $$i && make dep && cd ..; done ++ set -e; for i in $(SUBDIRS); do cd $$i && $(MAKE) dep && cd ..; done + $(RM) $(DEPFILE) +- make $(DEPFILE) ++ $(MAKE) $(DEPFILE) + + $(DEPFILE): + set -e; for i in $(SOURCES) ; do $(CC) $(INCLUDES) -M $$i >>$(DEPFILE) ; done +- ++ + # + # include a dependency file if one exists + # + #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) +-include $(DEPFILE) ++#include $(DEPFILE) + #endif diff --git a/multimedia/mpegedit/files/patch-as b/multimedia/mpegedit/files/patch-as new file mode 100644 index 000000000000..ee6461c1fc6e --- /dev/null +++ b/multimedia/mpegedit/files/patch-as @@ -0,0 +1,10 @@ +--- MpegCodec/frame.C.orig Sun May 21 02:14:48 1995 ++++ MpegCodec/frame.C Thu Jun 15 08:37:49 2000 +@@ -25,6 +25,7 @@ + #include "frame.H" + #include <string.h> + #include <iostream.h> ++#include <sys/param.h> + + #ifndef NO_INET + #include <netinet/in.h> diff --git a/multimedia/mpegedit/files/patch-at b/multimedia/mpegedit/files/patch-at new file mode 100644 index 000000000000..8098b8055d2f --- /dev/null +++ b/multimedia/mpegedit/files/patch-at @@ -0,0 +1,11 @@ +--- MpegCodec/mpeg.C.orig Sun May 21 04:19:44 1995 ++++ MpegCodec/mpeg.C Thu Jun 15 08:37:49 2000 +@@ -890,7 +890,7 @@ + * + *-------------------------------------------------------------- + */ +-Mpeg::status Mpeg::Insert(int no_of_frames, const frame **f_array) ++Mpeg::status Mpeg::Insert(int no_of_frames, frame **f_array) + { + Fstruct Fs; + TempFrame TF; diff --git a/multimedia/mpegedit/files/patch-au b/multimedia/mpegedit/files/patch-au new file mode 100644 index 000000000000..f514b164212e --- /dev/null +++ b/multimedia/mpegedit/files/patch-au @@ -0,0 +1,42 @@ +--- MpegCodec/decoder/Makefile.orig Sun Jul 23 17:03:05 1995 ++++ MpegCodec/decoder/Makefile Wed Jun 28 15:18:39 2000 +@@ -27,9 +27,10 @@ + + AR = ar r + RM = rm -f +-CC = gcc +-CPP = g++ ++#CC = gcc ++CPP = ${CXX} + RANLIB = ranlib ++INCLUDES = -I$(X11BASE)/include + DEPFILE = Dependencies + CCOPTIMISATIONS = -O6 -funroll-loops -fomit-frame-pointer + ANALYSIS = -DANALYSIS +@@ -43,7 +44,7 @@ + ALL = ar + + .c.o: +- $(CC) $(CFLAGS) $(DEFINES) $(EXTRA) -c $< ++ $(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) $(EXTRA) -c $< + + all: $(ALL) + +@@ -58,14 +59,14 @@ + + dep: FORCE + $(RM) $(DEPFILE) +- make $(DEPFILE) ++ $(MAKE) $(DEPFILE) + + $(DEPFILE): +- set -e; for i in $(SOURCES); do $(CC) -M $$i >>$(DEPFILE); done ++ set -e; for i in $(SOURCES); do $(CC) $(INCLUDES) -M $$i >>$(DEPFILE); done + + # + # include a dependency file if one exists + # + #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) +-include $(DEPFILE) ++#include $(DEPFILE) + #endif diff --git a/multimedia/mpegedit/files/patch-av b/multimedia/mpegedit/files/patch-av new file mode 100644 index 000000000000..9f66335dc847 --- /dev/null +++ b/multimedia/mpegedit/files/patch-av @@ -0,0 +1,11 @@ +--- MpegCodec/decoder/huffman.c.orig Mon Aug 15 00:08:13 1994 ++++ MpegCodec/decoder/huffman.c Thu Jun 15 08:37:50 2000 +@@ -31,7 +31,7 @@ + #include "huffman.h" + #include "util.h" + #include "dmpeg.h" +-#include "proto.h" ++/* #include "proto.h" */ + + /* Decoding table for macroblock_address_increment */ + mb_addr_inc_entry mb_addr_inc[2048]; diff --git a/multimedia/mpegedit/files/patch-aw b/multimedia/mpegedit/files/patch-aw new file mode 100644 index 000000000000..4b9dce1ff50c --- /dev/null +++ b/multimedia/mpegedit/files/patch-aw @@ -0,0 +1,11 @@ +--- MpegCodec/decoder/jrevdct.c.orig Mon Aug 15 00:13:39 1994 ++++ MpegCodec/decoder/jrevdct.c Thu Jun 15 08:37:50 2000 +@@ -28,7 +28,7 @@ + + #include <string.h> + #include "dmpeg.h" +-#include "proto.h" ++/* #include "proto.h" */ + + #define GLOBAL /* a function referenced thru EXTERNs */ + diff --git a/multimedia/mpegedit/files/patch-ax b/multimedia/mpegedit/files/patch-ax new file mode 100644 index 000000000000..5580a00b4afe --- /dev/null +++ b/multimedia/mpegedit/files/patch-ax @@ -0,0 +1,11 @@ +--- MpegCodec/decoder/motionvector.c.orig Mon Aug 15 00:12:03 1994 ++++ MpegCodec/decoder/motionvector.c Thu Jun 15 08:37:50 2000 +@@ -19,7 +19,7 @@ + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + #include "dmpeg.h" +-#include "proto.h" ++/* #include "proto.h" */ + #include "util.h" + + diff --git a/multimedia/mpegedit/files/patch-ay b/multimedia/mpegedit/files/patch-ay new file mode 100644 index 000000000000..07b62a2016ac --- /dev/null +++ b/multimedia/mpegedit/files/patch-ay @@ -0,0 +1,26 @@ +--- MpegCodec/encoder/Makefile.orig Mon Jul 24 00:03:48 1995 ++++ MpegCodec/encoder/Makefile Thu Jun 15 08:56:34 2000 +@@ -26,8 +26,8 @@ + + AR = ar r + RM = rm -f +-CC = gcc +-CPP = g++ ++#CC = gcc ++CPP = ${CXX} + DEPFILE = Dependencies + CCOPTIMISATIONS = -O6 -funroll-loops -fomit-frame-pointer + +@@ -73,10 +73,10 @@ + + $(DEPFILE): + set -e; for i in $(SOURCES); do $(CC) -M $$i $(DEFINES) >>$(DEPFILE); done +- ++ + # + # include a dependency file if one exists + # + #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) +-include $(DEPFILE) ++#include $(DEPFILE) + #endif diff --git a/multimedia/mpegedit/files/patch-az b/multimedia/mpegedit/files/patch-az new file mode 100644 index 000000000000..a0a3117b1d5f --- /dev/null +++ b/multimedia/mpegedit/files/patch-az @@ -0,0 +1,39 @@ +--- editor/Makefile.orig Mon Jul 24 00:01:16 1995 ++++ editor/Makefile Thu Jun 15 09:02:18 2000 +@@ -25,12 +25,12 @@ + # Mr A S R Ashley B.Eng (Hons) 23rd July 1995 + + AR = ar r +-CC = gcc +-CPP = g++ ++#CC = gcc ++CPP = ${CXX} + RANLIB = ranlib + RM = rm -f + INCLUDES = -I../globals -I../ui -I../MpegCodec -I../MpegCodec/decoder \ +- -I../MpegCodec/encoder -I$(PBMDIR) ++ -I../MpegCodec/encoder -I$(PBMDIR) -I$(X11BASE)/include + + DEPFILE = Dependancies + HEADERS = yuv.H 2x2_window.H mono_window.H bw_window.H effects.H \ +@@ -62,17 +62,17 @@ + + dep: FORCE + $(RM) $(DEPFILE) +- make $(DEPFILE) ++ $(MAKE) $(DEPFILE) + + FORCE: + + + $(DEPFILE): + set -e; for i in $(SOURCES) ; do $(CC) $(INCLUDES) -M $$i >>$(DEPFILE) ; done +- ++ + # + # include a dependency file if one exists + # + #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) +-include $(DEPFILE) ++#include $(DEPFILE) + #endif diff --git a/multimedia/mpegedit/files/patch-ba b/multimedia/mpegedit/files/patch-ba new file mode 100644 index 000000000000..041f337d9935 --- /dev/null +++ b/multimedia/mpegedit/files/patch-ba @@ -0,0 +1,42 @@ +--- ui/Makefile.orig Mon Jul 24 00:01:36 1995 ++++ ui/Makefile Thu Jun 15 09:04:16 2000 +@@ -26,9 +26,10 @@ + # + + AR = ar r +-CPP = g++ ++CPP = ${CXX} + RANLIB = ranlib + RM = rm -f ++INCLUDES = -I../globals -I$(X11BASE)/include + + # CPPFLAGS -Wall all warnings + # -pipe speeds up compilation (remove only if not using g++) +@@ -48,7 +49,7 @@ + .SUFFIXES: .C $(SUFFIXES) + + .C.o: +- $(CPP) $(CPPFLAGS) $(EXTRA) -I../globals -c $< ++ $(CPP) $(CPPFLAGS) $(INCLUDES) $(EXTRA) -c $< + + all: $(ALL) + +@@ -65,14 +66,14 @@ + + dep: FORCE + $(RM) $(DEPFILE) +- make $(DEPFILE) ++ $(MAKE) $(DEPFILE) + + $(DEPFILE): +- set -e; for i in $(SOURCES) ; do $(CPP) -M $$i -I../globals >>$(DEPFILE) ; done +- ++ set -e; for i in $(SOURCES) ; do $(CPP) $(INCLUDES) -M $$i >>$(DEPFILE) ; done ++ + # + # include a dependency file if one exists + # + #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) +-include $(DEPFILE) ++#include $(DEPFILE) + #endif diff --git a/multimedia/mpegedit/files/patch-bb b/multimedia/mpegedit/files/patch-bb new file mode 100644 index 000000000000..01c44c3e83c8 --- /dev/null +++ b/multimedia/mpegedit/files/patch-bb @@ -0,0 +1,33 @@ +--- ui/text_win.C.orig Sun Jun 18 19:56:57 1995 ++++ ui/text_win.C Thu Jun 15 08:37:50 2000 +@@ -17,6 +17,7 @@ + */ + + #include "text_win.H" ++#include <sys/time.h> + #include <assert.h> + #include <stdlib.h> + +@@ -407,14 +408,22 @@ + long time_elapsed; + long speed; + ++#ifdef __FreeBSD__ ++ gettimeofday(&clk,(struct timezone *)NULL); ++#else + gettimeofday(&clk,(timezone *)NULL); ++#endif + time_elapsed = (clk.tv_sec - last_click.tv_sec)*100; + time_elapsed+=(clk.tv_usec - last_click.tv_usec)/10000; + speed = atol(click_speed); + if((time_elapsed<speed) && (callback!=NULL)) + retval = (*(callback))(callback_data); + } ++#ifdef __FreeBSD__ ++ gettimeofday(&last_click,(struct timezone *)NULL); ++#else + gettimeofday(&last_click,(timezone *)NULL); ++#endif + text.inverse=true; + TList.Write(text); + if(!SendEventFlag) diff --git a/multimedia/mpegedit/pkg-descr b/multimedia/mpegedit/pkg-descr index f25cbbf23e67..49b1677787f4 100644 --- a/multimedia/mpegedit/pkg-descr +++ b/multimedia/mpegedit/pkg-descr @@ -4,5 +4,7 @@ encoded mpeg video stream. The program has several bugs, but I've been able to use it. Expect core-dumps. It has problems with displays >8 bits too. +WWW: http://www.ripley.demon.co.uk/mpeg/index.html + eric. erich@FreeBSD.org |