Several enhancements/cleanups:

- HAS_CONFIGURE -> GNU_CONFIGURE;
- Don't bind to any particular virtual machine - install jit into
  ${LOCALBASE}/lib/tya;
- Respect CFLAGS.

3 files changed, 39 insertions, 13 deletions

diff --git a/java/tya/Makefile b/java/tya/Makefile
index 8895546280e5..57b0cea2b645 100644
--- a/java/tya/Makefile
+++ b/java/tya/Makefile
@@ -14,28 +14,27 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/${JAVADIR}/bin/java:${PORTSDIR}/java/jdk
+BUILD_DEPENDS=	${JAVADIR}/bin/java:${PORTSDIR}/java/jdk
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/a1/a1./}
 
 ONLY_FOR_ARCHS=	i386
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-jdk=${LOCALBASE}/${JAVADIR}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--with-jdk=${JAVADIR}
 
-JAVADIR=	jdk1.1.8
-JAVALIBDIR=	${PREFIX}/${JAVADIR}/lib/i386/green_threads/
-
-PLIST_SUB=	JAVADIR=${JAVADIR}
+JAVADIR=	${LOCALBASE}/jdk1.1.8
+JAVALIBDIR=	${PREFIX}/lib/tya
 
 do-install:
+	@${MKDIR} ${JAVALIBDIR}
 	@${INSTALL_PROGRAM} ${WRKSRC}/libtya.so ${JAVALIBDIR}
 
 post-install:
-	@${MKDIR} ${PREFIX}/${JAVADIR}/tya
-	@${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/${JAVADIR}/tya
+	@${MKDIR} ${PREFIX}/share/tya
+	@${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/tya
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "See ${PREFIX}/${JAVADIR}/tya/README for usage instructions."
+	@${ECHO_MSG} "See ${PREFIX}/share/tya/README for usage instructions."
 	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/java/tya/files/patch-ab b/java/tya/files/patch-ab
new file mode 100644
index 000000000000..8bfb5da2f694
--- /dev/null
+++ b/java/tya/files/patch-ab
@@ -0,0 +1,26 @@
+--- Makefile.in	2000/09/10 20:08:34	1.1
++++ Makefile.in	2000/09/10 20:08:38
+@@ -12,12 +12,12 @@
+ #TARGETFLAGS =-DDEBUG
+ 
+ # GCC specific options:
+-COPTFLAGS=-O3
++#COPTFLAGS=-O3
+ #COPTFLAGS=-O6 -v
+ 
+ 
+ # CPU specific options:
+-POPTFLAGS=-m486 -malign-loops=4 -malign-functions=4 -malign-jumps=4
++POPTFLAGS=-malign-loops=4 -malign-functions=4 -malign-jumps=4
+ 
+ 
+ #_____________________________________________________________
+@@ -32,7 +32,7 @@
+ CSOURCES=tya.c tyarechelp.c tyarecode.c tyautil.c tyaruntime.c tyaexc.c
+ 
+ #
+-CFLAGS = -Wall -pipe -shared $(COPTFLAGS) $(POPTFLAGS)	$(TARGETFLAGS)
++CFLAGS += -Wall -shared $(COPTFLAGS) $(POPTFLAGS)	$(TARGETFLAGS)
+ 
+ all: $(TARGET)
+ 
diff --git a/java/tya/pkg-plist b/java/tya/pkg-plist
index e193fb9acc2c..0ff4755adf99 100644
--- a/java/tya/pkg-plist
+++ b/java/tya/pkg-plist
@@ -1,3 +1,4 @@
-%%JAVADIR%%/lib/i386/green_threads/libtya.so
-%%JAVADIR%%/tya/README
-@dirrm %%JAVADIR%%/tya
+lib/tya/libtya.so
+share/tya/README
+@dirrm share/tya
+@dirrm lib/tya