Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 May 2008 22:12:27 GMT
From:      bf <bf2006a@yahoo.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/123533: [PATCH] print/latexdiff: update to 0.5
Message-ID:  <200805082212.m48MCRe7025790@www.freebsd.org>
Resent-Message-ID: <200805082220.m48MK1CX069935@freefall.freebsd.org>

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

>Number:         123533
>Category:       ports
>Synopsis:       [PATCH] print/latexdiff: update to 0.5
>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 08 22:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        7-STABLE i386
>Organization:
-
>Environment:
>Description:
I'm not quite sure why the updates to this distfile didn't cause fetch problems, but perhaps some of the CTAN mirrors are far, far out-of-date.  In addition to those changes that reflect changes in the port, I installed an additional useful bash script, which is why I also added bash to the runtime dependencies.  If that's considered undesirable, it can simply be removed from RUN_DEPENDS, in which case all but one of the scripts will work just fine.  I bypassed the bundled makefile entirely for the install target, which was easier than making a big patch for it, as had been done in the past.


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN latexdiff.orig/Makefile latexdiff/Makefile
--- latexdiff.orig/Makefile	2008-02-21 00:13:02.000000000 -0500
+++ latexdiff/Makefile	2008-05-07 14:26:24.935469894 -0400
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	latexdiff
-PORTVERSION=	0.3
-CATEGORIES=	print
+PORTVERSION=	0.5
+CATEGORIES=	print perl5
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support
 DISTNAME=	${PORTNAME}
@@ -15,20 +15,37 @@
 MAINTAINER=	Zeliboba@mail.ru
 COMMENT=	Determine and mark up significant differences between latex files
 
-USE_PERL5_RUN=	yes
+RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+		bash:${PORTSDIR}/shells/bash
 
-USE_GMAKE=	no
+USE_PERL5_RUN=	yes
 USE_ZIP=	yes
+NO_BUILD=	yes
 
 MAN1=		latexdiff.1 \
+		latexdiff-vc.1 \
 		latexrevise.1
 
 PLIST_FILES=	bin/latexdiff \
-		bin/latexdiff-cvs \
+		bin/latexdiff-fast \
 		bin/latexdiff-so \
+		bin/latexdiff-vc \
+		bin/latexdiff-wrap \
 		bin/latexrevise
 
-do-build:
-# empty
+post-patch:
+	${REINPLACE_CMD} -e "s,\/bin\/bash,${LOCALBASE}\/bin\/bash," \
+	${WRKSRC}/contrib/latexdiff-wrap
+
+do-install:
+	${MKDIR} ${PREFIX}/bin ${MANPREFIX}/man/man1
+	( cd ${WRKSRC} && ${INSTALL_SCRIPT} latexdiff-fast latexdiff-so \
+	latexdiff-vc latexrevise contrib/latexdiff-wrap ${PREFIX}/bin && \
+	${INSTALL_MAN} latexdiff.1 latexdiff-vc.1 latexrevise.1 \
+	${MANPREFIX}/man/man1 )
+	${LN} -s ${PREFIX}/bin/latexdiff-so ${PREFIX}/bin/latexdiff
+
+test:
+	( cd ${WRKSRC} && ${MAKE} test-so test-fast )
 
 .include <bsd.port.mk>
