svn commit: r349268 - in head/multimedia/dv2jpg: . files

[Rusmir Dusko]

Author: nemysis
Date: Wed Mar 26 17:15:26 2014
New Revision: 349268
URL: http://svnweb.freebsd.org/changeset/ports/349268
QAT: https://qat.redports.org/buildarchive/r349268/

Log:
  - Bump PORTREVISION
  - Add license (GPLv2)
  - Use the new format for LIB_DEPENDS
  - Comply with OptionsNG
  - Use PLIST_FILES instead of pkg-plist
  - Support STAGEDIR
  - Simplify DOCS installation handling and add Option
  - Add OPTIONS_SINGLE=VIDEO-FORMAT and NTSC, PAL SINGLE Options,
    and REINPLACE
  - Use files/makefile instead of files/patch-makefile and REINPLACE
  - Add REINPLACE instead of simple patch
  
  PR:		ports/179154
  Submitted by:	nemysis (self)

Added:
  head/multimedia/dv2jpg/files/makefile   (contents, props changed)
Deleted:
  head/multimedia/dv2jpg/files/patch-avijoin.c
  head/multimedia/dv2jpg/files/patch-makefile
  head/multimedia/dv2jpg/pkg-plist
Modified:
  head/multimedia/dv2jpg/Makefile

Modified: head/multimedia/dv2jpg/Makefile
==============================================================================
--- head/multimedia/dv2jpg/Makefile	Wed Mar 26 16:54:29 2014	(r349267)
+++ head/multimedia/dv2jpg/Makefile	Wed Mar 26 17:15:26 2014	(r349268)
@@ -3,45 +3,55 @@
 
 PORTNAME=	dv2jpg
 PORTVERSION=	1.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Convert Type-2 DV codec-encoded AVI streams to mjpeg-encoded AVI
 
-LIB_DEPENDS=	dv.4:${PORTSDIR}/multimedia/libdv
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libdv.so:${PORTSDIR}/multimedia/libdv
 
 USE_GNOME=	gdkpixbuf
 MAKEFILE=	makefile
 
-.if defined(WITH_PAL_VIDEO)
-VID_FORMAT=	PAL
-.else
-VID_FORMAT=	NTSC
-.endif
+PLIST_FILES=	bin/avijoin bin/dv2jpg
+
+PORTDOCS=	README.avilib README.dv2jpg.html
+OPTIONS_DEFINE=	DOCS
+
+OPTIONS_SINGLE=	VIDEO-FORMAT
+OPTIONS_SINGLE_VIDEO-FORMAT=	NTSC PAL
+OPTIONS_DEFAULT=	NTSC
+
+VIDEO-FORMAT_DESC=	Use default video format
+NTSC_DESC=	Default video format NTSC
+PAL_DESC=	Default video format PAL
 
-NO_STAGE=	yes
-pre-everything::
-	@${ECHO_MSG} "===> The default video format is NTSC"
-	@${ECHO_MSG} "===> You can change this to PAL by defining"
-	@${ECHO_MSG} "===> WITH_PAL_VIDEO"
+.include <bsd.port.options.mk>
 
 post-extract:
+	${INSTALL_DATA} ${FILESDIR}/makefile ${WRKSRC}
 	${RM} ${WRKSRC}/avijoin ${WRKSRC}/dv2jpg ${WRKSRC}/*.o
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%VID_FORMAT%%|${VID_FORMAT}|' \
+	@${REINPLACE_CMD} -e 's|/opt/vidpb/lib/avilib.h|avilib.h|' \
+		${WRKSRC}/avijoin.c
+
+.if ${PORT_OPTIONS:MPAL}
+	@${REINPLACE_CMD} -e 's|VIDEO=NTSC|# VIDEO=NTSC|; \
+		s|# VIDEO=PAL|VIDEO=PAL|' \
 		${WRKSRC}/${MAKEFILE}
+.endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/avijoin ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/dv2jpg ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in README.avilib	README.dv2jpg.html
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.for f in avijoin dv2jpg
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${f} ${STAGEDIR}${PREFIX}/bin/)
 .endfor
-.endif
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/multimedia/dv2jpg/files/makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/dv2jpg/files/makefile	Wed Mar 26 17:15:26 2014	(r349268)
@@ -0,0 +1,27 @@
+
+INC=`${GDK_PIXBUF_CONFIG} --cflags` -I${PREFIX}/include/libdv
+LIBS=-ljpeg -lm -ldv `${GDK_PIXBUF_CONFIG} --libs` -L${LOCALBASE}/lib
+
+# what type of video do you want?
+VIDEO=NTSC
+# VIDEO=PAL
+
+all: dv2jpg avijoin
+	
+dv2jpg: dv2jpg.o avilib.o dvavilib.o
+	$(CC) $(CFLAGS) -o dv2jpg dv2jpg.o avilib.o dvavilib.o $(LIBS) $(LDFLAGS)
+
+dv2jpg.o: dv2jpg.c
+	$(CC) $(CFLAGS) $(INC) -D$(VIDEO) -c dv2jpg.c
+
+avilib.o: avilib.c
+	$(CC) $(CFLAGS) -c avilib.c
+
+dvavilib.o: dvavilib.c
+	$(CC) $(CFLAGS) -c dvavilib.c
+
+clean: 
+	/bin/rm -f *.o dv2jpg core avijoin
+
+avijoin: avijoin.c avilib.o
+	$(CC) $(CFLAGS) -o avijoin avijoin.c avilib.o $(LDFLAGS)