Update port to version 1.2.0.

Patches are no longer needed, and part of pkg-plist is automatically
generated (code "borrowed" from O'Brien's vim5 port :).

I also moved the xemacs21 dependency to emacs20.

lang/mozart/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozart
-PORTVERSION=	1.1.0.20000207
+PORTVERSION=	1.2.0.20010514
 CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://ftp.mozart-oz.org/pub/mozart/${PORTVERSION}/tar/ \
 		ftp://ftp.sics.se/pub/mozart/${PORTVERSION}/tar/
@@ -17,11 +17,11 @@ DISTFILES+=	${MOZART_DOCS}
 
 MAINTAINER=	mathiasp@virtual-earth.de
 
-BUILD_DEPENDS=	xemacs:${PORTSDIR}/editors/xemacs21
+BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs20
 LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
 		tk80.1:${PORTSDIR}/x11-toolkits/tk80
 
-MOZART_DOCS=	mozart-1.1.0.20000207-doc.tar.gz
+MOZART_DOCS=	mozart-${PORTVERSION}-doc.tar.gz
 
 SCRIPTS_ENV=	LN=${LN} PERL=${PERL}
 ALL_TARGET=
@@ -52,12 +52,24 @@ pre-extract:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${TAR} --unlink -xzpf ${DISTDIR}/${MOZART_DOCS} \
+	@${TAR} --unlink -xzpf ${DISTDIR}/${MOZART_DOCS} \
 		-C ${PREFIX}/lib/oz
-	${RM} -rf ${PREFIX}/lib/oz/doc
-	${MV} ${PREFIX}/lib/oz/mozart/doc ${PREFIX}/lib/oz
-	${RM} -rf ${PREFIX}/lib/oz/mozart
+	@${RM} -rf ${PREFIX}/lib/oz/doc
+	@${MV} ${PREFIX}/lib/oz/mozart/doc ${PREFIX}/lib/oz
+	@${RM} -rf ${PREFIX}/lib/oz/mozart
 .endif
