Date: Fri, 20 Oct 2000 19:51:11 -0500 (CDT) From: ishmael27@home.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/22171: Update port: mpeg_encode Message-ID: <200010210051.e9L0pBw29175@babylon.merseine.nu>
next in thread | raw e-mail | index | archive | help
>Number: 22171
>Category: ports
>Synopsis: Update port: mpeg_encode
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 20 17:50:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Norris
>Release: FreeBSD 4.1.1-STABLE i386
>Organization:
>Environment:
FreeBSD babylon.merseine.nu 4.1.1-STABLE i386
>Description:
Update port graphics/mpeg_encode. The included patch does the following:
Make port respect CC and CFLAGS.
Divdes files/patch-aa into 3 different files, thus making it compliant with the
porter's handbook.
Removes unneeded dependancy upon gmake.
Does general clean-up of the Makefile itself.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/mpeg_encode/Makefile mpeg_encode/Makefile
--- /usr/ports/graphics/mpeg_encode/Makefile Sun Apr 23 17:59:31 2000
+++ mpeg_encode/Makefile Fri Oct 20 19:38:53 2000
@@ -13,11 +13,19 @@
MAINTAINER= ports@FreeBSD.org
-USE_GMAKE= yes
MAN1= mpeg_encode.1
-MANCOMPRESSED= yes
-WRKSRC= ${WRKDIR}/mpeg_encode
+WRKSRC= ${WRKDIR}/${PORTNAME}
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/mpeg_encode ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/docs/mpeg_encode.1 ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+.for i in users-guide.ps template.param
+ ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${PREFIX}/share/doc/${PORTNAME}
+.endfor
+.endif
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/mpeg_encode/files/patch-aa mpeg_encode/files/patch-aa
--- /usr/ports/graphics/mpeg_encode/files/patch-aa Thu Aug 1 15:04:37 1996
+++ mpeg_encode/files/patch-aa Fri Oct 20 19:11:27 2000
@@ -13,31 +13,3 @@
#if !defined(sco) && !defined(sgi) && !defined(IRIX)
extern char* malloc();
#endif
---- ./libpnmrw.c~ Thu Aug 1 08:52:14 1996
-+++ ./libpnmrw.c Thu Aug 1 08:51:26 1996
-@@ -126,7 +126,9 @@
- pm_perror( reason )
- char* reason;
- {
-+#ifndef __FreeBSD__
- extern char* sys_errlist[];
-+#endif
- extern int errno;
- char* e;
-
---- Makefile~ Wed Aug 16 17:16:56 1995
-+++ Makefile Thu Aug 1 09:00:04 1996
-@@ -182,6 +182,13 @@
-
- all: mpeg_encode
-
-+install:
-+ install -c mpeg_encode ${PREFIX}/bin
-+ install -c -m 644 mpeg_encode.1 ${PREFIX}/man/man1
-+ gzip -9nf ${PREFIX}/man/man1/mpeg_encode.1
-+ mkdir -p ${PREFIX}/share/doc/mpeg_encode
-+ install -c docs/users-guide.ps docs/template.param ${PREFIX}/share/doc/mpeg_encode
-+
- #########
- # TESTS #
- #########
diff -urN /usr/ports/graphics/mpeg_encode/files/patch-ab mpeg_encode/files/patch-ab
--- /usr/ports/graphics/mpeg_encode/files/patch-ab Wed Dec 31 18:00:00 1969
+++ mpeg_encode/files/patch-ab Fri Oct 20 19:11:27 2000
@@ -0,0 +1,11 @@
+--- ./libpnmrw.c~ Thu Aug 1 08:52:14 1996
++++ ./libpnmrw.c Thu Aug 1 08:51:26 1996
+@@ -126,7 +126,9 @@
+ pm_perror( reason )
+ char* reason;
+ {
++#ifndef __FreeBSD__
+ extern char* sys_errlist[];
++#endif
+ extern int errno;
+ char* e;
diff -urN /usr/ports/graphics/mpeg_encode/files/patch-ac mpeg_encode/files/patch-ac
--- /usr/ports/graphics/mpeg_encode/files/patch-ac Wed Dec 31 18:00:00 1969
+++ mpeg_encode/files/patch-ac Fri Oct 20 19:36:42 2000
@@ -0,0 +1,20 @@
+--- Makefile~ Wed Aug 16 17:16:56 1995
++++ Makefile Fri Oct 20 19:20:05 2000
+@@ -68,7 +68,7 @@
+ #####################################################################
+ # COMPILER # specify compiler; should be ANSI-compliant if possible #
+ #####################################################################
+-CC = gcc
++CC ?= gcc
+
+ ################################################
+ # MAKE # command to use for the "make" command #
+@@ -96,7 +96,7 @@
+ #
+
+ # gcc
+-CFLAGS = $(INCLUDEDIR) $(DEBUGFLAG) -Wall -Wmissing-prototypes $(PROFLAG) $(PROTOFLAG)
++CFLAGS += $(INCLUDEDIR) -Wall -Wmissing-prototypes $(PROFLAG) $(PROTOFLAG)
+
+ # gcc-strict
+ #CFLAGS = $(INCLUDEDIR) $(DEBUGFLAG) -pedantic -Wall -Waggregate-return -Wtraditional -Wshadow -Wpointer-arith -Wno-parentheses -Wwrite-strings -Wconversion -Wcast-qual -Wcast-align -Wnested-externs -Wuninitialized -Wmissing-prototypes $(PROFLAG) $(PROTOFLAG)
diff -urN /usr/ports/graphics/mpeg_encode/files/patch-ad mpeg_encode/files/patch-ad
--- /usr/ports/graphics/mpeg_encode/files/patch-ad Wed Dec 31 18:00:00 1969
+++ mpeg_encode/files/patch-ad Fri Oct 20 19:11:27 2000
@@ -0,0 +1,15 @@
+--- jpeg/Makefile.orig Fri Aug 4 18:27:00 1995
++++ jpeg/Makefile Fri Oct 20 19:05:22 2000
+@@ -21,10 +21,10 @@
+ manext = 1
+
+ # The name of your C compiler:
+-CC= gcc
++CC?= gcc
+
+ # You may need to adjust these cc options:
+-CFLAGS= -O -I$(srcdir)
++CFLAGS+= -I$(srcdir)
+ # Generally, we recommend defining any configuration symbols in jconfig.h,
+ # NOT via -D switches here.
+ # However, any special defines for ansi2knr.c may be included here:
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200010210051.e9L0pBw29175>