From 499d6875e3eef93f0f5a46631aa83d9277651e4c Mon Sep 17 00:00:00 2001
From: hq <hq@FreeBSD.org>
Date: Wed, 24 May 2006 14:15:11 +0000
Subject: - Install only JAR file and LICENSE/README files - Use INSTALL_DATA
 (rather than CP) to install files - Bump PORTREVISION (packing list has
 changed)

PR:		97698 (follow-up)
Submitted by:	hq
Approved by:	maintainer
---
 dns/crossip/Makefile            |  7 ++++---
 dns/crossip/files/crossip.sh.in |  2 +-
 dns/crossip/pkg-plist           | 24 +-----------------------
 3 files changed, 6 insertions(+), 27 deletions(-)

(limited to 'dns')

diff --git a/dns/crossip/Makefile b/dns/crossip/Makefile
index b4812f90cdb5..e880e3e30393 100644
--- a/dns/crossip/Makefile
+++ b/dns/crossip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	crossip
 DISTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -27,8 +27,9 @@ SUB_FILES=	crossip.sh
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${CP} -R ${WRKSRC}/* ${DATADIR}
-	${LN} -sf ${DATADIR}/lib/CrossIP.jar ${JAVAJARDIR}/CrossIP.jar
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/CrossIP.jar ${DATADIR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/crossip.sh ${PREFIX}/bin/crossip
 
 .include <bsd.port.mk>
diff --git a/dns/crossip/files/crossip.sh.in b/dns/crossip/files/crossip.sh.in
index cdac67ef2b31..466beb932974 100644
--- a/dns/crossip/files/crossip.sh.in
+++ b/dns/crossip/files/crossip.sh.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 
 JAVA_VERSION="%%JAVA_VERSION%%" \
-	exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/lib/CrossIP.jar" "${@}"
+	exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/CrossIP.jar" "${@}"
diff --git a/dns/crossip/pkg-plist b/dns/crossip/pkg-plist
index 51cd79745934..75423ec0adb1 100644
--- a/dns/crossip/pkg-plist
+++ b/dns/crossip/pkg-plist
@@ -1,28 +1,6 @@
 @comment $FreeBSD$
 bin/crossip
-%%JAVAJARDIR%%/CrossIP.jar
+%%DATADIR%%/CrossIP.jar
 %%DATADIR%%/LICENSE.txt
 %%DATADIR%%/README.txt
-%%DATADIR%%/bin/com/algenta/crossip/Actions.class
-%%DATADIR%%/bin/com/algenta/crossip/Config.class
-%%DATADIR%%/bin/com/algenta/crossip/ConfigFileException.class
-%%DATADIR%%/bin/com/algenta/crossip/CrossIP.class
-%%DATADIR%%/bin/com/algenta/crossip/CrossIPConstants.class
-%%DATADIR%%/bin/com/algenta/crossip/CrossIPException.class
-%%DATADIR%%/lib/CrossIP.jar
-%%DATADIR%%/src/com/algenta/crossip/Actions.java
-%%DATADIR%%/src/com/algenta/crossip/Config.java
-%%DATADIR%%/src/com/algenta/crossip/ConfigFileException.java
-%%DATADIR%%/src/com/algenta/crossip/CrossIP.java
-%%DATADIR%%/src/com/algenta/crossip/CrossIPConstants.java
-%%DATADIR%%/src/com/algenta/crossip/CrossIPException.java
-@dirrm %%DATADIR%%/src/com/algenta/crossip
-@dirrm %%DATADIR%%/src/com/algenta
-@dirrm %%DATADIR%%/src/com
-@dirrm %%DATADIR%%/src
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/bin/com/algenta/crossip
-@dirrm %%DATADIR%%/bin/com/algenta
-@dirrm %%DATADIR%%/bin/com
-@dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
-- 
cgit