2 files changed, 36 insertions, 86 deletions

diff --git a/java/infobus/Makefile b/java/infobus/Makefile
index 73e37e914310..9ccbf83f73ea 100644
--- a/java/infobus/Makefile
+++ b/java/infobus/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	infobus
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	java devel
 DISTNAME=	ib12
 
 MAINTAINER=	java@freebsd.org
 COMMENT=	Enables dynamic exchange of data between JavaBeans(TM)
 
-RUN_DEPENDS=	${JAVAJARDIR}/collections.jar:${PORTSDIR}/java/collections
+RUN_DEPENDS=	${JAVALIBDIR}/collections.jar:${PORTSDIR}/java/collections
 
 USE_ZIP=	YES
 USE_JAVA=	YES
@@ -23,17 +24,29 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_CDROM=	"See the license"
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
 .include <bsd.port.pre.mk>
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	You must manually fetch the distribution from http://java.sun.com/products/archive/javabeans/infobus/downloads.html and place it in ${DISTDIR} then run make again
 .endif
 
 do-install:
-	@cd ${WRKSRC}; \
-		${MKDIR} ${PREFIX}/share/java/classes/; \
-		${CP} ${WRKSRC}/infobus.jar ${PREFIX}/share/java/classes/; \
-		${MKDIR} ${PREFIX}/share/java/${PKGNAME}/; \
-		${CP} LICENSE.HTML *.java *.html coffee6.gif examples.mak makefile moneyman.mf ${PREFIX}/share/java/${PKGNAME}/; \
-		${CP} -R doc ${PREFIX}/share/java/${PKGNAME}/
+	${INSTALL_DATA} ${WRKSRC}/infobus.jar ${JAVAJARDIR}/
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.java ${EXAMPLESDIR}
+.for i in examples.mak makefile moneyman.mf ReadMe.html ReadRowset.html coffee6.gif
+	${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}
+.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in LICENSE.HTML ReadMe.html coffee6.gif
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+	cd ${WRKSRC}/doc && \
+		${FIND} . | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/java/infobus/pkg-plist b/java/infobus/pkg-plist
index c5dfd22cbd63..8e5aa8aad7ea 100644
--- a/java/infobus/pkg-plist
+++ b/java/infobus/pkg-plist
@@ -1,79 +1,16 @@
-share/java/classes/infobus.jar
-share/java/infobus-1.2/LICENSE.HTML
-share/java/infobus-1.2/makefile
-share/java/infobus-1.2/examples.mak
-share/java/infobus-1.2/coffee6.gif
-share/java/infobus-1.2/ReadRowset.html
-share/java/infobus-1.2/ReadMe.html
-share/java/infobus-1.2/MoneyBeans.html
-share/java/infobus-1.2/SimpleTable.java
-share/java/infobus-1.2/SimpleProducerBean.java
-share/java/infobus-1.2/SimpleDataItem.java
-share/java/infobus-1.2/SimpleConsumerBean.java
-share/java/infobus-1.2/SampleConsumer.java
-share/java/infobus-1.2/RowsetSource.java
-share/java/infobus-1.2/RowsetAccessHelper.java
-share/java/infobus-1.2/MonetaryDataItem.java
-share/java/infobus-1.2/moneyman.mf
-share/java/infobus-1.2/doc/javax/infobus/UnsupportedOperationException.html
-share/java/infobus-1.2/doc/javax/infobus/ColumnNotFoundException.html
-share/java/infobus-1.2/doc/javax/infobus/DataItem.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemAddedEvent.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemChangeEvent.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemChangeListener.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemChangeListenerSupport.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemChangeManager.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemChangeManagerSupport.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemChangeSupport.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemDeletedEvent.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemRevokedEvent.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemShapeChangedEvent.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemShapeChangeListener.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemValueChangedEvent.html
-share/java/infobus-1.2/doc/javax/infobus/DataItemView.html
-share/java/infobus-1.2/doc/javax/infobus/DbAccess.html
-share/java/infobus-1.2/doc/javax/infobus/DefaultPolicy.html
-share/java/infobus-1.2/doc/javax/infobus/DuplicateColumnException.html
-share/java/infobus-1.2/doc/javax/infobus/ImmediateAccess.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBus.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusBean.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusBeanSupport.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusDataConsumer.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusDataConsumerProxy.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusDataController.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusDataProducer.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusDataProducerProxy.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusEvent.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusEventListener.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusItemAvailableEvent.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusItemRequestedEvent.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusItemRevokedEvent.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusMember.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusMembershipException.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusMemberSupport.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusPolicyHelper.html
-share/java/infobus-1.2/doc/javax/infobus/InfoBusPropertyMap.html
-share/java/infobus-1.2/doc/javax/infobus/InvalidDataException.html
-share/java/infobus-1.2/doc/javax/infobus/package-frame.html
-share/java/infobus-1.2/doc/javax/infobus/package-summary.html
-share/java/infobus-1.2/doc/javax/infobus/package-tree.html
-share/java/infobus-1.2/doc/javax/infobus/RowsetAccess.html
-share/java/infobus-1.2/doc/javax/infobus/ReshapeableArrayAccess.html
-share/java/infobus-1.2/doc/javax/infobus/RowsetCursorMovedEvent.html
-share/java/infobus-1.2/doc/javax/infobus/RowsetValidate.html
-share/java/infobus-1.2/doc/javax/infobus/RowsetValidationException.html
-share/java/infobus-1.2/doc/javax/infobus/ScrollableRowsetAccess.html
-share/java/infobus-1.2/doc/javax/infobus/StaleInfoBusException.html
-share/java/infobus-1.2/doc/javax/infobus/ArrayAccess.html
-share/java/infobus-1.2/doc/index-all.html
-share/java/infobus-1.2/doc/index.html
-share/java/infobus-1.2/doc/overview-tree.html
-share/java/infobus-1.2/doc/package-list
-share/java/infobus-1.2/doc/packages.html
-share/java/infobus-1.2/doc/serialized-form.html
-share/java/infobus-1.2/doc/allclasses-frame.html
-share/java/infobus-1.2/doc/stylesheet.css
-@dirrm share/java/infobus-1.2/doc/javax/infobus
-@dirrm share/java/infobus-1.2/doc/javax
-@dirrm share/java/infobus-1.2/doc
-@dirrm share/java/infobus-1.2/
+%%EXAMPLESDIR%%/MonetaryDataItem.java
+%%EXAMPLESDIR%%/ReadMe.html
+%%EXAMPLESDIR%%/ReadRowset.html
+%%EXAMPLESDIR%%/RowsetAccessHelper.java
+%%EXAMPLESDIR%%/RowsetSource.java
+%%EXAMPLESDIR%%/SampleConsumer.java
+%%EXAMPLESDIR%%/SimpleConsumerBean.java
+%%EXAMPLESDIR%%/SimpleDataItem.java
+%%EXAMPLESDIR%%/SimpleProducerBean.java
+%%EXAMPLESDIR%%/SimpleTable.java
+%%EXAMPLESDIR%%/coffee6.gif
+%%EXAMPLESDIR%%/examples.mak
+%%EXAMPLESDIR%%/makefile
+%%EXAMPLESDIR%%/moneyman.mf
+%%JAVAJARDIR%%/infobus.jar
+@dirrm %%EXAMPLESDIR%%