3 files changed, 9 insertions, 5 deletions
diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile
index 63a336bf5..915a4b7e1 100644
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libglade-java
 PORTVERSION=	2.3.5
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
@@ -48,21 +49,23 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@gtkapiversion@|${GTK_API_VERSION}|g ; \
 		s|@apiversion@|${GLADE_API_VERSION}|g ; \
 		s|@version@|${PORTVERSION}|g' \
-		${WRKSRC}/src/Makefile.in
+		${WRKSRC}/src/Makefile.in \
+		${WRKSRC}/java/org/gnu/glade/LibGlade.java.in
 
 do-install:
 	${MKDIR} ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/libgladejava${GLADE_API_VERSION}.so.${PORTVERSION} \
 		${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libgladejava${GLADE_API_VERSION}.so.${PORTVERSION} ${PREFIX}/lib/libgconfjava${GLADE_API_VERSION}.so
+	${LN} -sf ${PREFIX}/lib/libgladejava${GLADE_API_VERSION}.so.${PORTVERSION} ${PREFIX}/lib/libgladejava${GLADE_API_VERSION}.so
 	${MKDIR} ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/glade${GLADE_API_VERSION}-${PORTVERSION}.jar \
 		${JAVAJARDIR}
+	${LN} -sf ${JAVAJARDIR}/lib/glade${GLADE_API_VERSION}-${PORTVERSION}.jar \
+		${JAVAJARDIR}/glade${GLADE_API_VERSION}.jar
 
 post-install:
 	@${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%PORTVERSION%%|${PORTVERSION}|g ; \
 		s|%%GLADE_API_VERSION%%|${GLADE_API_VERSION}|g' \
 		 < ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/libglade-java/pkg-message b/devel/libglade-java/pkg-message
index c4a9ab87a..f5534e4a6 100644
--- a/devel/libglade-java/pkg-message
+++ b/devel/libglade-java/pkg-message
@@ -2,6 +2,6 @@
 Libglade-java was successfully installed.  In order to build and run GTK+
 Java applications, you must add the following to your CLASSPATH:
 
-%%JAVAJARDIR%%/glade%%GLADE_API_VERSION%%-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/glade%%GLADE_API_VERSION%%.jar
 
 ************************************************************************
diff --git a/devel/libglade-java/pkg-plist b/devel/libglade-java/pkg-plist
index 4ea6796fe..38de64e9b 100644
--- a/devel/libglade-java/pkg-plist
+++ b/devel/libglade-java/pkg-plist
@@ -1,3 +1,4 @@
-lib/libgconfjava%%GLADE_API_VERSION%%.so
+lib/libgladejava%%GLADE_API_VERSION%%.so
 lib/libgladejava%%GLADE_API_VERSION%%.so.%%PORTVERSION%%
 share/java/classes/glade2.3-%%PORTVERSION%%.jar
+share/java/classes/glade%%GLADE_API_VERSION%%.jar