Index: head/graphics/mpeg_encode/Makefile
===================================================================
--- head/graphics/mpeg_encode/Makefile	(revision 34353)
+++ head/graphics/mpeg_encode/Makefile	(revision 34354)
@@ -1,23 +1,31 @@
 # New ports collection makefile for:    mpeg_encode
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mpeg_encode
 PORTVERSION=	1.5b
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/encode/
 DISTNAME=	${PKGNAME}-src
 
 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>

Property changes on: head/graphics/mpeg_encode/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/graphics/mpeg_encode/files/patch-aa
===================================================================
--- head/graphics/mpeg_encode/files/patch-aa	(revision 34353)
+++ head/graphics/mpeg_encode/files/patch-aa	(revision 34354)
@@ -1,43 +1,15 @@
 --- ./headers/libpnmrw.h~	Thu Aug  1 08:52:25 1996
 +++ ./headers/libpnmrw.h	Thu Aug  1 08:51:16 1996
 @@ -19,7 +19,12 @@
  ** malloc.h at all.  A sad situation.  If you have compilation problems
  ** that point here, feel free to tweak or remove these declarations.
  */
 +#ifdef __FreeBSD__
 +#include <stdlib.h>
 +#else
  #include <malloc.h>
 +#endif
 +
  #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 #
- #########

Property changes on: head/graphics/mpeg_encode/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/graphics/mpeg_encode/files/patch-ab
===================================================================
--- head/graphics/mpeg_encode/files/patch-ab	(nonexistent)
+++ head/graphics/mpeg_encode/files/patch-ab	(revision 34354)
@@ -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;

Property changes on: head/graphics/mpeg_encode/files/patch-ab
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/mpeg_encode/files/patch-ac
===================================================================
--- head/graphics/mpeg_encode/files/patch-ac	(nonexistent)
+++ head/graphics/mpeg_encode/files/patch-ac	(revision 34354)
@@ -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)

Property changes on: head/graphics/mpeg_encode/files/patch-ac
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/mpeg_encode/files/patch-ad
===================================================================
--- head/graphics/mpeg_encode/files/patch-ad	(nonexistent)
+++ head/graphics/mpeg_encode/files/patch-ad	(revision 34354)
@@ -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:

Property changes on: head/graphics/mpeg_encode/files/patch-ad
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/multimedia/mpeg_encode/Makefile
===================================================================
--- head/multimedia/mpeg_encode/Makefile	(revision 34353)
+++ head/multimedia/mpeg_encode/Makefile	(revision 34354)
@@ -1,23 +1,31 @@
 # New ports collection makefile for:    mpeg_encode
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mpeg_encode
 PORTVERSION=	1.5b
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/encode/
 DISTNAME=	${PKGNAME}-src
 
 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>

Property changes on: head/multimedia/mpeg_encode/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/multimedia/mpeg_encode/files/patch-aa
===================================================================
--- head/multimedia/mpeg_encode/files/patch-aa	(revision 34353)
+++ head/multimedia/mpeg_encode/files/patch-aa	(revision 34354)
@@ -1,43 +1,15 @@
 --- ./headers/libpnmrw.h~	Thu Aug  1 08:52:25 1996
 +++ ./headers/libpnmrw.h	Thu Aug  1 08:51:16 1996
 @@ -19,7 +19,12 @@
  ** malloc.h at all.  A sad situation.  If you have compilation problems
  ** that point here, feel free to tweak or remove these declarations.
  */
 +#ifdef __FreeBSD__
 +#include <stdlib.h>
 +#else
  #include <malloc.h>
 +#endif
 +
  #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 #
- #########

Property changes on: head/multimedia/mpeg_encode/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/multimedia/mpeg_encode/files/patch-ab
===================================================================
--- head/multimedia/mpeg_encode/files/patch-ab	(nonexistent)
+++ head/multimedia/mpeg_encode/files/patch-ab	(revision 34354)
@@ -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;

Property changes on: head/multimedia/mpeg_encode/files/patch-ab
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/multimedia/mpeg_encode/files/patch-ac
===================================================================
--- head/multimedia/mpeg_encode/files/patch-ac	(nonexistent)
+++ head/multimedia/mpeg_encode/files/patch-ac	(revision 34354)
@@ -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)

Property changes on: head/multimedia/mpeg_encode/files/patch-ac
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/multimedia/mpeg_encode/files/patch-ad
===================================================================
--- head/multimedia/mpeg_encode/files/patch-ad	(nonexistent)
+++ head/multimedia/mpeg_encode/files/patch-ad	(revision 34354)
@@ -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:

Property changes on: head/multimedia/mpeg_encode/files/patch-ad
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property