- Trim Makefile headers

- Drop ABI versions from LIB_DEPENDS
- OptionsNG
- Pet portlint
- Switch to dynamic plist where useful
- Canonicalize patch names
- Fix DOS line endings in patch files

5 files changed, 46 insertions, 45 deletions

diff --git a/multimedia/avbin/Makefile b/multimedia/avbin/Makefile
index bdec0656330..f20d2ebacff 100644
--- a/multimedia/avbin/Makefile
+++ b/multimedia/avbin/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	FFmpeg wrapper
 
-LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	avcodec:${PORTSDIR}/multimedia/ffmpeg
 
 LIBNAME=	libavbin.so.${PORTVERSION}
 PLIST_FILES=	lib/${LIBNAME} include/avbin.h
diff --git a/multimedia/avbin/pkg-descr b/multimedia/avbin/pkg-descr
index 68c4bdd5ac0..bfa526b48d2 100644
--- a/multimedia/avbin/pkg-descr
+++ b/multimedia/avbin/pkg-descr
@@ -1,4 +1,4 @@
 AVbin is a thin wrapper around FFmpeg, providing binary compatibility
 for applications and languages that need it
 
-WWW:	http://code.google.com/p/avbin/
+WWW: http://code.google.com/p/avbin/
diff --git a/multimedia/avinfo/Makefile b/multimedia/avinfo/Makefile
index 4fbdedc18d1..1d587f286d8 100644
--- a/multimedia/avinfo/Makefile
+++ b/multimedia/avinfo/Makefile
@@ -22,6 +22,8 @@ PORTDOCS=	*
 
 MAN1=		avinfo.1
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^CC=/ d; /^CFLAGS=/ d; /^PREFIX=/ d' \
 		${WRKSRC}/config.mk
@@ -31,7 +33,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/avinfo ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/src/avinfo.1 ${MANPREFIX}/man/man1/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README \
 		${WRKSRC}/copying ${WRKSRC}/doc/* ${DOCSDIR}/
diff --git a/multimedia/openmovieeditor/Makefile b/multimedia/openmovieeditor/Makefile
index cd7ccfbc16f..d0e7114c317 100644
--- a/multimedia/openmovieeditor/Makefile
+++ b/multimedia/openmovieeditor/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openmovieeditor
-# Date created:		20 Sep 2007
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	openmovieeditor
 PORTVERSION=	0.0.20090105
@@ -14,16 +10,16 @@ MASTER_SITES=	SF
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple non-linear movie editor
 
-LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		gavl.1:${PORTSDIR}/multimedia/gavl \
-		gmerlin_avdec.1:${PORTSDIR}/multimedia/gmerlin-avdecoder \
-		gmerlin.0:${PORTSDIR}/multimedia/gmerlin \
-		quicktime.0:${PORTSDIR}/multimedia/libquicktime \
-		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		jack.0:${PORTSDIR}/audio/jack \
-		fltk.1:${PORTSDIR}/x11-toolkits/fltk \
-		portaudio.2:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
+		sndfile:${PORTSDIR}/audio/libsndfile \
+		gavl:${PORTSDIR}/multimedia/gavl \
+		gmerlin_avdec:${PORTSDIR}/multimedia/gmerlin-avdecoder \
+		gmerlin:${PORTSDIR}/multimedia/gmerlin \
+		quicktime:${PORTSDIR}/multimedia/libquicktime \
+		avcodec:${PORTSDIR}/multimedia/ffmpeg \
+		jack:${PORTSDIR}/audio/jack \
+		fltk:${PORTSDIR}/x11-toolkits/fltk \
+		portaudio:${PORTSDIR}/audio/portaudio2
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpeg3.a:${PORTSDIR}/multimedia/libmpeg3 \
 		${LOCALBASE}/lib/libquicktime/lqt_lame.so:${PORTSDIR}/multimedia/libquicktime-lame
 RUN_DEPENDS=	${LOCALBASE}/lib/libquicktime/lqt_lame.so:${PORTSDIR}/multimedia/libquicktime-lame
@@ -34,11 +30,14 @@ USE_GL=		yes
 USE_GNOME=	glib20
 CONFIGURE_ARGS=	CPPFLAGS="-I${WRKSRC}/src/tinyxml -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib `fltk-config --ldflags`"
+USE_DOS2UNIX=	yes
 
 PORTDOCS=	*
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/tutorial.html ${DOCSDIR}
diff --git a/multimedia/openmovieeditor/files/patch-src-Fl_Split.cpp b/multimedia/openmovieeditor/files/patch-src-Fl__Split.cpp
index e88665cd63b..9a2c56c80eb 100644
--- a/multimedia/openmovieeditor/files/patch-src-Fl_Split.cpp
+++ b/multimedia/openmovieeditor/files/patch-src-Fl__Split.cpp
@@ -1,31 +1,31 @@
 --- src/Fl_Split.cpp.orig	2008-03-26 11:16:57.000000000 +0300
 +++ src/Fl_Split.cpp	2012-02-14 10:49:26.565769160 +0400
 @@ -38,7 +38,7 @@
- 

- void Fl_Split::position(int oix, int oiy, int newx, int newy) {

-   Fl_Widget*const* a = array();

--  short* p = sizes();

-+  int* p = sizes();

-   p += 8; // skip group & resizable's saved size

-   for (int i=children(); i--; p += 4) {

-     Fl_Widget* o = *a++;

+ 
+ void Fl_Split::position(int oix, int oiy, int newx, int newy) {
+   Fl_Widget*const* a = array();
+-  short* p = sizes();
++  int* p = sizes();
+   p += 8; // skip group & resizable's saved size
+   for (int i=children(); i--; p += 4) {
+     Fl_Widget* o = *a++;
 @@ -88,7 +88,7 @@
- 	  return;

-   }

- 

--  short* p = sizes();

-+  int* p = sizes();

-   // resize this (skip the Fl_Group resize):

-   Fl_Widget::resize(X,Y,W,H);

- 

+ 	  return;
+   }
+ 
+-  short* p = sizes();
++  int* p = sizes();
+   // resize this (skip the Fl_Group resize):
+   Fl_Widget::resize(X,Y,W,H);
+ 
 @@ -155,8 +155,8 @@
- 		  int oldx = 0;

- 		  int oldy = 0;

- 		  Fl_Widget*const* a = array();

--		  short* q = sizes();

--		  short* p = q+8;

-+		  int* q = sizes();

-+		  int* p = q+8;

- 		  //printf("cursor(%d,%d)\n", mx,my);

- 		  for (int i=children(); i--; p += 4) {

- 			  Fl_Widget* o = *a++;

+ 		  int oldx = 0;
+ 		  int oldy = 0;
+ 		  Fl_Widget*const* a = array();
+-		  short* q = sizes();
+-		  short* p = q+8;
++		  int* q = sizes();
++		  int* p = q+8;
+ 		  //printf("cursor(%d,%d)\n", mx,my);
+ 		  for (int i=children(); i--; p += 4) {
+ 			  Fl_Widget* o = *a++;