diff -ruN latexdiff.orig/distinfo latexdiff/distinfo
--- latexdiff.orig/distinfo	2008-02-21 00:13:02.000000000 -0500
+++ latexdiff/distinfo	2008-05-07 13:13:56.662442177 -0400
@@ -1,3 +1,3 @@
-MD5 (latexdiff.zip) = 955a9738995c874f31aaf6bc0fda6882
-SHA256 (latexdiff.zip) = 12d1265634bf609d2878cd6502e262e69dc18f6d907a979c4bb10af678290613
-SIZE (latexdiff.zip) = 291781
+MD5 (latexdiff.zip) = 70fdec50c25c5807e7ec071b88d4af49
+SHA256 (latexdiff.zip) = 7a99ac274c7552b1acf617d27866b40573469acafde0fb680231e58b2e08ddcf
+SIZE (latexdiff.zip) = 310412
diff -ruN latexdiff.orig/files/patch-Makefile latexdiff/files/patch-Makefile
--- latexdiff.orig/files/patch-Makefile	2008-02-21 00:13:02.000000000 -0500
+++ latexdiff/files/patch-Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,49 +0,0 @@
---- Makefile.orig	Tue Oct  4 04:36:54 2005
-+++ Makefile	Fri Nov 11 15:00:19 2005
-@@ -2,7 +2,7 @@
- # For the current setting you will need root permission but 
- # it is perfectly acceptable to choose user directories 
- #
--INSTALLPATH = /usr/local
-+INSTALLPATH = ${PREFIX}
- INSTALLMANPATH = $(INSTALLPATH)/man
- INSTALLEXECPATH = $(INSTALLPATH)/bin
- 
-@@ -15,28 +15,31 @@
- 	@echo "To install the version which uses the system Algorithm::Diff package type: make install-ext"
- 	@echo " "
- 
-+dirs:
-+	mkdir -p $(INSTALLMANPATH)/man1 $(INSTALLEXECPATH)
-+
- install: install-so
- 
- install-ext: install-latexdiff install-latexrevise install-latexdiff-cvs install-man
- 
--install-so: install-latexdiff-so install-latexrevise install-latexdiff-cvs install-man
-+install-so: dirs install-latexdiff-so install-latexrevise install-latexdiff-cvs install-man
- 
- install-man:
--	install latexrevise.1 latexdiff.1 $(INSTALLMANPATH)/man1
-+	${BSD_INSTALL_MAN} latexrevise.1 latexdiff.1 $(INSTALLMANPATH)/man1
- 
- install-latexdiff:
--	install latexdiff $(INSTALLEXECPATH)
-+	${BSD_INSTALL_SCRIPT} latexdiff $(INSTALLEXECPATH)
- 
- install-latexdiff-so:
- 	if [ -e $(INSTALLEXECPATH)/latexdiff ]; then rm $(INSTALLEXECPATH)/latexdiff; fi
--	install latexdiff-so $(INSTALLEXECPATH)
-+	${BSD_INSTALL_SCRIPT} latexdiff-so $(INSTALLEXECPATH)
- 	cd $(INSTALLEXECPATH); ln -s latexdiff-so latexdiff
- 
- install-latexrevise:
--	install latexrevise $(INSTALLEXECPATH)
-+	${BSD_INSTALL_SCRIPT} latexrevise $(INSTALLEXECPATH)
- 
- install-latexdiff-cvs:
--	install latexdiff-cvs $(INSTALLEXECPATH)
-+	${BSD_INSTALL_SCRIPT} latexdiff-cvs $(INSTALLEXECPATH)
- 
- test: test-so
- 
diff -ruN latexdiff.orig/pkg-descr latexdiff/pkg-descr
--- latexdiff.orig/pkg-descr	2008-02-21 00:13:02.000000000 -0500
+++ latexdiff/pkg-descr	2008-05-07 14:37:19.100935896 -0400
@@ -1,6 +1,7 @@
-latexdiff is a Perl script, which compares two latex files and marks
+latexdiff is a Perl script that compares two latex files and marks
 up significant differences between them (i.e. a diff for latex files).
-  Various options are available for visual markup using standard latex
+
+Various options are available for visual markup using standard latex
 packages such as "color.sty". Changes not directly affecting visible
 text, for example in formatting commands, are still marked in
 the latex source.
@@ -8,4 +9,6 @@
 A rudimentary revision facilility is provided by another Perl script,
 latexrevise, which accepts or rejects all changes.  Manual
 editing of the difference file can be used to override this default
-behaviour and accept or reject selected changes only.
+behaviour and accept or reject selected changes only. There are also
+scripts to handle multiple-file documents, and files under version
+control.


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



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