Attachment 98076 Details for Bug 136914 – bmeps-2.1.2.diff

[patch] bmeps-2.1.2.diff

bmeps-2.1.2.diff (text/plain), 10.88 KB, created by Charlie Kester on 2009-07-20 00:20:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Kester

Created: 2009-07-20 00:20:04 UTC

Size: 10.88 KB

patch

obsolete

>diff -ruN /usr/ports/graphics/bmeps/Makefile ./bmeps/Makefile
>--- /usr/ports/graphics/bmeps/Makefile	2009-07-07 20:43:36.000000000 -0700
>+++ ./bmeps/Makefile	2009-07-18 19:25:29.000000000 -0700
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	bmeps
>-PORTVERSION=	1.2.5
>+PORTVERSION=	2.1.2
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -14,42 +14,31 @@
> MAINTAINER=	corky1951@comcast.net
> COMMENT=	Convert bitmap images (PNG/JPEG/NetPBM) to EPS
> 
>-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
>-		jpeg.9:${PORTSDIR}/graphics/jpeg \
>-		netpbm.1:${PORTSDIR}/graphics/netpbm
>+LIB_DEPENDS=	dkbif.1:${PORTSDIR}/devel/dklibs
>+
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>+		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
> 
>-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include"
> GNU_CONFIGURE=	yes
>-WRKSRC=		${WRKDIR}/${PORTNAME}
> 
>-MAN1=		bmeps.1
>+MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
> 
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/bmeps ${PREFIX}/bin
>-	${INSTALL_DATA} ${WRKSRC}/bmeps.h ${PREFIX}/include
>-	${INSTALL_DATA} ${WRKSRC}/bmepsoe.h ${PREFIX}/include
>-	${INSTALL_DATA} ${WRKSRC}/jpgeps.h ${PREFIX}/include
>-	${INSTALL_DATA} ${WRKSRC}/pngeps.h ${PREFIX}/include
>-	${INSTALL_DATA} ${WRKSRC}/pnmeps.h ${PREFIX}/include
>-	${INSTALL_DATA} ${WRKSRC}/libbmeps.a ${PREFIX}/lib
>-	${INSTALL_MAN} ${WRKSRC}/man/man1/bmeps.1 ${PREFIX}/man/man1
>+.if !defined(NO_INSTALL_MANPAGES)
>+MAN1=		bmeps.1
>+.endif
> 
> post-install:
>+.if !defined(NO_INSTALL_MANPAGES)
>+	${MKDIR} ${MAN1PREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1 ${MANPREFIX}/man/man1
>+.endif
>+
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>+	${MKDIR} ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/DOCU/*.css ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/DOCU/*.html ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/DOCU/*.pdf ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/DOCU/*.png ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/DOCU/*.tex ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/DOCU/*.txt ${DOCSDIR}
>-	@${MKDIR} ${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/DOCU/EXAMPLES/*.bb ${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/DOCU/EXAMPLES/*.jpg ${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/DOCU/EXAMPLES/*.ps ${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/DOCU/EXAMPLES/*.tex ${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/DOCU/EXAMPLES/*.txt ${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/DOCU/*.html ${DOCSDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/graphics/bmeps/distinfo ./bmeps/distinfo
>--- /usr/ports/graphics/bmeps/distinfo	2006-01-22 04:34:44.000000000 -0800
>+++ ./bmeps/distinfo	2009-07-18 13:36:10.000000000 -0700
>@@ -1,3 +1,3 @@
>-MD5 (bmeps-1.2.5.tar.gz) = 4f5512be8d0ddceb3d708e15c1db7da2
>-SHA256 (bmeps-1.2.5.tar.gz) = 83b8c47aeef9dcdf123246eba4f5650f6cd4bc14d078d475a8456083b9bf38d1
>-SIZE (bmeps-1.2.5.tar.gz) = 1593971
>+MD5 (bmeps-2.1.2.tar.gz) = f2d12a4c275bbb4d6a052dc68d484fd9
>+SHA256 (bmeps-2.1.2.tar.gz) = 277e335e717b78bb19f73266daaa22e5a99fb5c342b4a890efde9b0598890f1b
>+SIZE (bmeps-2.1.2.tar.gz) = 9176031
>diff -ruN /usr/ports/graphics/bmeps/files/patch-Makefile.in ./bmeps/files/patch-Makefile.in
>--- /usr/ports/graphics/bmeps/files/patch-Makefile.in	1969-12-31 16:00:00.000000000 -0800
>+++ ./bmeps/files/patch-Makefile.in	2009-07-18 13:36:21.000000000 -0700
>@@ -0,0 +1,53 @@
>+--- Makefile.in.orig	2009-04-15 02:55:36.000000000 -0700
>++++ Makefile.in	2009-07-16 18:48:51.000000000 -0700
>+@@ -28,18 +28,12 @@
>+ 
>+ all:	bmeps
>+ 	-[ -d lib ] || mkdir -p lib
>+-	-[ -d share/doc/bmeps ] || mkdir -p share/doc/bmeps
>+ 	-[ -d share/bmeps ] || mkdir -p share/bmeps
>+-	-(cd DOCU; tar cf - .) | (cd share/doc/bmeps; tar xf -)
>+ 	stc bmeps.str share/bmeps
>+ 	find lib -type d -exec chmod 755 {} \;
>+ 	find lib -type f -exec chmod 644 {} \;
>+ 	find share -type d -exec chmod 755 {} \;
>+ 	find share -type f -exec chmod 644 {} \;
>+-	find Java/doc -type d -exec chmod ugo+rx {} \;
>+-	find Java/doc -type f -exec chmod ugo+r {} \;
>+-	chmod 755 bmepsgui.jar
>+-	chmod 755 bmeps-gui
>+ 	touch all
>+ 	./transform-mkpdfsls ${PERL} ${datadir}
>+ 
>+@@ -52,31 +46,15 @@
>+ 	-chmod 755 $(pp)$(incdir)
>+ 	-[ -d $(pp)$(datadir) ] || mkdir -p $(pp)$(datadir)
>+ 	-chmod 755 $(pp)$(datadir)
>+-	-[ -d $(pp)$(datadir)/doc ] || mkdir -p $(pp)$(datadir)/doc
>+-	-chmod 755 $(pp)$(datadir)/doc
>+-	-[ -d $(pp)$(datadir)/doc/javadoc ] || mkdir -p $(pp)$(datadir)/doc/javadoc
>+-	-chmod 755 $(pp)$(datadir)/doc/javadoc
>+-	-[ -d $(pp)$(datadir)/doc/javadoc/BmepsGUI ] || mkdir -p $(pp)$(datadir)/doc/javadoc/BmepsGUI
>+-	chmod 755 $(pp)$(datadir)/doc/javadoc/BmepsGUI
>+ 	cp bmeps  $(pp)$(bindir)/bmeps
>+ 	chmod 755 $(pp)$(bindir)/bmeps
>+ 	cp mkpdfsls.pl $(pp)$(bindir)/mkpdfsls.pl
>+ 	chmod 755 $(pp)$(bindir)/mkpdfsls.pl
>+-	cp bmepsgui.jar $(pp)$(bindir)/bmepsgui.jar
>+-	chmod 755 $(pp)$(bindir)/bmepsgui.jar
>+-	cp bmeps-gui $(pp)$(bindir)/bmeps-gui
>+-	chmod 755 $(pp)$(bindir)/bmeps-gui
>+ 	cp libbmeps.a $(pp)$(libdir)/libbmeps.a
>+ 	chmod 644 $(pp)$(libdir)/libbmeps.a
>+ 	cp bmeps.h $(pp)$(incdir)/bmeps.h
>+ 	chmod 644 $(pp)$(incdir)/bmeps.h
>+ 	-(cd share; tar cf - ./*) | (cd $(pp)$(datadir) ; tar xf -)
>+-	-(cd Java/doc; tar cf - .) | (cd $(pp)$(datadir)/doc/javadoc/BmepsGUI; tar xf -)
>+-	-[ -d $(pp)$(mandir)/man1 ] || mkdir -p $(pp)$(mandir)/man1
>+-	-chmod 755 $(pp)$(mandir)/man1
>+-	cp man/man1/bmeps.1 $(pp)$(mandir)/man1/bmeps.1
>+-	chmod 644 $(pp)$(mandir)/man1/bmeps.1
>+-	@echo Documentation resides in $(pp)$(datadir)/doc/bmeps.
>+ 
>+ # IMGLIBS= -lpnm -lppm -lpgm -lpbm @LIBJPG@ @LIBPNG@
>+ IMGLIBS= @BIFLIBS@
>diff -ruN /usr/ports/graphics/bmeps/files/patch-aa ./bmeps/files/patch-aa
>--- /usr/ports/graphics/bmeps/files/patch-aa	2005-05-24 09:12:43.000000000 -0700
>+++ ./bmeps/files/patch-aa	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	Mon Apr  4 09:28:15 2005
>-+++ Makefile.in	Wed May 18 07:33:32 2005
>-@@ -21,7 +21,7 @@
>- DEFS=		@DEFS@
>- 
>- COMPILEC=	$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(VERSNO)
>--
>-+LDFLAGS=	-L@libdir@
>- LINK=		$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) -L. $(LDFLAGS) -o $@
>- MKSO=		$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(VERSNO) -shared
>- 
>diff -ruN /usr/ports/graphics/bmeps/pkg-descr ./bmeps/pkg-descr
>--- /usr/ports/graphics/bmeps/pkg-descr	2004-05-29 09:49:46.000000000 -0700
>+++ ./bmeps/pkg-descr	2009-07-19 15:52:14.000000000 -0700
>@@ -1,13 +1,16 @@
>-The bmeps package contains a command line program and a library to
>-convert bitmap image files (PNG/JPEG/NetPBM) to EPS. EPS level 1, 2
>-and 3 can be used.
>+The bmeps package contains a command line program and a library to convert
>+bitmap image files (PNG/JPEG/NetPBM) to EPS or PDF and produces bounding box
>+files for use with LaTeX. 
>+
>+The program produces EPS level 1, 2 and 3 and PDF level 1.2, 1.3 and 1.4.
> 
> Depending on the EPS level there are different compression and encoding
> algorithms available: 
> 
>-  _ run-length-compression (2 and above)
>-  _ flate compression (3 and above)
>-  _ ASCII-85-encoding instead of ASCII-Hex (2 and above)
>+  _ ASCII-Hex encoding
>+  _ ASCII-85-encoding (requires PS level 2)
>+  _ DCT-pass-through of JPEG files (requires PS level 2)
>+  _ flate compression (requires PS level 3)
> 
> The program is intended to be used with LaTeX/dvips or other DTP software
> accepting EPS graphics.
>diff -ruN /usr/ports/graphics/bmeps/pkg-plist ./bmeps/pkg-plist
>--- /usr/ports/graphics/bmeps/pkg-plist	2005-05-24 09:12:42.000000000 -0700
>+++ ./bmeps/pkg-plist	2009-07-19 12:06:28.000000000 -0700
>@@ -1,50 +1,71 @@
> bin/bmeps
>+bin/mkpdfsls.pl
> include/bmeps.h
>-include/bmepsoe.h
>-include/jpgeps.h
>-include/pngeps.h
>-include/pnmeps.h
> lib/libbmeps.a
>-%%PORTDOCS%%%%DOCSDIR%%/1g.png
>-%%PORTDOCS%%%%DOCSDIR%%/2c8r.png
>-%%PORTDOCS%%%%DOCSDIR%%/2g8r.png
>-%%PORTDOCS%%%%DOCSDIR%%/3c8rf.png
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/bg3c8rf.png
>-%%PORTDOCS%%%%DOCSDIR%%/bg3c8rfa.png
>-%%PORTDOCS%%%%DOCSDIR%%/bg3c8rfam.png
>-%%PORTDOCS%%%%DOCSDIR%%/bg3c8rfams0_255_255.png
>+%%DATADIR%%/en/bmeps.txt
>+%%DATADIR%%/en/utf-8/bmeps.stt.bz2
>+%%DATADIR%%/en/bmeps.stt.bz2
>+%%DATADIR%%/de/bmeps.txt
>+%%DATADIR%%/de/utf-8/bmeps.stt.bz2
>+%%DATADIR%%/de/bmeps.stt.bz2
> %%PORTDOCS%%%%DOCSDIR%%/bmeps.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/bmeps.tex
>+%%PORTDOCS%%%%DOCSDIR%%/bmepsde.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/bmlogo.png
>+%%PORTDOCS%%%%DOCSDIR%%/bt6.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/bt7.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/bt9.pdf
> %%PORTDOCS%%%%DOCSDIR%%/changes.html
>-%%PORTDOCS%%%%DOCSDIR%%/d.png
>+%%PORTDOCS%%%%DOCSDIR%%/compression.png
>+%%PORTDOCS%%%%DOCSDIR%%/ex.html
>+%%PORTDOCS%%%%DOCSDIR%%/examples.html
> %%PORTDOCS%%%%DOCSDIR%%/faq.html
>+%%PORTDOCS%%%%DOCSDIR%%/fbt-multi.html
>+%%PORTDOCS%%%%DOCSDIR%%/fbt.png
>+%%PORTDOCS%%%%DOCSDIR%%/gui.html
> %%PORTDOCS%%%%DOCSDIR%%/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/inst_w32.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/inst_w32.tex
> %%PORTDOCS%%%%DOCSDIR%%/install.html
>-%%PORTDOCS%%%%DOCSDIR%%/ntmak.txt
>-%%PORTDOCS%%%%DOCSDIR%%/projbody.txt
>+%%PORTDOCS%%%%DOCSDIR%%/mkpdfsls.html
> %%PORTDOCS%%%%DOCSDIR%%/projects.html
>-%%PORTDOCS%%%%DOCSDIR%%/projfoot.txt
>-%%PORTDOCS%%%%DOCSDIR%%/projhead.txt
>+%%PORTDOCS%%%%DOCSDIR%%/sc-win-1.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc-win-2.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc-win-3.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc-win-4.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc-win-5.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc01.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc02.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc03.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc04.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc05.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc06.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc07.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc08.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc09.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc1.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc10.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc11.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc12.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc13.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc14.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc15.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc16.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc17.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc18.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc19.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc2.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc20.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc3.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc4.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc5.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc6.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc7.png
>+%%PORTDOCS%%%%DOCSDIR%%/sc8.png
> %%PORTDOCS%%%%DOCSDIR%%/sflogo.png
> %%PORTDOCS%%%%DOCSDIR%%/style.css
> %%PORTDOCS%%%%DOCSDIR%%/usage.html
>-%%PORTDOCS%%%%EXAMPLESDIR%%/1g.ps
>-%%PORTDOCS%%%%EXAMPLESDIR%%/2c8r.ps
>-%%PORTDOCS%%%%EXAMPLESDIR%%/2g8r.ps
>-%%PORTDOCS%%%%EXAMPLESDIR%%/3c8rf.ps
>-%%PORTDOCS%%%%EXAMPLESDIR%%/arch5.jpg
>-%%PORTDOCS%%%%EXAMPLESDIR%%/bg3c8rf.ps
>-%%PORTDOCS%%%%EXAMPLESDIR%%/bg3c8rfa.ps
>-%%PORTDOCS%%%%EXAMPLESDIR%%/bg3c8rfam.ps
>-%%PORTDOCS%%%%EXAMPLESDIR%%/bg3c8rfams0_255_255.ps
>-%%PORTDOCS%%%%EXAMPLESDIR%%/d.ps
>-%%PORTDOCS%%%%EXAMPLESDIR%%/example.tex
>-%%PORTDOCS%%%%EXAMPLESDIR%%/example.txt
>-%%PORTDOCS%%%%EXAMPLESDIR%%/german.tex
>-%%PORTDOCS%%%%EXAMPLESDIR%%/pdfexample.tex
>-%%PORTDOCS%%%%EXAMPLESDIR%%/stefan_255_rgba.bb
>+%%PORTDOCS%%%%DOCSDIR%%/workshop.css
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>+@dirrm %%DATADIR%%/de/utf-8
>+@dirrm %%DATADIR%%/de
>+@dirrm %%DATADIR%%/en/utf-8
>+@dirrm %%DATADIR%%/en
>+@dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 136914: 98076