From 4588c69b2ae068d5a70bc0097eb40e337c245ad6 Mon Sep 17 00:00:00 2001 From: edwin Date: Sun, 25 Jan 2004 21:02:30 +0000 Subject: Remove the files which were to be removed when submitting the port. Noticed by: bento --- net/papaya/files/patch-Makefile.in | 11 ---- net/papaya/files/patch-configure | 61 ---------------------- net/papaya/files/patch-mkinstalldirs | 43 --------------- net/papaya/files/patch-src::Makefile.in | 26 --------- net/papaya/files/patch-src::papaya::Buffer.cpp | 10 ---- net/papaya/files/patch-src::papaya::Socket.cpp | 11 ---- net/papaya/files/patch-src::plugins::Makefile.in | 11 ---- ...ch-src::plugins::PythonPlugin::PythonPlugin.cpp | 11 ---- net/papaya/pkg-message | 4 -- 9 files changed, 188 deletions(-) delete mode 100644 net/papaya/files/patch-Makefile.in delete mode 100644 net/papaya/files/patch-configure delete mode 100644 net/papaya/files/patch-mkinstalldirs delete mode 100644 net/papaya/files/patch-src::Makefile.in delete mode 100644 net/papaya/files/patch-src::papaya::Buffer.cpp delete mode 100644 net/papaya/files/patch-src::papaya::Socket.cpp delete mode 100644 net/papaya/files/patch-src::plugins::Makefile.in delete mode 100644 net/papaya/files/patch-src::plugins::PythonPlugin::PythonPlugin.cpp delete mode 100644 net/papaya/pkg-message (limited to 'net/papaya') diff --git a/net/papaya/files/patch-Makefile.in b/net/papaya/files/patch-Makefile.in deleted file mode 100644 index 49b9963d6c04..000000000000 --- a/net/papaya/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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@ - --SUBDIRS = src doc @INTLSUB@ @POSUB@ -+SUBDIRS = src @INTLSUB@ @POSUB@ - distdir = $(PACKAGE)-$(VERSION) - - PREFIX = @prefix@ diff --git a/net/papaya/files/patch-configure b/net/papaya/files/patch-configure deleted file mode 100644 index fc84a072c4e5..000000000000 --- a/net/papaya/files/patch-configure +++ /dev/null @@ -1,61 +0,0 @@ -$FreeBSD$ - ---- configure.orig Mon Oct 15 21:41:00 2001 -+++ configure Mon Dec 17 22:55:13 2001 -@@ -2546,7 +2546,7 @@ - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib -- INTLDEPS='$(top_builddir)/intl/libintl.a' -+ INTLDEPS='$(PREFIX)/lib/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h -@@ -2675,7 +2675,7 @@ - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share -- INTLDEPS='$(top_builddir)/intl/libintl.a' -+ INTLDEPS='$(PREFIX)/lib/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h -@@ -3095,7 +3095,7 @@ - - - # Extract the first word of "gtk-config", so it can be a program name with args. --set dummy gtk-config; ac_word=$2 -+set dummy ${GTK_CONFIG}; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:3101: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GTKCONFIG'+set}'`\" = set"; then -@@ -3130,15 +3130,15 @@ - fi - - if test "x$GTKCONFIG" != "x"; then -- GTK_INC=`gtk-config --cflags` -- LIBGTK=`gtk-config --libs` -+ GTK_INC=`${GTK_CONFIG} --cflags` -+ LIBGTK=`${GTK_CONFIG} --libs` - LIBS="$LIBS $LIBGTK" - else - { echo "configure: error: *** gtk is required ***" 1>&2; exit 1; } - fi - - # Extract the first word of "glib-config", so it can be a program name with args. --set dummy glib-config; ac_word=$2 -+set dummy ${GLIB_CONFIG}; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:3144: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GLIBCONFIG'+set}'`\" = set"; then -@@ -3173,8 +3173,8 @@ - fi - - if test "x$GLIBCONFIG" != "x"; then -- GLIB_INC=`glib-config --cflags` -- LIBGLIB=`glib-config --libs` -+ GLIB_INC=`${GLIB_CONFIG} --cflags` -+ LIBGLIB=`${GLIB_CONFIG} --libs` - LIBS="$LIBS $LIBGLIB" - else - { echo "configure: error: *** glib is required ***" 1>&2; exit 1; } diff --git a/net/papaya/files/patch-mkinstalldirs b/net/papaya/files/patch-mkinstalldirs deleted file mode 100644 index 6ebe00440e06..000000000000 --- a/net/papaya/files/patch-mkinstalldirs +++ /dev/null @@ -1,43 +0,0 @@ ---- /dev/null Fri Aug 24 22:05:18 2001 -+++ mkinstalldirs Fri Aug 24 22:06:29 2001 -@@ -0,0 +1,40 @@ -+#! /bin/sh -+# mkinstalldirs --- make directory hierarchy -+# Author: Noah Friedman -+# Created: 1993-05-16 -+# Public domain -+ -+# $Id: mkinstalldirs,v 1.1 1998/07/17 14:18:48 jbj Exp $ -+ -+errstatus=0 -+ -+for file -+do -+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` -+ shift -+ -+ pathcomp= -+ for d -+ do -+ pathcomp="$pathcomp$d" -+ case "$pathcomp" in -+ -* ) pathcomp=./$pathcomp ;; -+ esac -+ -+ if test ! -d "$pathcomp"; then -+ echo "mkdir $pathcomp" 1>&2 -+ -+ mkdir "$pathcomp" || lasterr=$? -+ -+ if test ! -d "$pathcomp"; then -+ errstatus=$lasterr -+ fi -+ fi -+ -+ pathcomp="$pathcomp/" -+ done -+done -+ -+exit $errstatus -+ -+# mkinstalldirs ends here diff --git a/net/papaya/files/patch-src::Makefile.in b/net/papaya/files/patch-src::Makefile.in deleted file mode 100644 index e4e6dcac0fb5..000000000000 --- a/net/papaya/files/patch-src::Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ ---- src/Makefile.in.orig Mon Oct 15 07:35:13 2001 -+++ src/Makefile.in Wed Dec 19 04:02:47 2001 -@@ -2,8 +2,8 @@ - # Compilers. You shouldn't really need to change these. - ## - --C++ = g++ --CC = gcc -+C++ = ${CXX} -+CC ?= gcc - - ## - # General configuration section. -@@ -21,10 +21,10 @@ - - SUBDIRS = - --C++FLAGS := -fno-rtti -fno-inline @DEBUG@ -DUNIX -Wall -Ih @DMALLOC@ @ZVT@ @ZLIB@ -DPREFIX=\"$(PREFIX)\" @IPV4@ @GTK@ @GTK_INC@ @GLIB_INC@ @GNOME_INC@ -+C++FLAGS := -fno-rtti -fno-inline @DEBUG@ -DUNIX -Wall -Ih @DMALLOC@ @ZVT@ @ZLIB@ -DPREFIX=\"$(PREFIX)\" @IPV4@ @GTK@ @GTK_INC@ @GLIB_INC@ @GNOME_INC@ ${CXXFLAGS} - #C++FLAGS := -fno-rtti -fno-inline @DEBUG@ -DUNIX -Wall $(shell gtk-config --cflags) $(shell glib-config --cflags) $(shell gnome-config --cflags gnome) -Ih @DMALLOC@ @ZVT@ @ZLIB@ -DPREFIX=\"$(PREFIX)\" @IPV4@ @GTK@ - --LFLAGS = @INTLLIBS@ @LIBS@ -lgthread -+LFLAGS = @INTLLIBS@ @LIBS@ ${PTHREAD_LIBS} - - #CCMALLOC = @CCMALLOC@ - diff --git a/net/papaya/files/patch-src::papaya::Buffer.cpp b/net/papaya/files/patch-src::papaya::Buffer.cpp deleted file mode 100644 index f87611420cba..000000000000 --- a/net/papaya/files/patch-src::papaya::Buffer.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #endif -+#include - #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 deleted file mode 100644 index 960fa6360a47..000000000000 --- a/net/papaya/files/patch-src::papaya::Socket.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 74a7baa32ba2..000000000000 --- a/net/papaya/files/patch-src::plugins::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 2ce57c746529..000000000000 --- a/net/papaya/files/patch-src::plugins::PythonPlugin::PythonPlugin.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - #include - #include --#include -+#include - #include - - #ifdef WIN32 diff --git a/net/papaya/pkg-message b/net/papaya/pkg-message deleted file mode 100644 index c3c0796ce360..000000000000 --- a/net/papaya/pkg-message +++ /dev/null @@ -1,4 +0,0 @@ --------------------------------------------------------------------- -It is recommended you install the papaya-plugins package for added -functionality. It can be found in ports/net/papaya-plugins. --------------------------------------------------------------------- -- cgit