--- Makefile	(revision 354018)
+++ Makefile	(working copy)
@@ -2,10 +2,9 @@ 
 # $FreeBSD$
 
 PORTNAME=	pauker
-DISTVERSION=	1.8RC2
-PORTREVISION=	1
+DISTVERSION=	1.8
 CATEGORIES=	misc java
-MASTER_SITES=	SF/${PORTNAME}/OldFiles
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
@@ -16,16 +15,9 @@ 
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar bin/${PORTNAME}
-
-NO_STAGE=	yes
 do-install:
-	@${INSTALL_DATA} ${DISTDIR}/${DISTNAME}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${SED} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
-	    -e "s:%%JAVAJARDIR%%:${JAVAJARDIR}:" \
-	    -e "s:%%PORTNAME%%:${PORTNAME}:" \
-	    ${FILESDIR}/pauker.sh > ${PREFIX}/bin/${PORTNAME}
-	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/${PORTNAME}
-	@${CHMOD} a+rx ${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_DATA} ${DISTDIR}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/pauker.jar
+	@${PRINTF} "#!/bin/sh\nexec \"${JAVA}\" -jar \"${JAVAJARDIR}/pauker.jar\" \"\$$@\"\n" > ${WRKDIR}/pauker
+	@${INSTALL_SCRIPT} ${WRKDIR}/pauker ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
--- distinfo	(revision 354018)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@ 
-SHA256 (pauker-1.8RC2.jar) = a32adb3e70ffff5bd9531bc778d8c69fc2282b755c6698f9684283e8293abbd7
-SIZE (pauker-1.8RC2.jar) = 3421961
+SHA256 (pauker-1.8.jar) = cbc675bcbae0fc0a30d1a28d929409b5f8fd4b629b9df0c8c61760fb75380a6b
+SIZE (pauker-1.8.jar) = 7663902
--- files/pauker.sh	(revision 354018)
+++ files/pauker.sh	(working copy)
@@ -1,5 +0,0 @@ 
-#!/bin/sh
-#
-# $FreeBSD$
-
-"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%PORTNAME%%.jar" "$@"
--- pkg-descr	(revision 354018)
+++ pkg-descr	(working copy)
@@ -1,3 +1,3 @@ 
 Pauker is a Java program for flashcard learning based on the Leitner system.
 
-WWW:	http://pauker.sourceforge.net
+WWW: http://pauker.sourceforge.net
--- pkg-plist	(revision 0)
+++ pkg-plist	(working copy)
@@ -0,0 +1,2 @@ 
+%%JAVAJARDIR%%/pauker.jar
+bin/pauker