[maintainer-update] net/papaya update to version 0.9.6

	Update of Papaya to version 0.9.6.

Removed the papaya-plugins directory.
Updated to version 0.9.6
Disabled the plugins due to problems with python support

PR:		ports/39193
Submitted by:	Edwin Groothuis <edwin@mavetju.org> (long time ago)

15 files changed, 84 insertions, 179 deletions

diff --git a/net/Makefile b/net/Makefile
index 3c25bb2eb879..bdfb7f709880 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -539,7 +539,6 @@
     SUBDIR += packit
     SUBDIR += pancho
     SUBDIR += papaya
-    SUBDIR += papaya-plugins
     SUBDIR += partysip
     SUBDIR += passlogd
     SUBDIR += pathchar
diff --git a/net/papaya-plugins/Makefile b/net/papaya-plugins/Makefile
deleted file mode 100644
index 50f6fb7c18a6..000000000000
--- a/net/papaya-plugins/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for:	papaya-plugins
-# Date created:		23 August 2001
-# Whom:			Edwin Groothuis <edwin@mavetju.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	papaya-plugins
-PORTVERSION=	0.90
-CATEGORIES=	net
-MASTER_SITES=	http://www.gtk-papaya.org/downloads/plugins/source/
-DISTNAME=	papaya-plugins-src-${PORTVERSION}
-
-MAINTAINER=	adam-ports@blacktabby.org
-COMMENT=	Plugins for papaya, a graphical GTK mud client
-
-# We need the source for papaya to build the plugins.
-BUILD_DEPENDS=	${PORTSDIR}/net/papaya/work/papaya-src-${PORTVERSION}/src/h:${PORTSDIR}/net/papaya
-RUN_DEPENDS=	papaya:${PORTSDIR}/net/papaya
-
-USE_PERL5_BUILD=yes
-USE_SUBMAKE=	yes
-IS_INTERACTIVE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomelibs
-GNU_CONFIGURE=	yes
-MAKE_ARGS+=	CXX="${CXX}"
-
-PLIST=	${WRKSRC}/pkg-plist
-
-post-patch:
-	@${PERL} -pi -e 's,g\+\+,${CXX},g' ${WRKSRC}/Makefile.in
-	@${PERL} -pi -e 's,malloc.h,stdlib.h,' ${WRKSRC}/PythonPlugin.cpp \
-		${WRKSRC}/TurfProtocol.cpp
-	@${PERL} -pi -e 's,stdint.h,sys/types.h,' ${WRKSRC}/SpellStacker.h
-
-pre-configure:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.papaya-plugins
-	${RM} ${WRKSRC}/config.cache
-
-post-configure:
-	${LN} -fs ${PORTSDIR}/net/papaya/work/papaya-src-${PORTVERSION}/src/h ${WRKSRC}/h
-
-post-build:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/add-plugins
-
-.include <bsd.port.mk>
-
-.if exists(${WRKDIR}/Makefile.inc)
-.include "${WRKDIR}/Makefile.inc"
-.endif
diff --git a/net/papaya-plugins/distinfo b/net/papaya-plugins/distinfo
deleted file mode 100644
index 55dce286dfa6..000000000000
--- a/net/papaya-plugins/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (papaya-plugins-src-0.90.tar.gz) = 4d89921d9d91fbb6aba3e774bbbc8c8b
diff --git a/net/papaya-plugins/files/patch-Makefile.in b/net/papaya-plugins/files/patch-Makefile.in
deleted file mode 100644
index bc6f02561bd6..000000000000
--- a/net/papaya-plugins/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-$FreeBSD$
-
---- Makefile.in.orig	Fri Aug 31 14:39:08 2001
-+++ Makefile.in	Wed Dec 19 04:19:31 2001
-@@ -1,4 +1,4 @@
--CC = g++
-+CC = ${CXX}
- 
- # Commonly used modules that don't require TurfProtocol
- COMMONMODULES = o/Speedwalk.so o/MudLog.so o/PromptPlugin.so \
-@@ -47,7 +47,7 @@
- # should select the correct LFLAGS line.
- ##
- 
--C++FLAGS = -I/usr/local/include $(POSTGRES_INC) `glib-config --cflags` `gtk-config --cflags` -fno-exceptions -fno-rtti -fno-inline @DEBUG@ -DUNIX -Wall $(MIDI) -Ih `gnome-config --cflags gnomeui`
-+C++FLAGS = -I/usr/local/include $(POSTGRES_INC) `${GLIB_CONFIG} --cflags` `${GTK_CONFIG} --cflags` -fno-exceptions -fno-rtti -fno-inline @DEBUG@ -DUNIX -Wall $(MIDI) -Ih `gnome-config --cflags gnomeui` ${CXXFLAGS}
- 
- all: $(MODULES)
- 
diff --git a/net/papaya-plugins/pkg-descr b/net/papaya-plugins/pkg-descr
deleted file mode 100644
index c9f5c96ff045..000000000000
--- a/net/papaya-plugins/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Papaya is a MUD client. A MUD client is a program like telnet, but
-customised for playing MUDs with. Papaya has a number of features
-designed to make playing MUDs more enjoyable. Papaya makes use of
-Gnome to provide a graphical interface.
-
-This section is only the plugins.
-
-WWW: http://www.gtk-papaya.org/
diff --git a/net/papaya-plugins/scripts/add-plugins b/net/papaya-plugins/scripts/add-plugins
deleted file mode 100644
index 23df157c0079..000000000000
--- a/net/papaya-plugins/scripts/add-plugins
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-files=`ls ${WRKSRC}/o/ | sed -e 's/^.*\/o\///g'`
-
-> pkg-plist
-for f in $files; do
-	echo share/papaya/plugins/$f >> ${WRKSRC}/pkg-plist
-done
-
-echo "@dirrm share/papaya/plugins" >> ${WRKSRC}/pkg-plist
diff --git a/net/papaya-plugins/scripts/configure.papaya-plugins b/net/papaya-plugins/scripts/configure.papaya-plugins
deleted file mode 100644
index 1fd436d2c55a..000000000000
--- a/net/papaya-plugins/scripts/configure.papaya-plugins
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-tempfile=`mktemp -t checklist`
-
-if [ "${BATCH}" = "yes" ]; then
-	set \"common\"
-else
-	/usr/bin/dialog --title "Papaya-plugins configuration options" --clear \
-			--checklist "\n\
-Please select desired options:" -1 -1 8 \
-common		"Enable common generic plugins" ON \
-extra		"Enable extra generic plugins" OFF \
-turf		"Enable the TurfProtocol plugin" OFF \
-turf-common	"Enable common Turf plugins" OFF \
-turf-extra	"Enable extra Turf plugins" OFF \
-python		"Enable the Python interpreter" OFF \
-all		"Overrides above" OFF \
-debugging	"Compile with debugging symbols" OFF \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `cat $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-exec > ${WRKDIR}/Makefile.inc
-
-while [ "$1" ]; do
-	echo "CONFIGURE_ARGS+=	--enable-`echo $1 | sed -e 's/"//g'`"
-	shift
-done
diff --git a/net/papaya/Makefile b/net/papaya/Makefile
index e1408a2fbfac..4079211ce25c 100644
--- a/net/papaya/Makefile
+++ b/net/papaya/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	papaya
-PORTVERSION=	0.90
+PORTVERSION=	0.96
 CATEGORIES=	net
 MASTER_SITES=	http://www.gtk-papaya.org/downloads/source/
 DISTNAME=	papaya-src-${PORTVERSION}
@@ -14,18 +14,19 @@ DISTNAME=	papaya-src-${PORTVERSION}
 MAINTAINER=	adam-ports@blacktabby.org
 COMMENT=	Graphical GTK mud client with plugin support
 
+BUILD_DEPENDS=	${LOCALBASE}/include/pygtk-2.0/pygtk/pygtk.h:${PORTSDIR}/x11-toolkits/py-gtk2
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 WANT_GNOME=	yes
+USE_AUTOCONF=	yes
 USE_PERL5_BUILD=yes
+USE_PYTHON=	yes
+USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 .if ${HAVE_GNOME:Mgnomelibs}!=""
 USE_GNOME+=	gnomeprefix gnomehack gnomelibs
 .else
@@ -33,16 +34,7 @@ CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
 CONFIGURE_ENV+=	GLIBCONFIG=${GLIB_CONFIG} GTKCONFIG=${GTK_CONFIG}
+CONFIGURE_ARGS=	--with-interface=gtk2 --enable-plugins=no
 MAKE_ARGS+=	PTHREAD_LIBS=${PTHREAD_LIBS} CXX="${CXX}"
 
-post-patch:
-	@${PERL} -pi -e "s|/usr/local|${PREFIX}|"  \
-		${WRKSRC}/src/install-system.sh
-	@${PERL} -pi -e "s|\@INSTALL\@|${INSTALL_PROGRAM}|g; \
-		s|\@INSTALL_DATA\@|${INSTALL_DATA}|g" \
-		${WRKSRC}/src/install-system.sh ${WRKSRC}/po/Makefile.in.in
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/net/papaya/distinfo b/net/papaya/distinfo
index 4e77d90b5144..88e797aca19b 100644
--- a/net/papaya/distinfo
+++ b/net/papaya/distinfo
@@ -1 +1 @@
-MD5 (papaya-src-0.90.tar.gz) = e0d61b27fba539b66a0fc87728410770
+MD5 (papaya-src-0.96.tar.gz) = 3c7cff6b5af698f8f91502d11596374a
diff --git a/net/papaya/files/patch-Makefile.in b/net/papaya/files/patch-Makefile.in
index 1e885b4400dd..49b9963d6c04 100644
--- a/net/papaya/files/patch-Makefile.in
+++ b/net/papaya/files/patch-Makefile.in
@@ -1,25 +1,11 @@
-$FreeBSD$
-
---- Makefile.in.orig	Mon Dec 17 22:13:42 2001
-+++ Makefile.in	Mon Dec 17 22:14:04 2001
-@@ -6,17 +6,17 @@
+--- Makefile.in.orig	Fri Jan  9 15:38:23 2004
++++ Makefile.in	Fri Jan  9 15:38:28 2004
+@@ -1,7 +1,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
  
- all:
- 	for subdir in $(SUBDIRS); do \
--	  make -C $$subdir; \
-+	  ${MAKE} -C $$subdir; \
- 	done
+-SUBDIRS = src doc @INTLSUB@ @POSUB@
++SUBDIRS = src @INTLSUB@ @POSUB@
+ distdir = $(PACKAGE)-$(VERSION)
  
- clean:
- 	for subdir in $(SUBDIRS); do \
--	  make -C $$subdir clean; \
-+	  ${MAKE} -C $$subdir clean; \
- 	done
- 
- install:
- 	for subdir in $(SUBDIRS); do \
--	  make -C $$subdir install; \
-+	  ${MAKE} -C $$subdir install; \
- 	done
- 
- dist: Makefile
+ PREFIX = @prefix@
diff --git a/net/papaya/files/patch-src::papaya::Buffer.cpp b/net/papaya/files/patch-src::papaya::Buffer.cpp
new file mode 100644
index 000000000000..f87611420cba
--- /dev/null
+++ b/net/papaya/files/patch-src::papaya::Buffer.cpp
@@ -0,0 +1,10 @@
+--- src/papaya/Buffer.cpp.orig	Fri Jan  9 15:15:19 2004
++++ src/papaya/Buffer.cpp	Fri Jan  9 15:15:32 2004
+@@ -4,6 +4,7 @@
+ #ifdef WIN32
+ #include <assert.h>
+ #endif
++#include <assert.h>
+ #include "Buffer.h"
+ 
+ #include "mudclient.h"
diff --git a/net/papaya/files/patch-src::papaya::Socket.cpp b/net/papaya/files/patch-src::papaya::Socket.cpp
new file mode 100644
index 000000000000..960fa6360a47
--- /dev/null
+++ b/net/papaya/files/patch-src::papaya::Socket.cpp
@@ -0,0 +1,11 @@
+--- src/papaya/Socket.cpp.orig	Fri Jan  9 15:13:24 2004
++++ src/papaya/Socket.cpp	Fri Jan  9 15:13:34 2004
+@@ -428,7 +428,7 @@
+       c = inbuf.getLength();
+     }
+ 
+-    return read(min(b, c), dest);
++    return read(std::min(b, c), dest);
+ }
+ 
+ /**
diff --git a/net/papaya/files/patch-src::plugins::Makefile.in b/net/papaya/files/patch-src::plugins::Makefile.in
new file mode 100644
index 000000000000..74a7baa32ba2
--- /dev/null
+++ b/net/papaya/files/patch-src::plugins::Makefile.in
@@ -0,0 +1,11 @@
+--- src/plugins/Makefile.in.orig	Fri Jan  9 15:08:18 2004
++++ src/plugins/Makefile.in	Fri Jan  9 15:08:41 2004
+@@ -58,7 +58,7 @@
+ 	done
+ 
+ .depend:
+-	$(CXX) -MM -I../include -I/usr/local/include/ @GTK_C_FLAGS@ $(SRC_FILES) > .depend
++	$(CXX) -MM -I../include -I/usr/local/include/ @GTK_C_FLAGS@ $(SRC_FILES) $(C++FLAGS) > .depend
+ 	$(PERL) -i -p -e 's/..\/include\/version\.h//g' .depend
+ 	$(PERL) -i -p -e 's/([^.]+)\.o/o\/\1.o/g' .depend
+ 
diff --git a/net/papaya/files/patch-src::plugins::PythonPlugin::PythonPlugin.cpp b/net/papaya/files/patch-src::plugins::PythonPlugin::PythonPlugin.cpp
new file mode 100644
index 000000000000..2ce57c746529
--- /dev/null
+++ b/net/papaya/files/patch-src::plugins::PythonPlugin::PythonPlugin.cpp
@@ -0,0 +1,11 @@
+--- src/plugins/PythonPlugin/PythonPlugin.cpp.orig	Fri Jan  9 15:18:10 2004
++++ src/plugins/PythonPlugin/PythonPlugin.cpp	Fri Jan  9 15:18:14 2004
+@@ -12,7 +12,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>

+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <regex.h>
+ 
+ #ifdef WIN32
diff --git a/net/papaya/pkg-plist b/net/papaya/pkg-plist
index e08e5b7f3cd1..7bc298fdbc89 100644
--- a/net/papaya/pkg-plist
+++ b/net/papaya/pkg-plist
@@ -1,9 +1,28 @@
 bin/papaya
-share/locale/en/LC_MESSAGES/papaya.mo 
-share/locale/en_GB/LC_MESSAGES/papaya.mo 
-share/papaya/bitmaps/papaya.xpm
+
+share/papaya/bitmaps/papaya-logo-newbie.xpm
+share/papaya/bitmaps/splash.xpm
+@dirrm share/papaya/bitmaps
+
 share/papaya/mcw.dat
 share/papaya/mudlist.txt
 share/papaya/papayarc
-@dirrm share/papaya/bitmaps
 @dirrm share/papaya
+
+share/gnome/papaya/locale/en_GB/LC_MESSAGES/papaya.mo
+share/gnome/papaya/locale/en_US/LC_MESSAGES/papaya.mo
+share/gnome/papaya/locale/es/LC_MESSAGES/papaya.mo
+share/gnome/papaya/locale/fr/LC_MESSAGES/papaya.mo
+share/gnome/papaya/locale/no_NO/LC_MESSAGES/papaya.mo
+@dirrm share/gnome/papaya/locale/en_GB/LC_MESSAGES
+@dirrm share/gnome/papaya/locale/en_GB/
+@dirrm share/gnome/papaya/locale/en_US/LC_MESSAGES
+@dirrm share/gnome/papaya/locale/en_US/
+@dirrm share/gnome/papaya/locale/es/LC_MESSAGES
+@dirrm share/gnome/papaya/locale/es/
+@dirrm share/gnome/papaya/locale/fr/LC_MESSAGES
+@dirrm share/gnome/papaya/locale/fr/
+@dirrm share/gnome/papaya/locale/no_NO/LC_MESSAGES
+@dirrm share/gnome/papaya/locale/no_NO/
+@dirrm share/gnome/papaya/locale
+@dirrm share/gnome/papaya