+	@cd ${PREFIX} ; find lib/oz -type f -o -type l | sort \
+		> ${WRKDIR}/PLIST.lib-oz
+	@cd ${PREFIX} ; find lib/oz -type d | sort -r \
+	    	| ${SED} -e 's/^/@dirrm /g' \
+		>> ${WRKDIR}/PLIST.lib-oz
+	@${ECHO} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	@${ECHO} "/Insert PLIST.lib-oz"		>> ${WRKDIR}/ex.script
+	@${ECHO} "d"				>> ${WRKDIR}/ex.script
+	@${ECHO} "r ${WRKDIR}/PLIST.lib-oz"	>> ${WRKDIR}/ex.script
+	@${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	@${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-oz
+	@cd ${WRKDIR} ; ex < ex.script
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

lang/mozart/distinfo

@@ -1,2 +1,3 @@
-MD5 (mozart-1.1.0.20000207-src.tar.gz) = 709245e860d01ab936f19bb3dd859ab1
-MD5 (mozart-1.1.0.20000207-doc.tar.gz) = 794c55cc28acbef904ec68b5f4f98d78
+MD5 (mozart-1.2.0.20010514-src.tar.gz) = d8f9ac456fbb8a7487a4e21763cb4c3b
+MD5 (mozart-1.2.0.20010514-doc.tar.gz) = d4b647d75797318f8ecd995c71aabfa0
+MD5 (mozart-1.2.0.20010514-doc.tar.gz) = d4b647d75797318f8ecd995c71aabfa0

lang/mozart/files/patch-aa

@@ -1,11 +0,0 @@
---- mozart-orig/platform/emulator/libdp/network.cc	Wed Jun 21 15:24:16 2000
-+++ platform/emulator/libdp/network.cc	Wed Jun 21 15:33:49 2000
-@@ -2357,6 +2357,8 @@
-   struct sockaddr_in addr1;
- #if __GLIBC__ == 2
-   unsigned int length = sizeof(addr1);
-+#elif __FreeBSD__ > 2
-+  socklen_t length = sizeof(addr1);
- #else
-   int length = sizeof(addr1);
- #endif

lang/mozart/files/patch-ab

@@ -1,14 +0,0 @@
---- mozart-orig/platform/emulator/os.cc	Wed Jun 21 15:24:20 2000
-+++ platform/emulator/os.cc	Wed Jun 21 15:25:14 2000
-@@ -1399,8 +1399,10 @@
- {
- #if __GLIBC__ == 2
-   int ret = accept(s,addr,(unsigned int*)addrlen);
-+#elif __FreeBSD__ > 2
-+  int ret = accept(s,addr,(socklen_t*) addrlen);
- #else
--  int ret = accept(s,addr,addrlen);
-+  int ret = accept(s,addr,(socklen_t*) addrlen);
- #endif
-   if (ret >= 0) 
-     registerSocket(ret);

lang/mozart/files/patch-ac

@@ -1,20 +0,0 @@
---- mozart-orig/platform/emulator/unix.cc	Wed Jun 21 15:24:22 2000
-+++ platform/emulator/unix.cc	Wed Jun 21 15:25:14 2000
-@@ -1046,6 +1046,8 @@
- 
- #if __GLIBC__ == 2
-   unsigned int length = sizeof(addr);
-+#elif __FreeBSD__ > 2
-+  socklen_t length = sizeof(addr);
- #else
-   int length = sizeof(addr);
- #endif
-@@ -1308,6 +1310,8 @@
- 
- #if __GLIBC__ == 2
-   unsigned int fromlen = sizeof from;
-+#elif __FreeBSD__ > 2
-+  socklen_t fromlen = sizeof from;
- #else
-   int fromlen = sizeof from;
- #endif

lang/mozart/files/patch-ad

@@ -1,29 +0,0 @@
---- mozart-orig/platform/emulator/urlc.cc	Wed Jun 21 15:24:22 2000
-+++ platform/emulator/urlc.cc	Wed Jun 21 15:26:54 2000
-@@ -331,6 +331,8 @@
-     // save local address for later use (esp. ftp PORT)
- #if __GLIBC__ == 2
-     unsigned int lin_len = sizeof(lin);
-+#elif __FreeBSD__ > 2
-+    socklen_t lin_len = sizeof(lin);
- #else
-     int lin_len = sizeof(lin);
- #endif
-@@ -993,6 +995,8 @@
-     struct sockaddr_in rem_addr;
- #if __GLIBC__ == 2
-     unsigned int local_addr_len = sizeof(local_addr);
-+#elif __FreeBSD__ > 2
-+    socklen_t local_addr_len = sizeof(local_addr);    
- #else
-     int local_addr_len = sizeof(local_addr);
- #endif
-@@ -1049,6 +1053,8 @@
-     struct sockaddr_in pcin; // peer control connection address
- #if __GLIBC__ == 2
-     unsigned int pcin_len = sizeof(pcin);
-+#elif __FreeBSD__ > 2
-+    socklen_t  pcin_len = sizeof(pcin);
- #else
-     int pcin_len = sizeof(pcin);
- #endif

lang/mozart/files/patch-ae

@@ -1,24 +0,0 @@
---- ../mozart-orig/platform/emulator/mem.cc	Fri Jun 23 12:59:01 2000
-+++ platform/emulator/mem.cc	Fri Jun 23 12:59:36 2000
-@@ -90,18 +90,19 @@
- // This is optional - that's kind'f not clear which evil is the
- // smallest one: rely on "choose a nearest next free address" linux
- // behaviour, or to use the discouraged 'MAP_FIXED' option;
--#if defined(LINUX_I486)
-+#if defined(LINUX_I486) || defined (__FreeBSD__)
- #define USE_AUTO_PLACEMENT
- #endif
- 
- //
- #if defined(HAVE_MMAP)
- 
-+#include <sys/mman.h>
-+
- #if ( !defined(MAP_ANONYMOUS) && defined(MAP_ANON) )
- #define	MAP_ANONYMOUS	MAP_ANON
- #endif
- 
--#include <sys/mman.h>
- #include <fcntl.h>
- 
- #if !defined(USE_AUTO_PLACEMENT)