- Fnorb is free! It has been relicensed under the Python licence.

- Remove NO_CDROM.
- Remove Fnorb from LEGAL.
- Removed FTP site from MASTER_SITES;  It still carries a tarball containing
  the older licence (and hence, has a different checksum).
- Fixed a few minor syntactical problems in Makefile.
- Bumped PORTREVISION.

3 files changed, 5 insertions, 15 deletions

diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index 1e6e1038c9f2..9e2a34b9e97d 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -7,16 +7,14 @@
 
 PORTNAME=	fnorb
 PORTVERSION=	1.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.fnorb.org/download/ \
-		ftp://ftp.dstc.edu.au/DSTC/fnorb/
+MASTER_SITES=	http://www.fnorb.org/download/
 
 MAINTAINER=	wjv@FreeBSD.org
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
-NO_CDROM=	Free for academic, research and non-commercial purposes only
 WRKSRC=		${WRKDIR}/Fnorb-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
@@ -25,7 +23,6 @@ ALL_TARGET=
 
 CPIO=		cpio --quiet -pdum -R
 FNORB_DIR=	${PREFIX}/lib/${PYTHON_VERSION}/site-packages/Fnorb
-EXAMPLESDIR=	${PREFIX}/share/examples/fnorb
 FNORB_BINS=	fnaming fnendian fnfeed fngen fnidl fnifr fnior fnlogger \
 		fnmetrics fnmkior fnoptions fnping
 
@@ -54,10 +51,10 @@ post-install:
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	@ ${MKDIR} ${DOCSDIR}
 	@ cd ${WRKSRC}/doc && find . \
-	  | ${CPIO} ${MANOWN}:${MANGRP} ${DOCSDIR}
+	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 	@ ${CHMOD} -R u-x ${DOCSDIR} && ${CHMOD} -R u+X ${DOCSDIR}
 .for file in ANNOUNCE CHANGES README LICENSE.HTML
-	@ ${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/devel/fnorb/distinfo b/devel/fnorb/distinfo
index a7546a84cb8e..3f5d409f5583 100644
--- a/devel/fnorb/distinfo
+++ b/devel/fnorb/distinfo
@@ -1 +1 @@
-MD5 (fnorb-1.1.tar.gz) = 82dce8192f47dd5a58d847fbe697428f
+MD5 (fnorb-1.1.tar.gz) = b80b1f636f703b1d86794efafd152898
diff --git a/devel/fnorb/pkg-descr b/devel/fnorb/pkg-descr
index 9e97b1b5a468..2ffc480657c0 100644
--- a/devel/fnorb/pkg-descr
+++ b/devel/fnorb/pkg-descr
@@ -8,13 +8,6 @@ test harnesses for CORBA development projects.
 Fnorb is being developed at the CRC for Distributed Systems Technology based
 at the University of Queensland in Brisbane, Australia.
 
-IMPORTANT NOTE: 
-
-Fnorb's licence allows it to be used freely for academic, research and
-non-commercial purposes.  Commercial use requires the purchase of a licence,
-though you may evaluate the product free for 90 days.  Consult the Fnorb web
-site for licensing updates or further information.
-
 WWW: http://www.fnorb.org/
 
 -- Johann Visagie <wjv@FreeBSD.org>