Rename ${PREFIX}/bin/ebb to ${PREFIX}/bin/ebb-dvipdfmx to avoid

conflicts; print/teTeX-base also install the file with the same name.

Notified by:	itetcu
Submitted by:	hrs

4 files changed, 39 insertions, 1 deletions

diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 172e3b493db2..6d65973c7355 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dvipdfmx
 PORTVERSION=	20080607
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/latest/
 DIST_SUBDIR=	dvipdfmx
diff --git a/print/dvipdfmx/files/patch-src-Makefile.in b/print/dvipdfmx/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..ed854e3f7e38
--- /dev/null
+++ b/print/dvipdfmx/files/patch-src-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2008-06-11 00:21:30.000000000 +0900
++++ src/Makefile.in	2008-05-23 09:04:11.000000000 +0900
+@@ -1517,7 +1517,7 @@
+
+
+ install-exec-hook:
+-	cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb
++	cd $(DESTDIR)$(bindir) && rm -f ebb-dvipdfmx && $(LN_S) dvipdfmx ebb-dvipdfmx
+ 	cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/print/dvipdfmx/files/patch-src-dvipdfmx.c b/print/dvipdfmx/files/patch-src-dvipdfmx.c
new file mode 100644
index 000000000000..47b52b77bada
--- /dev/null
+++ b/print/dvipdfmx/files/patch-src-dvipdfmx.c
@@ -0,0 +1,26 @@
+--- src/dvipdfmx.c.orig	2008-05-29 19:40:29.000000000 +0900
++++ src/dvipdfmx.c	2008-06-11 00:50:55.000000000 +0900
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <limits.h>
+ #include <ctype.h>
++#include <libgen.h>
+
+ #include "system.h"
+ #include "mem.h"
+@@ -773,10 +774,13 @@
+ main (int argc, char *argv[])
+ {
+   double dvi2pts;
++  char *bn = basename(argv[0]);
+
+-  if (strcmp(argv[0], "ebb") == 0)
++  if (strcmp(bn, "ebb") == 0)
+     return extractbb(argc, argv, EBB_OUTPUT);
+-  else if (strcmp(argv[0], "xbb") == 0 || strcmp(argv[0], "extractbb") == 0)
++  else if (strcmp(bn, "ebb-dvipdfmx") == 0)
++    return extractbb(argc, argv, EBB_OUTPUT);
++  else if (strcmp(bn, "xbb") == 0 || strcmp(bn, "extractbb") == 0)
+     return extractbb(argc, argv, XBB_OUTPUT);
+
+   mem_debug_init();
diff --git a/print/dvipdfmx/pkg-plist b/print/dvipdfmx/pkg-plist
index dbda7f70cbaf..0d43214be5fa 100644
--- a/print/dvipdfmx/pkg-plist
+++ b/print/dvipdfmx/pkg-plist
@@ -1,6 +1,6 @@
 @comment $FreeBSD$
 bin/dvipdfmx
-bin/ebb
+bin/ebb-dvipdfmx
 bin/extractbb
 %%DVIPDFMXDIR%%/dvipdfmx.cfg
 @dirrm %%DVIPDFMXDIR%%