From 168675a41e7533f3b2826c245230775cf6c7835b Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sun, 29 Feb 2004 08:33:04 +0000
Subject: Fix this guy up a bit.

* Install the correct jar file
* Do some missed subsitution in the code so that the GTK+ library can be
  found
* Create a jar file symlink so users don't have to keep changing the jar file
  name after each release


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1929 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11/libgnome-java/Makefile    | 10 +++++++---
 x11/libgnome-java/pkg-message |  2 +-
 x11/libgnome-java/pkg-plist   |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index e2aef3b22..f72d9615e 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnome-java
 PORTVERSION=	2.5.5
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -43,21 +44,24 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@gtkapiversion@|${GTK_API_VERSION}|g ; \
 		s|@apiversion@|${GNOME_API_VERSION}|g ; \
 		s|@version@|${PORTVERSION}|g' \
-		${WRKSRC}/src/Makefile.in
+		${WRKSRC}/src/Makefile.in \
+		${WRKSRC}/src/java/org/gnu/gnome/Gnome.java.in \
+		${WRKSRC}/src/java/org/gnu/gnome/Program.java.in
 
 do-install:
 	${MKDIR} ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/libgnomejava${GNOME_API_VERSION}.so.${PORTVERSION} \
 		${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libgnomejava${GNOME_API_VERSION}.so.${PORTVERSION} ${PREFIX}/lib/libgconfjava${GNOME_API_VERSION}.so
+	${LN} -sf ${PREFIX}/lib/libgnomejava${GNOME_API_VERSION}.so.${PORTVERSION} ${PREFIX}/lib/libgnomejava${GNOME_API_VERSION}.so
 	${MKDIR} ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/gnome${GNOME_API_VERSION}-${PORTVERSION}.jar \
 		${JAVAJARDIR}
+	${LN} -sf ${JAVAJARDIR}/gnome${GNOME_API_VERSION}-${PORTVERSION}.jar \
+		${JAVAJARDIR}/gnome${GNOME_API_VERSION}.jar
 
 post-install:
 	@${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%PORTVERSION%%|${PORTVERSION}|g ; \
 		s|%%GNOME_API_VERSION%%|${GNOME_API_VERSION}|g' \
 		 < ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
diff --git a/x11/libgnome-java/pkg-message b/x11/libgnome-java/pkg-message
index 0b5e4eed3..64a47f199 100644
--- a/x11/libgnome-java/pkg-message
+++ b/x11/libgnome-java/pkg-message
@@ -2,6 +2,6 @@
 Libgnome-java was successfully installed.  In order to build and run GTK+
 Java applications, you must add the following to your CLASSPATH:
 
-%%JAVAJARDIR%%/gnome%%GNOME_API_VERSION%%-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/gnome%%GNOME_API_VERSION%%.jar
 
 ************************************************************************
diff --git a/x11/libgnome-java/pkg-plist b/x11/libgnome-java/pkg-plist
index d5a173a64..2c26a4568 100644
--- a/x11/libgnome-java/pkg-plist
+++ b/x11/libgnome-java/pkg-plist
@@ -1,3 +1,4 @@
-lib/libgconfjava%%GNOME_API_VERSION%%.so
+lib/libgnomejava%%GNOME_API_VERSION%%.so
 lib/libgnomejava%%GNOME_API_VERSION%%.so.%%PORTVERSION%%
 share/java/classes/gnome%%GNOME_API_VERSION%%-%%PORTVERSION%%.jar
+share/java/classes/gnome%%GNOME_API_VERSION%%.jar
-- 
cgit v1.2.3