diff options
| author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-07-11 20:23:11 +0000 |
|---|---|---|
| committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-07-11 20:23:11 +0000 |
| commit | 9b2d57aa066dd0c1474b372b9beab1e1e128348c (patch) | |
| tree | a4b9b7d0335231cee4bfbe993e4fcaad8b47d685 | |
| parent | e8f5865c29450b72cc08f85059c298850043d4a2 (diff) | |
| download | ports-9b2d57aa066dd0c1474b372b9beab1e1e128348c.tar.gz ports-9b2d57aa066dd0c1474b372b9beab1e1e128348c.zip | |
Notes
| -rw-r--r-- | graphics/jdraw/Makefile | 4 | ||||
| -rw-r--r-- | graphics/jdraw/distinfo | 6 | ||||
| -rw-r--r-- | graphics/jdraw/files/jdraw.in | 11 | ||||
| -rw-r--r-- | graphics/jdraw/pkg-plist | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile index cffe4dd1b99c..16e60f31bb08 100644 --- a/graphics/jdraw/Makefile +++ b/graphics/jdraw/Makefile @@ -6,7 +6,7 @@ # PORTNAME= jdraw -PORTVERSION= 1.1.4 +PORTVERSION= 1.1.5 CATEGORIES= graphics java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,7 +24,7 @@ OPTIONS= PLASTIC3D "Use Plastic3DLook&Feel" on DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= ${PORTNAME} -SUB_LIST= JAVA=${JAVA} JAVAJARDIR=${JAVAJARDIR} JDRAWJAR=${JDRAWJAR} PLASTIC3D=${PLASTIC3D} +SUB_LIST= JAVA_VERSION=${JAVA_VERSION} JDRAWJAR=${JDRAWJAR} PLASTIC3D=${PLASTIC3D} JDRAWJAR= ${DATADIR}/${DISTFILES} diff --git a/graphics/jdraw/distinfo b/graphics/jdraw/distinfo index c9c04a236dbd..5e9c54c5fb2c 100644 --- a/graphics/jdraw/distinfo +++ b/graphics/jdraw/distinfo @@ -1,3 +1,3 @@ -MD5 (jdraw_v1.1.4.jar) = ad8942da9873ddea09094245cd820c02 -SHA256 (jdraw_v1.1.4.jar) = c59d46942d25535d1581ee8d5091f8dd4679559bdc81aba7a078c4460859cd7e -SIZE (jdraw_v1.1.4.jar) = 672892 +MD5 (jdraw_v1.1.5.jar) = 16282b9a7863cf5660451327334bde12 +SHA256 (jdraw_v1.1.5.jar) = 4bc17505ee86644789e6d93ee6ebdfb5de0e4e4f4b7f63e4c83ffcd49d78d284 +SIZE (jdraw_v1.1.5.jar) = 705527 diff --git a/graphics/jdraw/files/jdraw.in b/graphics/jdraw/files/jdraw.in index 7cb6969e16eb..ff618b262676 100644 --- a/graphics/jdraw/files/jdraw.in +++ b/graphics/jdraw/files/jdraw.in @@ -1,9 +1,14 @@ #!/bin/sh # $FreeBSD$ -if [ -z "$1" ]; then +if [ -z "${JAVA_VERSION}" ]; then + JAVA_VERSION="%%JAVA_VERSION%%" +fi + +if [ "${JAVA_VERSION}" \> "1.4" ]; then LOOK_AND_FEEL="%%PLASTIC3D%%" else - LOOK_AND_FEEL="$1" + LOOK_AND_FEEL= fi -%%JAVA%% -cp %%JAVAJARDIR%% ${LOOK_AND_FEEL} -jar %%JDRAWJAR%% +exec "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%" ${LOOK_AND_FEEL} -jar "%%JDRAWJAR%%" "$@" + diff --git a/graphics/jdraw/pkg-plist b/graphics/jdraw/pkg-plist index c3506d704cca..9762b2492cd2 100644 --- a/graphics/jdraw/pkg-plist +++ b/graphics/jdraw/pkg-plist @@ -1,4 +1,4 @@ @comment $FreeBSD$ bin/jdraw -%%JAVASHAREDIR%%/jdraw/jdraw_v1.1.4.jar +%%JAVASHAREDIR%%/jdraw/jdraw_v1.1.5.jar @dirrm %%JAVASHAREDIR%%/jdraw |