[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)

8 files changed, 84 insertions, 44 deletions

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