Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 May 2013 23:48:26 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        jpaetzel@freebsd.org
Subject:   ports/179131: [PATCH] multimedia/subtools: update to 20081026, Convert to OptionsNG
Message-ID:  <20130530214830.09F6B1D7@hub.freebsd.org>
Resent-Message-ID: <201305302150.r4ULo0qq064969@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179131
>Category:       ports
>Synopsis:       [PATCH] multimedia/subtools: update to 20081026, Convert to OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 30 21:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Tue Jan 29 15:02:50 EST 2013
>Description:

- Update to 20081026
- Shorten header
- Convert to OptionsNG
- Cleanup Makefile

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130530203001-59574/

>Fix:

--- subtools-20081026.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/subtools/Makefile ./Makefile
--- /usr/ports/multimedia/subtools/Makefile	2013-01-14 17:54:58.000000000 +0100
+++ ./Makefile	2013-03-29 18:05:31.000000000 +0100
@@ -1,28 +1,32 @@
-# New ports collection makefile for:	subtools
-# Date created:		10 January 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD: head/multimedia/subtools/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	subtools
-PORTVERSION=	20060508
-DISTVERSIONSUFFIX=	alpha
+PORTVERSION=	20081026
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}alpha
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line tools for movie subtitles in SubRipper format
 
-USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
+
+USE_BZIP2=	yes
+USE_PYTHON=	yes
+USE_DOS2UNIX=	*.c *.py ../*.TXT
+
 EXECS=		srtshift srtrate
-PYEXECS=	udvd2srt.py udvdshift.py
-PORTDOCS=	CHANGELOG.TXT LICENSE.TXT README.TXT TODO.TXT
-PLIST_FILES=	${EXECS:S/^/bin\//} ${PYEXECS:S/^/bin\//}
+
+PLIST_FILES=	bin/srtshift bin/srtrate bin/udvd2srt.py bin/udvdshift.py
+
+PORTDOCS=	CHANGELOG.TXT README.TXT
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,
,,g;s,^.*#!.*python.*$$,#!${PYTHON_CMD},' ${WRKSRC}/*
+	@${REINPLACE_CMD} -e 's|^M||g;s|^.*#!.*python.*$$|#!${PYTHON_CMD}|' \
+		${WRKSRC}/*.py
+	@(cd ${WRKSRC} && ${RM} *.py.bak)
 
 do-build:
 .for EXEC in ${EXECS}
@@ -30,11 +34,15 @@
 .endfor
 
 do-install:
-	${INSTALL_PROGRAM} ${EXECS:S/^/${WRKSRC}\//} ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${PYEXECS:S/^/${WRKSRC}\//} ${PREFIX}/bin/
-.ifndef(NOPORTDOCS)
-	${INSTALL} -d ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S/^/${WRKSRC}\//} ${DOCSDIR}/
+.for s in ${EXECS}
+	@(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${s} ${PREFIX}/bin)
+.endfor
+	@(cd ${WRKSRC} && ${INSTALL_SCRIPT} *.py ${PREFIX}/bin)
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/../|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/multimedia/subtools/distinfo ./distinfo
--- /usr/ports/multimedia/subtools/distinfo	2013-01-14 17:54:58.000000000 +0100
+++ ./distinfo	2013-05-30 23:45:08.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (subtools-20060508alpha.tar.gz) = e07dab5951d787ab8d364f8c72d726ddfcfffb660ca3d90e36b23ad0a9a64da5
-SIZE (subtools-20060508alpha.tar.gz) = 94411
+SHA256 (subtools-20081026.tar.bz2) = 373add3a9cb4bfe53144f757f6daaa99d4c6e7731ad513573bccaf0d685eb3c1
+SIZE (subtools-20081026.tar.bz2) = 2112351
--- subtools-20081026.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130530214830.09F6B1D7>