5 files changed, 69 insertions, 11 deletions

diff --git a/java/tya/Makefile b/java/tya/Makefile
index 4e84d187e178..2db6dedeb72d 100644
--- a/java/tya/Makefile
+++ b/java/tya/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	tya
-PORTVERSION=	1.7.3
+PORTVERSION=	1.8
 CATEGORIES=	java
 MASTER_SITES=	http://sax.sax.de/~adlibit/
-DISTNAME=	tya17v3
+DISTNAME=	tya18
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -28,18 +28,25 @@ CONFIGURE_ARGS+=	--with-jdk=${JAVADIR}
 JAVADIR?=	${LOCALBASE}/jdk1.1.8
 JAVALIBDIR=	${PREFIX}/lib/tya
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+post-patch:
+	@${REINPLACE_CMD} -e "s|-malign|-falign|g" ${WRKSRC}/Makefile.in
+.endif
+
 post-configure:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/README
 
 do-install:
 	@${MKDIR} ${JAVALIBDIR}
 	@${INSTALL_PROGRAM} ${WRKSRC}/libtya.so ${JAVALIBDIR}
-
-post-install:
-	@${MKDIR} ${PREFIX}/share/tya
-	@${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/tya
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "See ${PREFIX}/share/tya/README for usage instructions."
+	@${ECHO_MSG} "See ${DOCSDIR}/README for usage instructions."
 	@${ECHO_MSG} ""
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/java/tya/distinfo b/java/tya/distinfo
index 6c4f5ff914b6..449fe3d35f3f 100644
--- a/java/tya/distinfo
+++ b/java/tya/distinfo
@@ -1 +1 @@
-MD5 (tya17v3.tgz) = 74d4746f6f82fbef6080043289ead09d
+MD5 (tya18.tgz) = b1bbc0b6279a4b56df33ecf216588b77
diff --git a/java/tya/files/patch-tya.c b/java/tya/files/patch-tya.c
new file mode 100644
index 000000000000..b35aaf482659
--- /dev/null
+++ b/java/tya/files/patch-tya.c
@@ -0,0 +1,38 @@
+--- ./tya.c.orig	Tue Jul  9 20:28:10 2002
++++ ./tya.c	Tue Oct 28 00:44:51 2003
+@@ -786,7 +786,7 @@
+ unsigned long  oldesp asm("anOldsp");
+ unsigned long  oldebp asm("anOldbp");
+ unsigned long  jumpTo asm("aJumpTo");
+-#endif EXCEPTIONS_BY_SIGNALS
++#endif /* EXCEPTIONS_BY_SIGNALS */
+ 
+ #define NEWGETCONTEXT
+ #define OFF116v5 4	// 0 for 114v4a
+@@ -916,16 +916,16 @@
+    
+    // restore old ebp and esp, push old eip on stack for exception handler
+    // and jump there
+-   asm volatile( "
+-   movl $anOldbp, %eax
+-   movl (%eax), %ebp
+-   movl $anOldsp, %eax
+-   movl (%eax), %esp
+-   movl $anOldip, %eax
+-   movl (%eax),%eax
+-   pushl %eax
+-   movl $aJumpTo, %eax
+-   movl (%eax), %eax
++   asm volatile( "\
++   movl $anOldbp, %eax\
++   movl (%eax), %ebp\
++   movl $anOldsp, %eax\
++   movl (%eax), %esp\
++   movl $anOldip, %eax\
++   movl (%eax),%eax\
++   pushl %eax\
++   movl $aJumpTo, %eax\
++   movl (%eax), %eax\
+    jmp *%eax" );
+ #endif // EXCEPTIONS_BY_SIGNALS
+    return HOOKRETVAL;		     
diff --git a/java/tya/files/patch-tyaruntime.c b/java/tya/files/patch-tyaruntime.c
new file mode 100644
index 000000000000..1a8e4071de90
--- /dev/null
+++ b/java/tya/files/patch-tyaruntime.c
@@ -0,0 +1,13 @@
+--- ./tyaruntime.c.orig	Tue Oct 28 00:35:00 2003
++++ ./tyaruntime.c	Tue Oct 28 00:35:15 2003
+@@ -126,8 +126,8 @@
+ {
+    FASTINVPREPARE();
+ }
+-#endif USEASM
+-#endif TRY_FAST_INVOKE
++#endif /* USEASM */
++#endif /* TRY_FAST_INVOKE */
+ 
+ 
+ //---------------------------------------------------------------------------------
diff --git a/java/tya/pkg-plist b/java/tya/pkg-plist
index 0ff4755adf99..6c05698eb522 100644
--- a/java/tya/pkg-plist
+++ b/java/tya/pkg-plist
@@ -1,4 +1,4 @@
 lib/tya/libtya.so
-share/tya/README
-@dirrm share/tya
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/tya