5 files changed, 30 insertions, 14 deletions

diff --git a/print/abc2mtex/Makefile b/print/abc2mtex/Makefile
index 8de7d6638443..58eacbb7d9b7 100644
--- a/print/abc2mtex/Makefile
+++ b/print/abc2mtex/Makefile
@@ -18,6 +18,7 @@ RUN_DEPENDS=		musixtex:${PORTSDIR}/print/musixtex
 
 NO_WRKSUBDIR=		yes
 
+TEXMF=		${PREFIX}/share/texmf
 EXAMPLE_FILES=	English.abc Jigs.abc Reels.abc Strspys.abc
 DOC_FILES=	usrguide.ps
 BIN_FILES=	abc2mtex abc2mtex \
@@ -26,10 +27,11 @@ BIN_FILES=	abc2mtex abc2mtex \
 
 do-install:
 	cd ${WRKSRC}; \
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}; \
-	${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/share/doc/${PORTNAME}; \
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}/examples; \
-	${INSTALL_DATA} ${EXAMPLE_FILES} ${PREFIX}/share/doc/${PORTNAME}/examples;
+	${MKDIR} ${TEXMF}/doc/${PORTNAME}; \
+	${INSTALL_DATA} ${DOC_FILES} ${TEXMF}/doc/${PORTNAME}; \
+	${MKDIR} ${TEXMF}/doc/${PORTNAME}/examples; \
+	${INSTALL_DATA} ${EXAMPLE_FILES} ${TEXMF}/doc/${PORTNAME}/examples; \
+	${INSTALL_DATA} header.tex ${TEXMF}/tex/abc2mtex_header.tex
 	set -- ${BIN_FILES}; \
 	while [ $$# -gt 0 ] ; do \
 		src=$$1; tgt=$$2; shift; shift; \
diff --git a/print/abc2mtex/files/patch-Makefile b/print/abc2mtex/files/patch-Makefile
index d0aa1ad5256b..6a6c7433596d 100644
--- a/print/abc2mtex/files/patch-Makefile
+++ b/print/abc2mtex/files/patch-Makefile
@@ -1,11 +1,13 @@
 --- Makefile.orig	Wed Sep 25 15:25:40 1996
-+++ Makefile	Mon May 28 16:30:58 2001
-@@ -1,14 +1,9 @@
++++ Makefile	Mon May 28 22:40:49 2001
+@@ -1,14 +1,11 @@
  # you may need to change these for your system
 -CFLAGS	= -g
 -MAKE	= make
 -CC	= cc
 -RM	= /bin/rm
++
++CFLAGS+= -DHEADER=\"${PREFIX}/share/texmf/tex/abc2mtex_header.tex\"
  
  TEX	= userguide music
  ABC	= English Jigs Reels Strspys
diff --git a/print/abc2mtex/files/patch-tex.c b/print/abc2mtex/files/patch-tex.c
new file mode 100644
index 000000000000..3eea188c5bcf
--- /dev/null
+++ b/print/abc2mtex/files/patch-tex.c
@@ -0,0 +1,11 @@
+--- tex.c.orig	Mon Jan 13 15:04:40 1997
++++ tex.c	Mon May 28 22:34:57 2001
+@@ -65,7 +65,7 @@
+ 	} else (void) fprintf(Out,"\\def\\abcmusix{N}\n");
+ 	if (settings.mine)
+ 		(void) fprintf(Out,"\\input dscgrphy\n");
+-	(void) fprintf(Out,"\\input header\n%%\n");
++	(void) fprintf(Out,"\\input %s\n%%\n", HEADER);
+ 	if (musix == 1) (void) fprintf(Out,"\\startmuflex%%\n");
+ }
+ 
diff --git a/print/abc2mtex/pkg-descr b/print/abc2mtex/pkg-descr
index bd3534d76a7c..379f65939a65 100644
--- a/print/abc2mtex/pkg-descr
+++ b/print/abc2mtex/pkg-descr
@@ -2,7 +2,7 @@ abc2mtex converts the "abc" music notation into MusiXTeX format.  This
 can help simplifying writing tunes in a TeX format.
 
 The abc2mtex user documentation is installed as
-${PREFIX:-/usr/local}/share/doc/abc2mtex/usrguide.ps, and a few
+${PREFIX:-/usr/local}/share/texmf/doc/abc2mtex/usrguide.ps, and a few
 examples can be found there in another subdirectory called `examples'.
 
 Note that the original programs `search' and `sort_in' have been
diff --git a/print/abc2mtex/pkg-plist b/print/abc2mtex/pkg-plist
index e745778b2349..2faecc76bc5b 100644
--- a/print/abc2mtex/pkg-plist
+++ b/print/abc2mtex/pkg-plist
@@ -1,10 +1,11 @@
 bin/abc2mtex
 bin/abc_search
 bin/abc_sort_in
-share/doc/abc2mtex/usrguide.ps
-share/doc/abc2mtex/examples/English.abc
-share/doc/abc2mtex/examples/Jigs.abc
-share/doc/abc2mtex/examples/Reels.abc
-share/doc/abc2mtex/examples/Strspys.abc
-@dirrm share/doc/abc2mtex/examples
-@dirrm share/doc/abc2mtex
+share/texmf/doc/abc2mtex/usrguide.ps
+share/texmf/doc/abc2mtex/examples/English.abc
+share/texmf/doc/abc2mtex/examples/Jigs.abc
+share/texmf/doc/abc2mtex/examples/Reels.abc
+share/texmf/doc/abc2mtex/examples/Strspys.abc
+share/texmf/tex/abc2mtex_header.tex
+@dirrm share/texmf/doc/abc2mtex/examples
+@dirrm share/texmf/doc/abc2mtex