diff options
229 files changed, 27 insertions, 10603 deletions
@@ -49,12 +49,10 @@ cos-* java/cos Special conditions apply for commercial use cosmo/* games/cosmo Possible copyright infringement CrystalSVGforGnomeIcons* x11-themes/gnome-icons-crystal Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. cyberbit/* x11-fonts/cyberbit-ttfonts Not free for commercial use -darwinia-demo* games/linux-darwinia-demo Redistribution is limited, see license datamodeler databases/datamodeler Packaging prohibited by Oracle license dbvis java/dbvis Redistribution is not permitted dcl-*-C.tar.gz science/cdcl No commercial use dcl-*.tar.gz science/dcl No commercial use -defcon* games/linux-defcon Redistribution is limited, see license djbdns* dns/djbdns No license -- see http://cr.yp.to/softwarelaw.html djbfft-* math/djbfft No license -- see http://cr.yp.to/softwarelaw.html dlv lang/dlv Not sure if we can redistribute it @@ -197,7 +195,6 @@ tuc-* converters/tuc Author does not allow CD-ROM distribution tw_cli-* sysutils/tw_cli Redistribution forbidden by license ue*dev.zip editors/uemacs Resale allowed for media cost only unifi-5*/UniFi.unix.zip net-mgmt/unifi5 Redistribution of bundled firmware images is not permitted -uplink-demo* games/linux-uplink-demo Redistribution is limited, see license uzap.tar.gz editors/uzap This software may not be used to make a profit in any way. vdbench*.zip benchmarks/linux-vdbench Redistribution is not permitted vdr-markad-* multimedia/vdr-plugin-markad Installs station logos @@ -15379,3 +15379,30 @@ net/frr5|net/frr7|2020-08-25|Has expired: Upstream no longer maintained textproc/rubygem-kramdown22|textproc/rubygem-kramdown|2020-08-26|Obsolete, please use textproc/rubygem-kramdown instead devel/rubygem-health_check26-rails60|devel/rubygem-health_check|2020-08-26|Obsolete, please use devel/rubygem-health_check instead devel/rubygem-omniauth_crowd22|devel/rubygem-omniauth_crowd|2020-08-26|Obsolete, please use devel/rubygem-omniauth_crowd instead +audio/timidity++-tcltk||2020-08-27|Has expired: Broken for more than 6 months +biology/pbcopper||2020-08-27|Has expired: Broken for more than 6 months +devel/ace||2020-08-27|Has expired: Broken for more than 6 months +devel/bin86||2020-08-27|Has expired: Broken for more than 6 months +devel/erlang-oserl||2020-08-27|Has expired: Broken for more than 6 months +emulators/qemu40||2020-08-27|Has expired: Please consider using qemu or qemu41 +games/linux-darwinia-demo||2020-08-27|Has expired: Broken for more than 6 months +games/linux-defcon||2020-08-27|Has expired: Broken for more than 6 months +games/linux-uplink-demo||2020-08-27|Has expired: Broken for more than 6 months +games/xevil||2020-08-27|Has expired: Broken for more than 6 months +games/xminesweep||2020-08-27|Has expired: Broken for more than 6 months +graphics/backfract||2020-08-27|Has expired: Broken for more than 6 months +japanese/kanjipad||2020-08-27|Has expired: Broken for more than 6 months +japanese/xdtp||2020-08-27|Has expired: Broken for more than 6 months +korean/hpscat||2020-08-27|Has expired: Broken for more than 6 months +math/barvinok||2020-08-27|Has expired: Broken for more than 6 months +math/openmesh||2020-08-27|Has expired: Broken for more than 6 months +math/rehearse||2020-08-27|Has expired: Broken for more than 6 months +net/hinfo||2020-08-27|Has expired: Broken for more than 6 months +science/fleur||2020-08-27|Has expired: Broken for more than 6 months +science/lm||2020-08-27|Has expired: Broken for more than 6 months +security/ddos_scan||2020-08-27|Has expired: Broken for more than 6 months +security/gag||2020-08-27|Has expired: Broken for more than 6 months +security/py-keystone||2020-08-27|Has expired: Broken for more than 6 months +sysutils/mono-kmod||2020-08-27|Has expired: mastersite disappeared, unfetchable +x11-themes/gtk-cleanice-engine||2020-08-27|Has expired: Broken for more than 6 months +x11-wm/aewm||2020-08-27|Has expired: Broken for more than 6 months diff --git a/audio/Makefile b/audio/Makefile index c7fd3b7d8e39..6312c3a06cd5 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -803,7 +803,6 @@ SUBDIR += timidity++-gtk SUBDIR += timidity++-motif SUBDIR += timidity++-slang - SUBDIR += timidity++-tcltk SUBDIR += timidity++-xaw SUBDIR += timidity++-xskin SUBDIR += tkeca diff --git a/audio/timidity++-tcltk/Makefile b/audio/timidity++-tcltk/Makefile deleted file mode 100644 index 1a065da9c54e..000000000000 --- a/audio/timidity++-tcltk/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Yoichi Asai <yatt@msc.biglobe.ne.jp> -# $FreeBSD$ - -PKGNAMESUFFIX= -tcltk - -MAINTAINER= ports@FreeBSD.org -COMMENT= Tcl/Tk interface for TiMidity++ - -BROKEN= fails to build: /bin/sh: tclsh: not found -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -OPTIONS_DEFINE= DOCS - -MASTERDIR= ${.CURDIR}/../../audio/timidity++ - -.include "${MASTERDIR}/Makefile" diff --git a/audio/timidity++-tcltk/pkg-descr b/audio/timidity++-tcltk/pkg-descr deleted file mode 100644 index 0be7ff3a7e3f..000000000000 --- a/audio/timidity++-tcltk/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This port allows you to operate TiMidity++ with Tcl/Tk interface. - -Formerly, the original version of this program was written by Tuuka -Toivonen(until version 0.2i). -Now, Masanao Izumo and many hackers are developing "TiMidity++". - -WWW: http://timidity.sourceforge.net/ diff --git a/audio/timidity++-tcltk/pkg-plist b/audio/timidity++-tcltk/pkg-plist deleted file mode 100644 index ffddf7285975..000000000000 --- a/audio/timidity++-tcltk/pkg-plist +++ /dev/null @@ -1,27 +0,0 @@ -bin/tkmidi -%%TIMID_LIBDIR%%/bitmaps/arrow.xbm -%%TIMID_LIBDIR%%/bitmaps/back.xbm -%%TIMID_LIBDIR%%/bitmaps/check.xbm -%%TIMID_LIBDIR%%/bitmaps/fast.xbm -%%TIMID_LIBDIR%%/bitmaps/fwrd.xbm -%%TIMID_LIBDIR%%/bitmaps/keydown.xbm -%%TIMID_LIBDIR%%/bitmaps/keyup.xbm -%%TIMID_LIBDIR%%/bitmaps/next.xbm -%%TIMID_LIBDIR%%/bitmaps/off.xbm -%%TIMID_LIBDIR%%/bitmaps/on.xbm -%%TIMID_LIBDIR%%/bitmaps/pause.xbm -%%TIMID_LIBDIR%%/bitmaps/play.xbm -%%TIMID_LIBDIR%%/bitmaps/prev.xbm -%%TIMID_LIBDIR%%/bitmaps/quit.xbm -%%TIMID_LIBDIR%%/bitmaps/random.xbm -%%TIMID_LIBDIR%%/bitmaps/repeat.xbm -%%TIMID_LIBDIR%%/bitmaps/slow.xbm -%%TIMID_LIBDIR%%/bitmaps/stop.xbm -%%TIMID_LIBDIR%%/bitmaps/timidity.xbm -%%TIMID_LIBDIR%%/browser.tcl -%%TIMID_LIBDIR%%/if_tcltk.so -%%TIMID_LIBDIR%%/misc.tcl -%%TIMID_LIBDIR%%/tkmidity.tcl -%%TIMID_LIBDIR%%/tkpanel.tcl -%%PORTDOCS%%%%DOCSDIR%%/README.tk -%%PORTDOCS%%share/doc/ja/timidity++/README.tk diff --git a/biology/Makefile b/biology/Makefile index aeed4c9b9932..befa0c66ac78 100644 --- a/biology/Makefile +++ b/biology/Makefile @@ -107,7 +107,6 @@ SUBDIR += p5-transdecoder SUBDIR += paml SUBDIR += pbbam - SUBDIR += pbcopper SUBDIR += pbseqan SUBDIR += pear-merger SUBDIR += phrap diff --git a/biology/pbcopper/Makefile b/biology/pbcopper/Makefile deleted file mode 100644 index 39b4b0b4ee6a..000000000000 --- a/biology/pbcopper/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $FreeBSD$ - -PORTNAME= pbcopper -DISTVERSION= 0.4.1 # Test with biology/unanimity before upgrading! -PORTREVISION= 4 -CATEGORIES= biology - -# As of March 2018, unanimity is no longer open source. -# See https://github.com/PacificBiosciences/ccs. -MAINTAINER= ports@FreeBSD.org -COMMENT= Core C++ library for Pacific Biosciences tools - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LIB_DEPENDS= libboost_regex.so:devel/boost-libs - -# Meson needs BOOST_ROOT=${LOCALBASE} -# https://github.com/mesonbuild/meson/issues/2239 -USES= compiler:c++14-lang localbase meson -USE_LDCONFIG= yes -USE_GITHUB= yes -GH_ACCOUNT= PacificBiosciences - -post-install: - ${RLN} ${STAGEDIR}${PREFIX}/lib/libpbcopper.so.${PORTVERSION} \ - ${STAGEDIR}${PREFIX}/lib/libpbcopper.so.0.4 - ${RLN} ${STAGEDIR}${PREFIX}/lib/libpbcopper.so.${PORTVERSION} \ - ${STAGEDIR}${PREFIX}/lib/libpbcopper.so.0 - -.include <bsd.port.mk> diff --git a/biology/pbcopper/distinfo b/biology/pbcopper/distinfo deleted file mode 100644 index fafecefe146c..000000000000 --- a/biology/pbcopper/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1550453144 -SHA256 (PacificBiosciences-pbcopper-0.4.1_GH0.tar.gz) = 4c8daf6c1a6efe3860a16fb5b6111ebe65221423254819f3a68a400d0a984fcd -SIZE (PacificBiosciences-pbcopper-0.4.1_GH0.tar.gz) = 3095846 diff --git a/biology/pbcopper/files/patch-meson__options.txt b/biology/pbcopper/files/patch-meson__options.txt deleted file mode 100644 index 6d50fa2bf1da..000000000000 --- a/biology/pbcopper/files/patch-meson__options.txt +++ /dev/null @@ -1,7 +0,0 @@ ---- meson_options.txt.orig 2019-02-17 22:34:29 UTC -+++ meson_options.txt -@@ -1,3 +1,3 @@ - option('build-examples', type : 'boolean', value : true, description : 'Build pbcopper examples') - option('build-docs', type : 'boolean', value : false, description : 'Build pbcopper docs') --option('tests', type : 'boolean', value : true, description : 'Enable dependencies required for testing') -+option('tests', type : 'boolean', value : false, description : 'Enable dependencies required for testing') diff --git a/biology/pbcopper/pkg-descr b/biology/pbcopper/pkg-descr deleted file mode 100644 index 5f3b33b7cfff..000000000000 --- a/biology/pbcopper/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -The pbcopper library provides a suite of data structures, algorithms, and -utilities for C++ applications. It is a core component of Pacific Biosciences -genomics analysis tools. - -WWW: https://github.com/PacificBiosciences/pbcopper diff --git a/biology/pbcopper/pkg-plist b/biology/pbcopper/pkg-plist deleted file mode 100644 index 92caf488a25f..000000000000 --- a/biology/pbcopper/pkg-plist +++ /dev/null @@ -1,78 +0,0 @@ -include/pbcopper/PbcopperConfig.h -include/pbcopper/PbcopperMakeUnique.h -include/pbcopper/align/Seed.h -include/pbcopper/align/Seeds.h -include/pbcopper/align/internal/Seed-inl.h -include/pbcopper/align/internal/Seeds-inl.h -include/pbcopper/cli/CLI.h -include/pbcopper/cli/HelpPrinter.h -include/pbcopper/cli/Interface.h -include/pbcopper/cli/Option.h -include/pbcopper/cli/OptionFlags.h -include/pbcopper/cli/Parser.h -include/pbcopper/cli/PositionalArg.h -include/pbcopper/cli/Results.h -include/pbcopper/cli/SingleDashMode.h -include/pbcopper/cli/VersionPrinter.h -include/pbcopper/cli/internal/Option-inl.h -include/pbcopper/cli/toolcontract/Config.h -include/pbcopper/cli/toolcontract/Driver.h -include/pbcopper/cli/toolcontract/InputFileType.h -include/pbcopper/cli/toolcontract/JsonPrinter.h -include/pbcopper/cli/toolcontract/OutputFileType.h -include/pbcopper/cli/toolcontract/ResolvedToolContract.h -include/pbcopper/cli/toolcontract/ResourceType.h -include/pbcopper/cli/toolcontract/Task.h -include/pbcopper/cli/toolcontract/TaskType.h -include/pbcopper/cli/toolcontract/internal/Driver-inl.h -include/pbcopper/cli/toolcontract/internal/InputFileType-inl.h -include/pbcopper/cli/toolcontract/internal/OutputFileType-inl.h -include/pbcopper/cli/toolcontract/internal/Task-inl.h -include/pbcopper/data/CCSTag.h -include/pbcopper/data/Cigar.h -include/pbcopper/data/CigarOperation.h -include/pbcopper/data/Interval.h -include/pbcopper/data/MovieName.h -include/pbcopper/data/Position.h -include/pbcopper/data/RSMovieName.h -include/pbcopper/data/RSReadName.h -include/pbcopper/data/ReadName.h -include/pbcopper/data/Zmw.h -include/pbcopper/data/internal/CigarOperation-inl.h -include/pbcopper/data/internal/Interval-inl.h -include/pbcopper/data/internal/MovieName-inl.h -include/pbcopper/data/internal/RSMovieName-inl.h -include/pbcopper/data/internal/ReadNameBase-inl.h -include/pbcopper/data/internal/ReadNameBase.h -include/pbcopper/json/JSON.h -include/pbcopper/json/internal/json.hpp -include/pbcopper/logging/Logging.h -include/pbcopper/logging/internal/Logging-inl.h -include/pbcopper/parallel/FireAndForget.h -include/pbcopper/parallel/WorkQueue.h -include/pbcopper/qgram/Index.h -include/pbcopper/qgram/IndexHit.h -include/pbcopper/qgram/IndexHits.h -include/pbcopper/qgram/internal/Hashing-inl.h -include/pbcopper/qgram/internal/Index-inl.h -include/pbcopper/stream/Stream.h -include/pbcopper/utility/CallbackTimer.h -include/pbcopper/utility/EnumClassHash.h -include/pbcopper/utility/FileUtils.h -include/pbcopper/utility/MoveAppend.h -include/pbcopper/utility/PbcopperVersion.h -include/pbcopper/utility/SafeSubtract.h -include/pbcopper/utility/Stopwatch.h -include/pbcopper/utility/StringUtils.h -include/pbcopper/utility/SystemInfo.h -include/pbcopper/utility/Unused.h -include/pbcopper/utility/internal/CallbackTimer-inl.h -include/pbcopper/utility/internal/FileUtils-inl.h -include/pbcopper/utility/internal/Stopwatch-inl.h -include/pbcopper/utility/internal/StringUtils-inl.h -include/pbcopper/utility/internal/SystemInfo-inl.h -lib/libpbcopper.so -lib/libpbcopper.so.0 -lib/libpbcopper.so.0.4 -lib/libpbcopper.so.0.4.1 -libdata/pkgconfig/pbcopper.pc diff --git a/devel/Makefile b/devel/Makefile index 7c667f4b6795..0ea5752cdfca 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -99,7 +99,6 @@ SUBDIR += aarch64-xtoolchain-gcc SUBDIR += abi-compliance-checker SUBDIR += abseil - SUBDIR += ace SUBDIR += acsccid SUBDIR += activitymail SUBDIR += ada-util @@ -230,7 +229,6 @@ SUBDIR += bennugd-modules SUBDIR += bglibs SUBDIR += bicyclerepair - SUBDIR += bin86 SUBDIR += binaryen SUBDIR += bingrep SUBDIR += binutils @@ -609,7 +607,6 @@ SUBDIR += erlang-meck SUBDIR += erlang-metrics SUBDIR += erlang-neotoma - SUBDIR += erlang-oserl SUBDIR += erlang-parse_trans SUBDIR += erlang-poolboy SUBDIR += erlang-pooler diff --git a/devel/ace/Makefile b/devel/ace/Makefile deleted file mode 100644 index 574efea388dd..000000000000 --- a/devel/ace/Makefile +++ /dev/null @@ -1,98 +0,0 @@ -# Created by: Sergey Matveychuk <sem@ciam.ru> -# $FreeBSD$ - -PORTNAME= ace -PORTVERSION= 6.5.2 -PORTREVISION= 2 -CATEGORIES= devel -MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \ - http://download.dre.vanderbilt.edu/previous_versions/ -DISTNAME= ${PORTNAME:tu}-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Adaptive Communication Environment for C++ - -LICENSE= ACE -LICENSE_NAME= ACE -LICENSE_FILE= ${WRKSRC}/COPYING -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 -BROKEN_powerpc= Does not compile on ${ARCH} -BROKEN_sparc64= Does not compile on ${ARCH} - -USES= compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig shebangfix tar:bzip2 -USE_PERL5= build -SHEBANG_FILES= bin/*.pl MPC/*.pl -MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib" ACE_ROOT="${WRKSRC}" \ - CROSS-COMPILE=1 -MAKEFILE= GNUmakefile -USE_LDCONFIG= yes - -WRKSRC= ${WRKDIR}/ACE_wrappers - -PLIST_SUB= VERSION="${PORTVERSION}" - -CONFLICTS= ace+tao-5* - -OPTIONS_DEFINE= FLTK SSL TK TRIO X11 -OPTIONS_DEFAULT= SSL -OPTIONS_SUB= yes - -FLTK_DESC= FLTK GUI toolkit -FLTK_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk -FLTK_MAKE_ENV= fl=1 -SSL_USES= ssl -SSL_MAKE_ENV= ssl=1 -TK_USES= tk -TK_MAKE_ENV= tk=1 -TRIO_DESC= Trio portable string functions -TRIO_BUILD_DEPENDS= trio>=0:devel/trio -TRIO_MAKE_ENV= trio=1 -X11_USES= xorg -X11_USE= XORG=xt -X11_MAKE_ENV= xt=1 - -CPPFLAGS+= -D_WANT_SEMUN - -post-patch: - @${REINPLACE_CMD} -e \ - 's|/$$libdir/pkgconfig|/libdata/pkgconfig|g' \ - ${WRKSRC}/bin/ace_install_pkgconfig.pl - @${REINPLACE_CMD} -i "" -e \ - '/^C[CX]/s|\([[:space:]]\)=|\1?=| ; \ - s|/usr/local|${LOCALBASE}| ; \ - s|/usr/X11R6|${LOCALBASE}|' \ - ${WRKSRC}/include/makeinclude/platform_freebsd.GNU - -do-configure: - @cd ${WRKSRC}/ace \ - && ${ECHO_CMD} "#include <ace/config-${OPSYS:tl}.h>" >> config.h - @cd ${WRKSRC}/include/makeinclude \ - && ${ECHO_CMD} "include \$$(ACE_ROOT)/include/makeinclude/platform_${OPSYS:tl}.GNU" >> platform_macros.GNU \ - && ${ECHO_CMD} "CC= ${CC}" >> platform_macros.GNU \ - && ${ECHO_CMD} "CXX= ${CXX}" >> platform_macros.GNU \ - && ${ECHO_CMD} "CPPFLAGS= ${CPPFLAGS}" >> platform_macros.GNU \ - && ${ECHO_CMD} "LDFLAGS= ${LDFLAGS}" >> platform_macros.GNU \ - && ${ECHO_CMD} "DCFLAGS=" >> platform_macros.GNU \ - && ${ECHO_CMD} "OCFLAGS= ${CFLAGS}" >> platform_macros.GNU \ - && ${ECHO_CMD} "INSTALL_PREFIX= ${PREFIX}" >> platform_macros.GNU \ - && ${ECHO_CMD} "PLATFORM_TK_CPPFLAGS= \$$(shell . ${TK_LIBDIR}/tkConfig.sh && ${ECHO_CMD} -n \$$\$$TK_INCLUDE_SPEC)" >> platform_macros.GNU \ - && ${ECHO_CMD} "PLATFORM_TK_LIBS= \$$(shell . ${TK_LIBDIR}/tkConfig.sh && ${ECHO_CMD} -n \$$\$$TK_LIB_FLAG)" >> platform_macros.GNU \ - && ${ECHO_CMD} "PLATFORM_TCL_CPPFLAGS= \$$(shell . ${TCL_LIBDIR}/tclConfig.sh && ${ECHO_CMD} -n \$$\$$TCL_INCLUDE_SPEC)" >> platform_macros.GNU \ - && ${ECHO_CMD} "PLATFORM_TCL_LIBS= \$$(shell . ${TCL_LIBDIR}/tclConfig.sh && ${ECHO_CMD} -n \$$\$$TCL_LIB_FLAG)" >> platform_macros.GNU - -post-install: - @for f in `${LS} -d \ - ${STAGEDIR}${PREFIX}/lib/libACE*.so.${PORTVERSION} \ - ${STAGEDIR}${PREFIX}/lib/libJAWS.so.${PORTVERSION} \ - ${STAGEDIR}${PREFIX}/lib/libKokyu.so.${PORTVERSION} \ - | ${XARGS} ${BASENAME}`; do \ - n=`${ECHO_CMD} $${f}|${SED} -e 's/.so.${PORTVERSION}/.so/'`; \ - ${LN} -sf $${n}.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/$${n}.6; \ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/$${n}.${PORTVERSION}; \ - done - -.include <bsd.port.mk> diff --git a/devel/ace/distinfo b/devel/ace/distinfo deleted file mode 100644 index 3182092e8270..000000000000 --- a/devel/ace/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1537466321 -SHA256 (ACE-6.5.2.tar.bz2) = f0393d6df25ee92e0cbc6539c68ccf122caae0ffd5ae9a786163403bb2306cc5 -SIZE (ACE-6.5.2.tar.bz2) = 8074873 diff --git a/devel/ace/files/patch-ace-os_include-os_pthread.h b/devel/ace/files/patch-ace-os_include-os_pthread.h deleted file mode 100644 index b2051ef82b2d..000000000000 --- a/devel/ace/files/patch-ace-os_include-os_pthread.h +++ /dev/null @@ -1,14 +0,0 @@ ---- ace/os_include/os_pthread.h.orig 2015-09-17 06:55:18 UTC -+++ ace/os_include/os_pthread.h -@@ -277,7 +277,11 @@ - # undef THR_DAEMON - - # define THR_BOUND 0x00000001 -+# if defined(__FreeBSD__) -+# define THR_NEW_LWP 0x00000000 -+# else - # define THR_NEW_LWP 0x00000002 -+# endif - # define THR_DAEMON 0x00000010 - # define THR_DETACHED 0x00000040 - # define THR_SUSPENDED 0x00000080 diff --git a/devel/ace/files/patch-ace__OS_NS_Thread.h b/devel/ace/files/patch-ace__OS_NS_Thread.h deleted file mode 100644 index e8e888971a82..000000000000 --- a/devel/ace/files/patch-ace__OS_NS_Thread.h +++ /dev/null @@ -1,15 +0,0 @@ ---- ace/OS_NS_Thread.h.orig 2015-09-17 06:55:18 UTC -+++ ace/OS_NS_Thread.h -@@ -42,6 +42,12 @@ - # endif /* VxWorks and ! SMP */ - #endif - -+# include <sys/param.h> -+#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 700110 && __FreeBSD_version < 800000) || __FreeBSD_version >= 800024)) -+# include <sys/cpuset.h> -+# define cpu_set_t cpuset_t -+#endif -+ - # if defined (ACE_EXPORT_MACRO) - # undef ACE_EXPORT_MACRO - # endif diff --git a/devel/ace/files/patch-ace__OS_NS_netdb.inl b/devel/ace/files/patch-ace__OS_NS_netdb.inl deleted file mode 100644 index 4a689fbf0172..000000000000 --- a/devel/ace/files/patch-ace__OS_NS_netdb.inl +++ /dev/null @@ -1,56 +0,0 @@ ---- ace/OS_NS_netdb.inl.orig 2015-09-17 06:55:18 UTC -+++ ace/OS_NS_netdb.inl -@@ -3,6 +3,8 @@ - #include "ace/OS_NS_string.h" - #include "ace/OS_NS_errno.h" - -+#include <sys/param.h> -+ - #if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) - # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && !defined (HPUX_11) - # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ -@@ -116,7 +118,7 @@ ACE_OS::gethostbyaddr_r (const char *add - *h_errnop = h_errno; - return (struct hostent *) 0; - } --# elif defined (__GLIBC__) -+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015) - // GNU C library has a different signature - ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); - -@@ -301,7 +303,7 @@ ACE_OS::gethostbyname_r (const char *nam - *h_errnop = h_errno; - return (struct hostent *) 0; - } --# elif defined (__GLIBC__) -+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015) - // GNU C library has a different signature - ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); - -@@ -514,7 +516,7 @@ ACE_OS::getprotobyname_r (const char *na - else - return 0; - //FUZZ: enable check_for_lack_ACE_OS --# elif defined (__GLIBC__) -+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015) - // GNU C library has a different signature - //FUZZ: disable check_for_lack_ACE_OS - if (::getprotobyname_r (name, -@@ -595,7 +597,7 @@ ACE_OS::getprotobynumber_r (int proto, - //FUZZ: enable check_for_lack_ACE_OS - else - return 0; --# elif defined (__GLIBC__) -+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015) - // GNU C library has a different signature - //FUZZ: disable check_for_lack_ACE_OS - if (::getprotobynumber_r (proto, -@@ -681,7 +683,7 @@ ACE_OS::getservbyname_r (const char *svc - //FUZZ: enable check_for_lack_ACE_OS - else - return (struct servent *) 0; --# elif defined (__GLIBC__) -+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015) - // GNU C library has a different signature - ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); - diff --git a/devel/ace/files/patch-ace__OS_NS_signal.h b/devel/ace/files/patch-ace__OS_NS_signal.h deleted file mode 100644 index 15976763deb7..000000000000 --- a/devel/ace/files/patch-ace__OS_NS_signal.h +++ /dev/null @@ -1,16 +0,0 @@ ---- ace/OS_NS_signal.h.orig 2015-09-17 06:55:18 UTC -+++ ace/OS_NS_signal.h -@@ -31,10 +31,10 @@ - #endif - #define ACE_EXPORT_MACRO ACE_Export - --#if defined (__Lynx__) || defined (__OpenBSD__) --// LynxOS and OpenBSD define pthread_sigmask() in pthread.h -+#if defined (__Lynx__) || defined (__OpenBSD__) || defined (__FreeBSD__) -+// LynxOS, OpenBSD and FreeBSD define pthread_sigmask() in pthread.h - # include "ace/os_include/os_pthread.h" --#endif /* __Lynx__ || OpenBSD */ -+#endif /* __Lynx__ || OpenBSD || FreeBSD */ - - /* - * We inline and undef some functions that may be implemented diff --git a/devel/ace/files/patch-ace__SSL__SSL_Context.cpp b/devel/ace/files/patch-ace__SSL__SSL_Context.cpp deleted file mode 100644 index 8b6f4c77d422..000000000000 --- a/devel/ace/files/patch-ace__SSL__SSL_Context.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ace/SSL/SSL_Context.cpp.orig 2018-09-18 07:26:56 UTC -+++ ace/SSL/SSL_Context.cpp -@@ -179,7 +179,7 @@ ACE_SSL_Context::ssl_library_init (void) - # endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - #endif /* WIN32 */ - --#if OPENSSL_VERSION_NUMBER >= 0x00905100L -+#if OPENSSL_VERSION_NUMBER < 0x00905100L || defined(LIBRESSL_VERSION_NUMBER) - // OpenSSL < 0.9.5 doesn't have EGD support. - - const char *egd_socket_file = diff --git a/devel/ace/files/patch-tests_Chrono__Test.cpp b/devel/ace/files/patch-tests_Chrono__Test.cpp deleted file mode 100644 index f16ca90e938e..000000000000 --- a/devel/ace/files/patch-tests_Chrono__Test.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/Chrono_Test.cpp.orig 2018-10-05 15:55:54 UTC -+++ tests/Chrono_Test.cpp -@@ -208,7 +208,7 @@ test_streamers () - std::chrono::seconds day_test_ts { day_test_h+day_test_s }; - std::chrono::microseconds day_test_tus { day_test_ms+day_test_us }; - ACE_Time_Value const test_day { -- ACE_Time_Value { day_test_ts.count (), ACE_Utils::truncate_cast<suseconds_t>(day_test_tus.count ()) }}; -+ ACE_Time_Value { (int)(day_test_ts.count ()), ACE_Utils::truncate_cast<suseconds_t>(day_test_tus.count ()) }}; - - constexpr int expected_min {nr_hours * 60}; - constexpr int64_t expected_sec { expected_min * 60 + 54 }; diff --git a/devel/ace/pkg-descr b/devel/ace/pkg-descr deleted file mode 100644 index 7d0d3595221b..000000000000 --- a/devel/ace/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The ADAPTIVE Communication Environment (ACE) is an object-oriented -(OO) toolkit that implements fundamental design patterns for -communication software. ACE provides a rich set of reusable C++ -wrappers and frameworks that perform common communication software -tasks across a range of OS platforms. - -WWW: http://www.cs.wustl.edu/~schmidt/ACE.html diff --git a/devel/ace/pkg-plist b/devel/ace/pkg-plist deleted file mode 100644 index 511cd31ad0ca..000000000000 --- a/devel/ace/pkg-plist +++ /dev/null @@ -1,1571 +0,0 @@ -include/ACEXML/apps/svcconf/Svcconf.h -include/ACEXML/apps/svcconf/Svcconf_Handler.h -include/ACEXML/apps/svcconf/Svcconf_Handler.inl -include/ACEXML/common/ACEXML_Export.h -include/ACEXML/common/Attributes.h -include/ACEXML/common/AttributesImpl.h -include/ACEXML/common/AttributesImpl.inl -include/ACEXML/common/Attributes_Def_Builder.h -include/ACEXML/common/CharStream.h -include/ACEXML/common/ContentHandler.h -include/ACEXML/common/DTDHandler.h -include/ACEXML/common/DTD_Manager.h -include/ACEXML/common/DefaultHandler.h -include/ACEXML/common/Element_Def_Builder.h -include/ACEXML/common/Encoding.h -include/ACEXML/common/EntityResolver.h -include/ACEXML/common/ErrorHandler.h -include/ACEXML/common/Exception.h -include/ACEXML/common/Exception.inl -include/ACEXML/common/FileCharStream.h -include/ACEXML/common/HttpCharStream.h -include/ACEXML/common/InputSource.h -include/ACEXML/common/Locator.h -include/ACEXML/common/LocatorImpl.h -include/ACEXML/common/LocatorImpl.inl -include/ACEXML/common/Mem_Map_Stream.h -include/ACEXML/common/NamespaceSupport.h -include/ACEXML/common/SAXExceptions.h -include/ACEXML/common/SAXExceptions.inl -include/ACEXML/common/StrCharStream.h -include/ACEXML/common/StreamFactory.h -include/ACEXML/common/Transcode.h -include/ACEXML/common/URL_Addr.h -include/ACEXML/common/URL_Addr.inl -include/ACEXML/common/Validator.h -include/ACEXML/common/XMLFilter.h -include/ACEXML/common/XMLFilterImpl.h -include/ACEXML/common/XMLFilterImpl.inl -include/ACEXML/common/XMLReader.h -include/ACEXML/common/XML_Codecs.h -include/ACEXML/common/XML_Types.h -include/ACEXML/common/XML_Util.h -include/ACEXML/common/ZipCharStream.h -include/ACEXML/parser/parser/Entity_Manager.h -include/ACEXML/parser/parser/Entity_Manager.inl -include/ACEXML/parser/parser/Parser.h -include/ACEXML/parser/parser/Parser.inl -include/ACEXML/parser/parser/ParserContext.h -include/ACEXML/parser/parser/ParserContext.inl -include/ACEXML/parser/parser/ParserInternals.h -include/ACEXML/parser/parser/Parser_export.h -include/JAWS/server/HTTP_Config.h -include/JAWS/server/HTTP_Handler.h -include/JAWS/server/HTTP_Helpers.h -include/JAWS/server/HTTP_Request.h -include/JAWS/server/HTTP_Response.h -include/JAWS/server/HTTP_Server.h -include/JAWS/server/JAWS_Concurrency.h -include/JAWS/server/JAWS_IO.h -include/JAWS/server/JAWS_Pipeline.h -include/JAWS/server/Parse_Headers.h -include/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp -include/Kokyu/DSRT_CV_Dispatcher_Impl_T.h -include/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp -include/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h -include/Kokyu/DSRT_Dispatch_Item_T.cpp -include/Kokyu/DSRT_Dispatch_Item_T.h -include/Kokyu/DSRT_Dispatch_Item_T.inl -include/Kokyu/DSRT_Dispatcher_Impl_T.cpp -include/Kokyu/DSRT_Dispatcher_Impl_T.h -include/Kokyu/DSRT_Dispatcher_Impl_T.inl -include/Kokyu/DSRT_Sched_Queue_T.cpp -include/Kokyu/DSRT_Sched_Queue_T.h -include/Kokyu/Default_Dispatcher_Impl.h -include/Kokyu/Default_Dispatcher_Impl.inl -include/Kokyu/Dispatcher_Impl.h -include/Kokyu/Dispatcher_Impl.inl -include/Kokyu/Dispatcher_Task.h -include/Kokyu/Dispatcher_Task.inl -include/Kokyu/Kokyu.h -include/Kokyu/Kokyu.inl -include/Kokyu/Kokyu_defs.h -include/Kokyu/Kokyu_defs.inl -include/Kokyu/Kokyu_dsrt.cpp -include/Kokyu/Kokyu_dsrt.h -include/Kokyu/Kokyu_dsrt.inl -include/Kokyu/kokyu_config.h -include/Kokyu/kokyu_export.h -include/ace/ACE.h -include/ace/ACE.inl -include/ace/ACE_export.h -include/ace/ARGV.cpp -include/ace/ARGV.h -include/ace/ARGV.inl -include/ace/ATM_Acceptor.h -include/ace/ATM_Acceptor.inl -include/ace/ATM_Addr.h -include/ace/ATM_Addr.inl -include/ace/ATM_Connector.h -include/ace/ATM_Connector.inl -include/ace/ATM_Params.h -include/ace/ATM_Params.inl -include/ace/ATM_QoS.h -include/ace/ATM_QoS.inl -include/ace/ATM_Stream.h -include/ace/ATM_Stream.inl -include/ace/Abstract_Timer_Queue.cpp -include/ace/Abstract_Timer_Queue.h -include/ace/Acceptor.cpp -include/ace/Acceptor.h -include/ace/Activation_Queue.h -include/ace/Activation_Queue.inl -include/ace/Active_Map_Manager.h -include/ace/Active_Map_Manager.inl -include/ace/Active_Map_Manager_T.cpp -include/ace/Active_Map_Manager_T.h -include/ace/Active_Map_Manager_T.inl -include/ace/Addr.h -include/ace/Addr.inl -include/ace/Arg_Shifter.cpp -include/ace/Arg_Shifter.h -include/ace/Argv_Type_Converter.h -include/ace/Argv_Type_Converter.inl -include/ace/Array_Base.cpp -include/ace/Array_Base.h -include/ace/Array_Base.inl -include/ace/Array_Map.cpp -include/ace/Array_Map.h -include/ace/Array_Map.inl -include/ace/Assert.h -include/ace/Asynch_Acceptor.cpp -include/ace/Asynch_Acceptor.h -include/ace/Asynch_Connector.cpp -include/ace/Asynch_Connector.h -include/ace/Asynch_IO.h -include/ace/Asynch_IO_Impl.h -include/ace/Asynch_IO_Impl.inl -include/ace/Asynch_Pseudo_Task.h -include/ace/Atomic_Op.h -include/ace/Atomic_Op.inl -include/ace/Atomic_Op_GCC_T.cpp -include/ace/Atomic_Op_GCC_T.h -include/ace/Atomic_Op_GCC_T.inl -include/ace/Atomic_Op_Sparc.h -include/ace/Atomic_Op_T.cpp -include/ace/Atomic_Op_T.h -include/ace/Atomic_Op_T.inl -include/ace/Auto_Event.cpp -include/ace/Auto_Event.h -include/ace/Auto_Event.inl -include/ace/Auto_Functor.cpp -include/ace/Auto_Functor.h -include/ace/Auto_Functor.inl -include/ace/Auto_IncDec_T.cpp -include/ace/Auto_IncDec_T.h -include/ace/Auto_IncDec_T.inl -include/ace/Auto_Ptr.cpp -include/ace/Auto_Ptr.h -include/ace/Auto_Ptr.inl -include/ace/Barrier.h -include/ace/Barrier.inl -include/ace/Base_Thread_Adapter.h -include/ace/Base_Thread_Adapter.inl -include/ace/Based_Pointer_Repository.h -include/ace/Based_Pointer_T.cpp -include/ace/Based_Pointer_T.h -include/ace/Based_Pointer_T.inl -include/ace/Basic_Stats.h -include/ace/Basic_Stats.inl -include/ace/Basic_Types.h -include/ace/Bound_Ptr.cpp -include/ace/Bound_Ptr.h -include/ace/Bound_Ptr.inl -include/ace/CDR_Base.h -include/ace/CDR_Base.inl -include/ace/CDR_Size.h -include/ace/CDR_Size.inl -include/ace/CDR_Stream.h -include/ace/CDR_Stream.inl -include/ace/CE_Screen_Output.h -include/ace/CORBA_macros.h -include/ace/Cache_Map_Manager_T.cpp -include/ace/Cache_Map_Manager_T.h -include/ace/Cache_Map_Manager_T.inl -include/ace/Cached_Connect_Strategy_T.cpp -include/ace/Cached_Connect_Strategy_T.h -include/ace/Caching_Strategies_T.cpp -include/ace/Caching_Strategies_T.h -include/ace/Caching_Strategies_T.inl -include/ace/Caching_Utility_T.cpp -include/ace/Caching_Utility_T.h -include/ace/Capabilities.h -include/ace/Capabilities.inl -include/ace/Cleanup.h -include/ace/Cleanup.inl -include/ace/Cleanup_Strategies_T.cpp -include/ace/Cleanup_Strategies_T.h -include/ace/Codecs.h -include/ace/Codeset_IBM1047.h -include/ace/Codeset_Registry.h -include/ace/Codeset_Registry.inl -include/ace/Codeset_Symbols.h -include/ace/Compression/ACE_Compression_export.h -include/ace/Compression/Compressor.h -include/ace/Compression/Compressor.inl -include/ace/Compression/rle/ACE_RLECompression_export.h -include/ace/Compression/rle/RLECompressor.h -include/ace/Condition_Attributes.h -include/ace/Condition_Attributes.inl -include/ace/Condition_Recursive_Thread_Mutex.h -include/ace/Condition_T.cpp -include/ace/Condition_T.h -include/ace/Condition_T.inl -include/ace/Condition_Thread_Mutex.h -include/ace/Condition_Thread_Mutex.inl -include/ace/Configuration.h -include/ace/Configuration.inl -include/ace/Configuration_Import_Export.h -include/ace/Connection_Recycling_Strategy.h -include/ace/Connector.cpp -include/ace/Connector.h -include/ace/Containers.h -include/ace/Containers.inl -include/ace/Containers_T.cpp -include/ace/Containers_T.h -include/ace/Containers_T.inl -include/ace/Copy_Disabled.h -include/ace/Countdown_Time.h -include/ace/Countdown_Time_T.cpp -include/ace/Countdown_Time_T.h -include/ace/Countdown_Time_T.inl -include/ace/DEV.h -include/ace/DEV.inl -include/ace/DEV_Addr.h -include/ace/DEV_Addr.inl -include/ace/DEV_Connector.h -include/ace/DEV_Connector.inl -include/ace/DEV_IO.h -include/ace/DEV_IO.inl -include/ace/DLL.h -include/ace/DLL_Manager.h -include/ace/Date_Time.h -include/ace/Date_Time.inl -include/ace/Default_Constants.h -include/ace/Dev_Poll_Reactor.h -include/ace/Dev_Poll_Reactor.inl -include/ace/Dirent.h -include/ace/Dirent.inl -include/ace/Dirent_Selector.h -include/ace/Dirent_Selector.inl -include/ace/Dump.h -include/ace/Dump_T.cpp -include/ace/Dump_T.h -include/ace/Dynamic.h -include/ace/Dynamic.inl -include/ace/Dynamic_Message_Strategy.h -include/ace/Dynamic_Message_Strategy.inl -include/ace/Dynamic_Service.cpp -include/ace/Dynamic_Service.h -include/ace/Dynamic_Service.inl -include/ace/Dynamic_Service_Base.h -include/ace/Dynamic_Service_Dependency.h -include/ace/ETCL/ETCL_Constraint.h -include/ace/ETCL/ETCL_Constraint.inl -include/ace/ETCL/ETCL_Constraint_Visitor.h -include/ace/ETCL/ETCL_Interpreter.h -include/ace/ETCL/ETCL_y.h -include/ace/ETCL/ace_etcl_export.h -include/ace/ETCL/etcl_parser_export.h -include/ace/Encoding_Converter.h -include/ace/Encoding_Converter_Factory.h -include/ace/Env_Value_T.cpp -include/ace/Env_Value_T.h -include/ace/Env_Value_T.inl -include/ace/Event.cpp -include/ace/Event.h -include/ace/Event.inl -include/ace/Event_Base.h -include/ace/Event_Base.inl -include/ace/Event_Handler.h -include/ace/Event_Handler.inl -include/ace/Event_Handler_Handle_Timeout_Upcall.h -include/ace/Event_Handler_Handle_Timeout_Upcall.inl -include/ace/Event_Handler_T.cpp -include/ace/Event_Handler_T.h -include/ace/Event_Handler_T.inl -include/ace/FIFO.h -include/ace/FIFO.inl -include/ace/FIFO_Recv.h -include/ace/FIFO_Recv.inl -include/ace/FIFO_Recv_Msg.h -include/ace/FIFO_Recv_Msg.inl -include/ace/FIFO_Send.h -include/ace/FIFO_Send.inl -include/ace/FIFO_Send_Msg.h -include/ace/FIFO_Send_Msg.inl -include/ace/FILE.h -include/ace/FILE.inl -include/ace/FILE_Addr.h -include/ace/FILE_Addr.inl -include/ace/FILE_Connector.h -include/ace/FILE_Connector.inl -include/ace/FILE_IO.h -include/ace/FILE_IO.inl -include/ace/File_Lock.h -include/ace/File_Lock.inl -include/ace/Filecache.h -%%FLTK%%include/ace/FlReactor/ACE_FlReactor_export.h -%%FLTK%%include/ace/FlReactor/FlReactor.h -include/ace/Flag_Manip.h -include/ace/Flag_Manip.inl -include/ace/Framework_Component.h -include/ace/Framework_Component.inl -include/ace/Framework_Component_T.cpp -include/ace/Framework_Component_T.h -include/ace/Free_List.cpp -include/ace/Free_List.h -include/ace/Functor.h -include/ace/Functor.inl -include/ace/Functor_String.h -include/ace/Functor_String.inl -include/ace/Functor_T.cpp -include/ace/Functor_T.h -include/ace/Functor_T.inl -include/ace/Future.cpp -include/ace/Future.h -include/ace/Future_Set.cpp -include/ace/Future_Set.h -include/ace/Get_Opt.h -include/ace/Get_Opt.inl -include/ace/Global_Macros.h -include/ace/Guard_T.cpp -include/ace/Guard_T.h -include/ace/Guard_T.inl -include/ace/HTBP/HTBP_Addr.h -include/ace/HTBP/HTBP_Channel.h -include/ace/HTBP/HTBP_Channel.inl -include/ace/HTBP/HTBP_Environment.h -include/ace/HTBP/HTBP_Export.h -include/ace/HTBP/HTBP_Filter.h -include/ace/HTBP/HTBP_Filter.inl -include/ace/HTBP/HTBP_Filter_Factory.h -include/ace/HTBP/HTBP_ID_Requestor.h -include/ace/HTBP/HTBP_Inside_Squid_Filter.h -include/ace/HTBP/HTBP_Inside_Squid_Filter.inl -include/ace/HTBP/HTBP_Macros.h -include/ace/HTBP/HTBP_Notifier.h -include/ace/HTBP/HTBP_Outside_Squid_Filter.h -include/ace/HTBP/HTBP_Outside_Squid_Filter.inl -include/ace/HTBP/HTBP_Session.h -include/ace/HTBP/HTBP_Session.inl -include/ace/HTBP/HTBP_Stream.h -include/ace/Handle_Gobbler.h -include/ace/Handle_Gobbler.inl -include/ace/Handle_Ops.h -include/ace/Handle_Set.h -include/ace/Handle_Set.inl -include/ace/Hash_Cache_Map_Manager_T.cpp -include/ace/Hash_Cache_Map_Manager_T.h -include/ace/Hash_Cache_Map_Manager_T.inl -include/ace/Hash_Map_Manager.h -include/ace/Hash_Map_Manager_T.cpp -include/ace/Hash_Map_Manager_T.h -include/ace/Hash_Map_Manager_T.inl -include/ace/Hash_Map_With_Allocator_T.cpp -include/ace/Hash_Map_With_Allocator_T.h -include/ace/Hash_Map_With_Allocator_T.inl -include/ace/Hash_Multi_Map_Manager_T.cpp -include/ace/Hash_Multi_Map_Manager_T.h -include/ace/Hash_Multi_Map_Manager_T.inl -include/ace/Hashable.h -include/ace/Hashable.inl -include/ace/High_Res_Timer.h -include/ace/High_Res_Timer.inl -include/ace/ICMP_Socket.h -include/ace/INET_Addr.h -include/ace/INET_Addr.inl -include/ace/INet/AuthenticationBase.h -include/ace/INet/AuthenticationBase.inl -include/ace/INet/BidirStreamBuffer.cpp -include/ace/INet/BidirStreamBuffer.h -include/ace/INet/BufferedStreamBuffer.cpp -include/ace/INet/BufferedStreamBuffer.h -include/ace/INet/ClientRequestHandler.h -include/ace/INet/ClientRequestHandler.inl -include/ace/INet/ConnectionCache.h -include/ace/INet/ConnectionCache.inl -include/ace/INet/FTP_ClientRequestHandler.h -include/ace/INet/FTP_ClientRequestHandler.inl -include/ace/INet/FTP_IOStream.h -include/ace/INet/FTP_IOStream.inl -include/ace/INet/FTP_Request.h -include/ace/INet/FTP_Request.inl -include/ace/INet/FTP_Response.h -include/ace/INet/FTP_Response.inl -include/ace/INet/FTP_Session.cpp -include/ace/INet/FTP_Session.h -include/ace/INet/FTP_URL.h -include/ace/INet/FTP_URL.inl -%%SSL%%include/ace/INet/HTTPS_Context.h -%%SSL%%include/ace/INet/HTTPS_Context.inl -%%SSL%%include/ace/INet/HTTPS_Session.cpp -%%SSL%%include/ace/INet/HTTPS_Session.h -%%SSL%%include/ace/INet/HTTPS_SessionFactory.h -%%SSL%%include/ace/INet/HTTPS_URL.h -%%SSL%%include/ace/INet/HTTPS_URL.inl -include/ace/INet/HTTP_BasicAuthentication.h -include/ace/INet/HTTP_BasicAuthentication.inl -include/ace/INet/HTTP_ClientRequestHandler.h -include/ace/INet/HTTP_ClientRequestHandler.inl -include/ace/INet/HTTP_Header.h -include/ace/INet/HTTP_Header.inl -include/ace/INet/HTTP_IOStream.h -include/ace/INet/HTTP_IOStream.inl -include/ace/INet/HTTP_Request.h -include/ace/INet/HTTP_Request.inl -include/ace/INet/HTTP_Response.h -include/ace/INet/HTTP_Response.inl -include/ace/INet/HTTP_Session.cpp -include/ace/INet/HTTP_Session.h -include/ace/INet/HTTP_SessionBase.h -include/ace/INet/HTTP_SessionBase.inl -include/ace/INet/HTTP_Status.h -include/ace/INet/HTTP_Status.inl -include/ace/INet/HTTP_StreamPolicy.cpp -include/ace/INet/HTTP_StreamPolicy.h -include/ace/INet/HTTP_StreamPolicyBase.cpp -include/ace/INet/HTTP_StreamPolicyBase.h -include/ace/INet/HTTP_URL.h -include/ace/INet/HTTP_URL.inl -include/ace/INet/HeaderBase.h -include/ace/INet/HeaderBase.inl -include/ace/INet/INet_Export.h -include/ace/INet/INet_Log.h -%%SSL%%include/ace/INet/INet_SSL_Export.h -include/ace/INet/IOS_util.h -include/ace/INet/Request.h -include/ace/INet/RequestHandler.h -include/ace/INet/Response.h -%%SSL%%include/ace/INet/SSLSock_IOStream.cpp -%%SSL%%include/ace/INet/SSLSock_IOStream.h -%%SSL%%include/ace/INet/SSL_CallbackManager.h -%%SSL%%include/ace/INet/SSL_CallbackManager.inl -%%SSL%%include/ace/INet/SSL_CertificateCallback.h -%%SSL%%include/ace/INet/SSL_CertificateCallback.inl -%%SSL%%include/ace/INet/SSL_PasswordCallback.h -%%SSL%%include/ace/INet/SSL_Proxy_Connector.h -%%SSL%%include/ace/INet/SSL_X509Cert.h -%%SSL%%include/ace/INet/SSL_X509Cert.inl -include/ace/INet/Sock_IOStream.cpp -include/ace/INet/Sock_IOStream.h -include/ace/INet/StreamHandler.cpp -include/ace/INet/StreamHandler.h -include/ace/INet/StreamInterceptor.cpp -include/ace/INet/StreamInterceptor.h -include/ace/INet/String_IOStream.cpp -include/ace/INet/String_IOStream.h -include/ace/INet/URLBase.h -include/ace/INet/URLBase.inl -include/ace/IOStream.h -include/ace/IOStream_T.cpp -include/ace/IOStream_T.h -include/ace/IOStream_T.inl -include/ace/IO_Cntl_Msg.h -include/ace/IO_Cntl_Msg.inl -include/ace/IO_SAP.h -include/ace/IO_SAP.inl -include/ace/IPC_SAP.h -include/ace/IPC_SAP.inl -include/ace/If_Then_Else.h -include/ace/Init_ACE.h -include/ace/Intrusive_Auto_Ptr.cpp -include/ace/Intrusive_Auto_Ptr.h -include/ace/Intrusive_Auto_Ptr.inl -include/ace/Intrusive_List.cpp -include/ace/Intrusive_List.h -include/ace/Intrusive_List.inl -include/ace/Intrusive_List_Node.cpp -include/ace/Intrusive_List_Node.h -include/ace/Intrusive_List_Node.inl -include/ace/LOCK_SOCK_Acceptor.cpp -include/ace/LOCK_SOCK_Acceptor.h -include/ace/LSOCK.h -include/ace/LSOCK.inl -include/ace/LSOCK_Acceptor.h -include/ace/LSOCK_CODgram.h -include/ace/LSOCK_CODgram.inl -include/ace/LSOCK_Connector.h -include/ace/LSOCK_Connector.inl -include/ace/LSOCK_Dgram.h -include/ace/LSOCK_Dgram.inl -include/ace/LSOCK_Stream.h -include/ace/LSOCK_Stream.inl -include/ace/Lib_Find.h -include/ace/Local_Memory_Pool.h -include/ace/Local_Name_Space.h -include/ace/Local_Name_Space_T.cpp -include/ace/Local_Name_Space_T.h -include/ace/Local_Tokens.h -include/ace/Local_Tokens.inl -include/ace/Lock.h -include/ace/Lock.inl -include/ace/Lock_Adapter_T.cpp -include/ace/Lock_Adapter_T.h -include/ace/Lock_Adapter_T.inl -include/ace/Log_Category.h -include/ace/Log_Category.inl -include/ace/Log_Msg.h -include/ace/Log_Msg.inl -include/ace/Log_Msg_Backend.h -include/ace/Log_Msg_Callback.h -include/ace/Log_Msg_IPC.h -include/ace/Log_Msg_NT_Event_Log.h -include/ace/Log_Msg_UNIX_Syslog.h -include/ace/Log_Priority.h -include/ace/Log_Record.h -include/ace/Log_Record.inl -include/ace/Logging_Strategy.h -include/ace/MEM_Acceptor.h -include/ace/MEM_Acceptor.inl -include/ace/MEM_Addr.h -include/ace/MEM_Addr.inl -include/ace/MEM_Connector.h -include/ace/MEM_Connector.inl -include/ace/MEM_IO.h -include/ace/MEM_IO.inl -include/ace/MEM_SAP.h -include/ace/MEM_SAP.inl -include/ace/MEM_Stream.h -include/ace/MEM_Stream.inl -include/ace/MMAP_Memory_Pool.h -include/ace/MMAP_Memory_Pool.inl -include/ace/Malloc.h -include/ace/Malloc.inl -include/ace/Malloc_Allocator.h -include/ace/Malloc_Allocator.inl -include/ace/Malloc_Base.h -include/ace/Malloc_T.cpp -include/ace/Malloc_T.h -include/ace/Malloc_T.inl -include/ace/Managed_Object.cpp -include/ace/Managed_Object.h -include/ace/Managed_Object.inl -include/ace/Manual_Event.cpp -include/ace/Manual_Event.h -include/ace/Manual_Event.inl -include/ace/Map_Manager.cpp -include/ace/Map_Manager.h -include/ace/Map_Manager.inl -include/ace/Map_T.cpp -include/ace/Map_T.h -include/ace/Map_T.inl -include/ace/Mem_Map.h -include/ace/Mem_Map.inl -include/ace/Memory_Pool.h -include/ace/Message_Block.h -include/ace/Message_Block.inl -include/ace/Message_Block_T.cpp -include/ace/Message_Block_T.h -include/ace/Message_Block_T.inl -include/ace/Message_Queue.h -include/ace/Message_Queue.inl -include/ace/Message_Queue_NT.h -include/ace/Message_Queue_NT.inl -include/ace/Message_Queue_T.cpp -include/ace/Message_Queue_T.h -include/ace/Message_Queue_Vx.h -include/ace/Message_Queue_Vx.inl -include/ace/Method_Request.h -include/ace/Metrics_Cache.h -include/ace/Metrics_Cache_T.cpp -include/ace/Metrics_Cache_T.h -include/ace/Metrics_Cache_T.inl -include/ace/Min_Max.h -include/ace/Module.cpp -include/ace/Module.h -include/ace/Module.inl -include/ace/Monitor_Admin.h -include/ace/Monitor_Admin_Manager.h -include/ace/Monitor_Base.h -include/ace/Monitor_Base.inl -include/ace/Monitor_Control/Auto_Update_Starter.h -include/ace/Monitor_Control/BSD_Network_Interface_Monitor.h -include/ace/Monitor_Control/Bytes_Received_Monitor.h -include/ace/Monitor_Control/Bytes_Sent_Monitor.h -include/ace/Monitor_Control/CPU_Load_Monitor.h -include/ace/Monitor_Control/Constraint_Interpreter.h -include/ace/Monitor_Control/Constraint_Visitor.h -include/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h -include/ace/Monitor_Control/Linux_Network_Interface_Monitor.h -include/ace/Monitor_Control/Memory_Usage_Monitor.h -include/ace/Monitor_Control/Monitor_Control.h -include/ace/Monitor_Control/Monitor_Control_export.h -include/ace/Monitor_Control/Monitor_Control_utils.h -include/ace/Monitor_Control/Monitor_Group.h -include/ace/Monitor_Control/Monitor_Query.h -include/ace/Monitor_Control/Null_Network_Interface_Monitor.h -include/ace/Monitor_Control/Num_Threads_Monitor.h -include/ace/Monitor_Control/Packets_Received_Monitor.h -include/ace/Monitor_Control/Packets_Sent_Monitor.h -include/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h -include/ace/Monitor_Control/Windows_Monitor.h -include/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h -include/ace/Monitor_Control_Action.h -include/ace/Monitor_Control_Types.h -include/ace/Monitor_Point_Registry.h -include/ace/Monitor_Size.h -include/ace/Monotonic_Time_Policy.h -include/ace/Monotonic_Time_Policy.inl -include/ace/Msg_WFMO_Reactor.h -include/ace/Msg_WFMO_Reactor.inl -include/ace/Multihomed_INET_Addr.h -include/ace/Multihomed_INET_Addr.inl -include/ace/Mutex.h -include/ace/Mutex.inl -include/ace/NT_Service.h -include/ace/NT_Service.inl -include/ace/Name_Proxy.h -include/ace/Name_Request_Reply.h -include/ace/Name_Space.h -include/ace/Naming_Context.h -include/ace/Naming_Context.inl -include/ace/Netlink_Addr.h -include/ace/Netlink_Addr.inl -include/ace/Node.cpp -include/ace/Node.h -include/ace/Notification_Queue.h -include/ace/Notification_Queue.inl -include/ace/Notification_Strategy.h -include/ace/Notification_Strategy.inl -include/ace/Null_Barrier.h -include/ace/Null_Condition.h -include/ace/Null_Mutex.h -include/ace/Null_Semaphore.h -include/ace/Numeric_Limits.h -include/ace/OS.h -include/ace/OS_Errno.h -include/ace/OS_Errno.inl -include/ace/OS_Log_Msg_Attributes.h -include/ace/OS_Log_Msg_Attributes.inl -include/ace/OS_Memory.h -include/ace/OS_NS_Thread.h -include/ace/OS_NS_Thread.inl -include/ace/OS_NS_arpa_inet.h -include/ace/OS_NS_arpa_inet.inl -include/ace/OS_NS_ctype.h -include/ace/OS_NS_ctype.inl -include/ace/OS_NS_devctl.h -include/ace/OS_NS_devctl.inl -include/ace/OS_NS_dirent.h -include/ace/OS_NS_dirent.inl -include/ace/OS_NS_dlfcn.h -include/ace/OS_NS_dlfcn.inl -include/ace/OS_NS_errno.h -include/ace/OS_NS_errno.inl -include/ace/OS_NS_fcntl.h -include/ace/OS_NS_fcntl.inl -include/ace/OS_NS_macros.h -include/ace/OS_NS_math.h -include/ace/OS_NS_math.inl -include/ace/OS_NS_netdb.h -include/ace/OS_NS_netdb.inl -include/ace/OS_NS_poll.h -include/ace/OS_NS_poll.inl -include/ace/OS_NS_pwd.h -include/ace/OS_NS_pwd.inl -include/ace/OS_NS_regex.h -include/ace/OS_NS_regex.inl -include/ace/OS_NS_signal.h -include/ace/OS_NS_signal.inl -include/ace/OS_NS_stdio.h -include/ace/OS_NS_stdio.inl -include/ace/OS_NS_stdlib.h -include/ace/OS_NS_stdlib.inl -include/ace/OS_NS_string.h -include/ace/OS_NS_string.inl -include/ace/OS_NS_strings.h -include/ace/OS_NS_strings.inl -include/ace/OS_NS_stropts.h -include/ace/OS_NS_stropts.inl -include/ace/OS_NS_sys_mman.h -include/ace/OS_NS_sys_mman.inl -include/ace/OS_NS_sys_msg.h -include/ace/OS_NS_sys_msg.inl -include/ace/OS_NS_sys_resource.h -include/ace/OS_NS_sys_resource.inl -include/ace/OS_NS_sys_select.h -include/ace/OS_NS_sys_select.inl -include/ace/OS_NS_sys_sendfile.h -include/ace/OS_NS_sys_sendfile.inl -include/ace/OS_NS_sys_shm.h -include/ace/OS_NS_sys_shm.inl -include/ace/OS_NS_sys_socket.h -include/ace/OS_NS_sys_socket.inl -include/ace/OS_NS_sys_stat.h -include/ace/OS_NS_sys_stat.inl -include/ace/OS_NS_sys_time.h -include/ace/OS_NS_sys_time.inl -include/ace/OS_NS_sys_uio.h -include/ace/OS_NS_sys_uio.inl -include/ace/OS_NS_sys_utsname.h -include/ace/OS_NS_sys_wait.h -include/ace/OS_NS_sys_wait.inl -include/ace/OS_NS_time.h -include/ace/OS_NS_time.inl -include/ace/OS_NS_unistd.h -include/ace/OS_NS_unistd.inl -include/ace/OS_NS_wchar.h -include/ace/OS_NS_wchar.inl -include/ace/OS_NS_wctype.h -include/ace/OS_NS_wctype.inl -include/ace/OS_QoS.h -include/ace/OS_TLI.h -include/ace/OS_TLI.inl -include/ace/OS_Thread_Adapter.h -include/ace/OS_main.h -include/ace/Obchunk.h -include/ace/Obchunk.inl -include/ace/Object_Manager.h -include/ace/Object_Manager.inl -include/ace/Object_Manager_Base.h -include/ace/Obstack.h -include/ace/Obstack_T.cpp -include/ace/Obstack_T.h -include/ace/Obstack_T.inl -include/ace/PI_Malloc.h -include/ace/PI_Malloc.inl -include/ace/POSIX_Asynch_IO.h -include/ace/POSIX_CB_Proactor.h -include/ace/POSIX_Proactor.h -include/ace/POSIX_Proactor.inl -include/ace/Pagefile_Memory_Pool.h -include/ace/Pagefile_Memory_Pool.inl -include/ace/Pair_T.cpp -include/ace/Pair_T.h -include/ace/Pair_T.inl -include/ace/Parse_Node.h -include/ace/Ping_Socket.h -include/ace/Ping_Socket.inl -include/ace/Pipe.h -include/ace/Pipe.inl -include/ace/Priority_Reactor.h -include/ace/Proactor.h -include/ace/Proactor.inl -include/ace/Proactor_Impl.h -include/ace/Process.h -include/ace/Process.inl -include/ace/Process_Manager.h -include/ace/Process_Manager.inl -include/ace/Process_Mutex.h -include/ace/Process_Mutex.inl -include/ace/Process_Semaphore.h -include/ace/Process_Semaphore.inl -include/ace/Profile_Timer.h -include/ace/Profile_Timer.inl -include/ace/RB_Tree.cpp -include/ace/RB_Tree.h -include/ace/RB_Tree.inl -include/ace/RMCast/Acknowledge.h -include/ace/RMCast/Bits.h -include/ace/RMCast/Flow.h -include/ace/RMCast/Fragment.h -include/ace/RMCast/Link.h -include/ace/RMCast/Parameters.h -include/ace/RMCast/Protocol.h -include/ace/RMCast/RMCast_Export.h -include/ace/RMCast/Reassemble.h -include/ace/RMCast/Retransmit.h -include/ace/RMCast/Simulator.h -include/ace/RMCast/Socket.h -include/ace/RMCast/Stack.h -include/ace/RW_Mutex.h -include/ace/RW_Mutex.inl -include/ace/RW_Process_Mutex.h -include/ace/RW_Process_Mutex.inl -include/ace/RW_Thread_Mutex.h -include/ace/RW_Thread_Mutex.inl -include/ace/Reactor.h -include/ace/Reactor.inl -include/ace/Reactor_Impl.h -include/ace/Reactor_Notification_Strategy.h -include/ace/Reactor_Notification_Strategy.inl -include/ace/Reactor_Timer_Interface.h -include/ace/Reactor_Token_T.cpp -include/ace/Reactor_Token_T.h -include/ace/Read_Buffer.h -include/ace/Read_Buffer.inl -include/ace/Recursive_Thread_Mutex.h -include/ace/Recursive_Thread_Mutex.inl -include/ace/Recyclable.h -include/ace/Recyclable.inl -include/ace/Refcountable_T.cpp -include/ace/Refcountable_T.h -include/ace/Refcountable_T.inl -include/ace/Refcounted_Auto_Ptr.cpp -include/ace/Refcounted_Auto_Ptr.h -include/ace/Refcounted_Auto_Ptr.inl -include/ace/Registry.h -include/ace/Registry_Name_Space.h -include/ace/Remote_Name_Space.h -include/ace/Remote_Tokens.h -include/ace/Remote_Tokens.inl -include/ace/Reverse_Lock_T.cpp -include/ace/Reverse_Lock_T.h -include/ace/Reverse_Lock_T.inl -include/ace/SOCK.h -include/ace/SOCK.inl -include/ace/SOCK_Acceptor.h -include/ace/SOCK_Acceptor.inl -include/ace/SOCK_CODgram.h -include/ace/SOCK_CODgram.inl -include/ace/SOCK_Connector.h -include/ace/SOCK_Connector.inl -include/ace/SOCK_Dgram.h -include/ace/SOCK_Dgram.inl -include/ace/SOCK_Dgram_Bcast.h -include/ace/SOCK_Dgram_Bcast.inl -include/ace/SOCK_Dgram_Mcast.h -include/ace/SOCK_Dgram_Mcast.inl -include/ace/SOCK_IO.h -include/ace/SOCK_IO.inl -include/ace/SOCK_Netlink.h -include/ace/SOCK_Netlink.inl -include/ace/SOCK_SEQPACK_Acceptor.h -include/ace/SOCK_SEQPACK_Acceptor.inl -include/ace/SOCK_SEQPACK_Association.h -include/ace/SOCK_SEQPACK_Association.inl -include/ace/SOCK_SEQPACK_Connector.h -include/ace/SOCK_SEQPACK_Connector.inl -include/ace/SOCK_Stream.h -include/ace/SOCK_Stream.inl -include/ace/SPIPE.h -include/ace/SPIPE.inl -include/ace/SPIPE_Acceptor.h -include/ace/SPIPE_Addr.h -include/ace/SPIPE_Addr.inl -include/ace/SPIPE_Connector.h -include/ace/SPIPE_Connector.inl -include/ace/SPIPE_Stream.h -include/ace/SPIPE_Stream.inl -%%SSL%%include/ace/SSL/SSL_Asynch_BIO.h -%%SSL%%include/ace/SSL/SSL_Asynch_Stream.h -%%SSL%%include/ace/SSL/SSL_Asynch_Stream.inl -%%SSL%%include/ace/SSL/SSL_Context.h -%%SSL%%include/ace/SSL/SSL_Context.inl -%%SSL%%include/ace/SSL/SSL_Export.h -%%SSL%%include/ace/SSL/SSL_Initializer.h -%%SSL%%include/ace/SSL/SSL_SOCK.h -%%SSL%%include/ace/SSL/SSL_SOCK.inl -%%SSL%%include/ace/SSL/SSL_SOCK_Acceptor.h -%%SSL%%include/ace/SSL/SSL_SOCK_Acceptor.inl -%%SSL%%include/ace/SSL/SSL_SOCK_Connector.h -%%SSL%%include/ace/SSL/SSL_SOCK_Connector.inl -%%SSL%%include/ace/SSL/SSL_SOCK_Stream.h -%%SSL%%include/ace/SSL/SSL_SOCK_Stream.inl -%%SSL%%include/ace/SSL/sslconf.h -include/ace/SString.h -include/ace/SString.inl -include/ace/SStringfwd.h -include/ace/SUN_Proactor.h -include/ace/SV_Message.h -include/ace/SV_Message.inl -include/ace/SV_Message_Queue.h -include/ace/SV_Message_Queue.inl -include/ace/SV_Semaphore_Complex.h -include/ace/SV_Semaphore_Complex.inl -include/ace/SV_Semaphore_Simple.h -include/ace/SV_Semaphore_Simple.inl -include/ace/SV_Shared_Memory.h -include/ace/SV_Shared_Memory.inl -include/ace/Sample_History.h -include/ace/Sample_History.inl -include/ace/Sbrk_Memory_Pool.h -include/ace/Sched_Params.h -include/ace/Sched_Params.inl -include/ace/Select_Reactor.h -include/ace/Select_Reactor_Base.h -include/ace/Select_Reactor_Base.inl -include/ace/Select_Reactor_T.cpp -include/ace/Select_Reactor_T.h -include/ace/Select_Reactor_T.inl -include/ace/Semaphore.h -include/ace/Semaphore.inl -include/ace/Service_Config.h -include/ace/Service_Config.inl -include/ace/Service_Gestalt.h -include/ace/Service_Gestalt.inl -include/ace/Service_Manager.h -include/ace/Service_Object.h -include/ace/Service_Object.inl -include/ace/Service_Repository.h -include/ace/Service_Repository.inl -include/ace/Service_Types.h -include/ace/Service_Types.inl -include/ace/Shared_Memory.h -include/ace/Shared_Memory_MM.h -include/ace/Shared_Memory_MM.inl -include/ace/Shared_Memory_Pool.h -include/ace/Shared_Memory_SV.h -include/ace/Shared_Memory_SV.inl -include/ace/Shared_Object.h -include/ace/Shared_Object.inl -include/ace/Sig_Adapter.h -include/ace/Sig_Handler.h -include/ace/Sig_Handler.inl -include/ace/Signal.h -include/ace/Signal.inl -include/ace/Singleton.cpp -include/ace/Singleton.h -include/ace/Singleton.inl -include/ace/Sock_Connect.h -include/ace/Stack_Trace.h -include/ace/Static_Object_Lock.h -include/ace/Stats.h -include/ace/Stats.inl -include/ace/Strategies_T.cpp -include/ace/Strategies_T.h -include/ace/Strategies_T.inl -include/ace/Stream.cpp -include/ace/Stream.h -include/ace/Stream.inl -include/ace/Stream_Modules.cpp -include/ace/Stream_Modules.h -include/ace/String_Base.cpp -include/ace/String_Base.h -include/ace/String_Base.inl -include/ace/String_Base_Const.h -include/ace/Svc_Conf.h -include/ace/Svc_Conf_Lexer.h -include/ace/Svc_Conf_Param.h -include/ace/Svc_Conf_Token_Table.h -include/ace/Svc_Conf_Tokens.h -include/ace/Svc_Handler.cpp -include/ace/Svc_Handler.h -include/ace/Synch.h -include/ace/Synch_Options.h -include/ace/Synch_Traits.h -include/ace/System_Time.h -include/ace/TLI.h -include/ace/TLI.inl -include/ace/TLI_Acceptor.h -include/ace/TLI_Connector.h -include/ace/TLI_Connector.inl -include/ace/TLI_Stream.h -include/ace/TLI_Stream.inl -include/ace/TMCast/Export.hpp -include/ace/TMCast/FaultDetector.hpp -include/ace/TMCast/Group.hpp -include/ace/TMCast/GroupFwd.hpp -include/ace/TMCast/LinkListener.hpp -include/ace/TMCast/MTQueue.hpp -include/ace/TMCast/Messaging.hpp -include/ace/TMCast/Protocol.hpp -include/ace/TMCast/TransactionController.hpp -include/ace/TP_Reactor.h -include/ace/TP_Reactor.inl -include/ace/TSS_Adapter.h -include/ace/TSS_T.cpp -include/ace/TSS_T.h -include/ace/TSS_T.inl -include/ace/TTY_IO.h -include/ace/Task.h -include/ace/Task.inl -include/ace/Task_Ex_T.cpp -include/ace/Task_Ex_T.h -include/ace/Task_Ex_T.inl -include/ace/Task_T.cpp -include/ace/Task_T.h -include/ace/Task_T.inl -include/ace/Test_and_Set.cpp -include/ace/Test_and_Set.h -include/ace/Thread.h -include/ace/Thread.inl -include/ace/Thread_Adapter.h -include/ace/Thread_Adapter.inl -include/ace/Thread_Control.h -include/ace/Thread_Control.inl -include/ace/Thread_Exit.h -include/ace/Thread_Hook.h -include/ace/Thread_Manager.h -include/ace/Thread_Manager.inl -include/ace/Thread_Mutex.h -include/ace/Thread_Mutex.inl -include/ace/Thread_Semaphore.h -include/ace/Thread_Semaphore.inl -include/ace/Throughput_Stats.h -include/ace/Time_Policy.h -include/ace/Time_Policy.inl -include/ace/Time_Policy_T.cpp -include/ace/Time_Policy_T.h -include/ace/Time_Policy_T.inl -include/ace/Time_Value.h -include/ace/Time_Value.inl -include/ace/Time_Value_T.cpp -include/ace/Time_Value_T.h -include/ace/Time_Value_T.inl -include/ace/Timeprobe.h -include/ace/Timeprobe.inl -include/ace/Timeprobe_T.cpp -include/ace/Timeprobe_T.h -include/ace/Timer_Hash.h -include/ace/Timer_Hash_T.cpp -include/ace/Timer_Hash_T.h -include/ace/Timer_Heap.h -include/ace/Timer_Heap_T.cpp -include/ace/Timer_Heap_T.h -include/ace/Timer_List.h -include/ace/Timer_List_T.cpp -include/ace/Timer_List_T.h -include/ace/Timer_Queue.h -include/ace/Timer_Queue_Adapters.cpp -include/ace/Timer_Queue_Adapters.h -include/ace/Timer_Queue_Adapters.inl -include/ace/Timer_Queue_Iterator.cpp -include/ace/Timer_Queue_Iterator.h -include/ace/Timer_Queue_Iterator.inl -include/ace/Timer_Queue_T.cpp -include/ace/Timer_Queue_T.h -include/ace/Timer_Queue_T.inl -include/ace/Timer_Queuefwd.h -include/ace/Timer_Wheel.h -include/ace/Timer_Wheel_T.cpp -include/ace/Timer_Wheel_T.h -%%TK%%include/ace/TkReactor/ACE_TkReactor_export.h -%%TK%%include/ace/TkReactor/TkReactor.h -include/ace/Token.h -include/ace/Token.inl -include/ace/Token_Collection.h -include/ace/Token_Collection.inl -include/ace/Token_Invariants.h -include/ace/Token_Manager.h -include/ace/Token_Manager.inl -include/ace/Token_Request_Reply.h -include/ace/Token_Request_Reply.inl -include/ace/Tokenizer_T.cpp -include/ace/Tokenizer_T.h -include/ace/Trace.h -include/ace/Truncate.h -include/ace/Typed_SV_Message.cpp -include/ace/Typed_SV_Message.h -include/ace/Typed_SV_Message.inl -include/ace/Typed_SV_Message_Queue.cpp -include/ace/Typed_SV_Message_Queue.h -include/ace/Typed_SV_Message_Queue.inl -include/ace/UNIX_Addr.h -include/ace/UNIX_Addr.inl -include/ace/UPIPE_Acceptor.h -include/ace/UPIPE_Acceptor.inl -include/ace/UPIPE_Addr.h -include/ace/UPIPE_Connector.h -include/ace/UPIPE_Connector.inl -include/ace/UPIPE_Stream.h -include/ace/UPIPE_Stream.inl -include/ace/UTF16_Encoding_Converter.h -include/ace/UTF16_Encoding_Converter.inl -include/ace/UTF32_Encoding_Converter.h -include/ace/UTF8_Encoding_Converter.h -include/ace/UUID.h -include/ace/UUID.inl -include/ace/Unbounded_Queue.cpp -include/ace/Unbounded_Queue.h -include/ace/Unbounded_Queue.inl -include/ace/Unbounded_Set.cpp -include/ace/Unbounded_Set.h -include/ace/Unbounded_Set.inl -include/ace/Unbounded_Set_Ex.cpp -include/ace/Unbounded_Set_Ex.h -include/ace/Unbounded_Set_Ex.inl -include/ace/Value_Ptr.h -include/ace/Vector_T.cpp -include/ace/Vector_T.h -include/ace/Vector_T.inl -include/ace/Version.h -include/ace/Versioned_Namespace.h -include/ace/WFMO_Reactor.h -include/ace/WFMO_Reactor.inl -include/ace/WIN32_Asynch_IO.h -include/ace/WIN32_Proactor.h -include/ace/XML_Svc_Conf.h -include/ace/XTI_ATM_Mcast.h -include/ace/XTI_ATM_Mcast.inl -%%X11%%include/ace/XtReactor/ACE_XtReactor_export.h -%%X11%%include/ace/XtReactor/XtReactor.h -include/ace/ace_wchar.h -include/ace/ace_wchar.inl -include/ace/checked_iterator.h -include/ace/config-WinCE.h -include/ace/config-aix-5.x.h -include/ace/config-aix-7.h -include/ace/config-all.h -include/ace/config-android.h -include/ace/config-cygwin32.h -include/ace/config-face-conftest.h -include/ace/config-face-safety.h -include/ace/config-freebsd.h -include/ace/config-g++-common.h -include/ace/config-hpux-11.00.h -include/ace/config-icc-common.h -include/ace/config-integritySCA.h -include/ace/config-kfreebsd.h -include/ace/config-linux.h -include/ace/config-lite.h -include/ace/config-lynxos.h -include/ace/config-lynxos-178.h -include/ace/config-macosx-elcapitan.h -include/ace/config-macosx-highsierra.h -include/ace/config-macosx-iOS-hardware.h -include/ace/config-macosx-iOS-simulator.h -include/ace/config-macosx-jaguar.h -include/ace/config-macosx-leopard.h -include/ace/config-macosx-lion.h -include/ace/config-macosx-mavericks.h -include/ace/config-macosx-mojave.h -include/ace/config-macosx-mountainlion.h -include/ace/config-macosx-panther.h -include/ace/config-macosx-sierra.h -include/ace/config-macosx-snowleopard.h -include/ace/config-macosx-tiger.h -include/ace/config-macosx-yosemite.h -include/ace/config-macosx.h -include/ace/config-macros.h -include/ace/config-netbsd.h -include/ace/config-openbsd.h -include/ace/config-openvms.h -include/ace/config-pharlap.h -include/ace/config-posix-nonetworking.h -include/ace/config-posix.h -include/ace/config-qnx.h -include/ace/config-rtems.h -include/ace/config-suncc-common.h -include/ace/config-sunos5.10.h -include/ace/config-sunos5.11.h -include/ace/config-sunos5.4-g++.h -include/ace/config-sunos5.4-sunc++-4.x.h -include/ace/config-sunos5.5.h -include/ace/config-sunos5.6.h -include/ace/config-sunos5.7.h -include/ace/config-sunos5.8.h -include/ace/config-sunos5.9.h -include/ace/config-vxworks.h -include/ace/config-vxworks6.4.h -include/ace/config-vxworks6.5.h -include/ace/config-vxworks6.6.h -include/ace/config-vxworks6.7.h -include/ace/config-vxworks6.8.h -include/ace/config-vxworks6.9.h -include/ace/config-vxworks7.0.h -include/ace/config-win32-borland.h -include/ace/config-win32-cegcc.h -include/ace/config-win32-common.h -include/ace/config-win32-dmc.h -include/ace/config-win32-interix.h -include/ace/config-win32-mingw.h -include/ace/config-win32-mingw64.h -include/ace/config-win32-msvc-10.h -include/ace/config-win32-msvc-11.h -include/ace/config-win32-msvc-12.h -include/ace/config-win32-msvc-14.h -include/ace/config-win32-msvc-141.h -include/ace/config-win32-msvc-7.h -include/ace/config-win32-msvc-8.h -include/ace/config-win32-msvc-9.h -include/ace/config-win32-msvc.h -include/ace/config-win32.h -include/ace/config-windows.h -include/ace/config.h -include/ace/iosfwd.h -include/ace/os_include/arpa/os_inet.h -include/ace/os_include/net/os_if.h -include/ace/os_include/netinet/os_in.h -include/ace/os_include/netinet/os_tcp.h -include/ace/os_include/os_aio.h -include/ace/os_include/os_assert.h -include/ace/os_include/os_byteswap.h -include/ace/os_include/os_complex.h -include/ace/os_include/os_cpio.h -include/ace/os_include/os_ctype.h -include/ace/os_include/os_dirent.h -include/ace/os_include/os_dlfcn.h -include/ace/os_include/os_errno.h -include/ace/os_include/os_fcntl.h -include/ace/os_include/os_fenv.h -include/ace/os_include/os_float.h -include/ace/os_include/os_fmtmsg.h -include/ace/os_include/os_fnmatch.h -include/ace/os_include/os_ftw.h -include/ace/os_include/os_glob.h -include/ace/os_include/os_grp.h -include/ace/os_include/os_iconv.h -include/ace/os_include/os_ifaddrs.h -include/ace/os_include/os_intrin.h -include/ace/os_include/os_inttypes.h -include/ace/os_include/os_iso646.h -include/ace/os_include/os_kstat.h -include/ace/os_include/os_langinfo.h -include/ace/os_include/os_libgen.h -include/ace/os_include/os_limits.h -include/ace/os_include/os_local.h -include/ace/os_include/os_math.h -include/ace/os_include/os_monetary.h -include/ace/os_include/os_mqueue.h -include/ace/os_include/os_ndbm.h -include/ace/os_include/os_netdb.h -include/ace/os_include/os_nl_types.h -include/ace/os_include/os_pdh.h -include/ace/os_include/os_pdhmsg.h -include/ace/os_include/os_poll.h -include/ace/os_include/os_pthread.h -include/ace/os_include/os_pwd.h -include/ace/os_include/os_regex.h -include/ace/os_include/os_sched.h -include/ace/os_include/os_search.h -include/ace/os_include/os_semaphore.h -include/ace/os_include/os_setjmp.h -include/ace/os_include/os_signal.h -include/ace/os_include/os_spawn.h -include/ace/os_include/os_stdarg.h -include/ace/os_include/os_stdbool.h -include/ace/os_include/os_stddef.h -include/ace/os_include/os_stdint.h -include/ace/os_include/os_stdio.h -include/ace/os_include/os_stdlib.h -include/ace/os_include/os_string.h -include/ace/os_include/os_strings.h -include/ace/os_include/os_stropts.h -include/ace/os_include/os_syslog.h -include/ace/os_include/os_tar.h -include/ace/os_include/os_termios.h -include/ace/os_include/os_tgmath.h -include/ace/os_include/os_time.h -include/ace/os_include/os_trace.h -include/ace/os_include/os_typeinfo.h -include/ace/os_include/os_ucontext.h -include/ace/os_include/os_ulimit.h -include/ace/os_include/os_unistd.h -include/ace/os_include/os_utime.h -include/ace/os_include/os_utmpx.h -include/ace/os_include/os_wchar.h -include/ace/os_include/os_wctype.h -include/ace/os_include/os_wordexp.h -include/ace/os_include/sys/os_ipc.h -include/ace/os_include/sys/os_loadavg.h -include/ace/os_include/sys/os_mman.h -include/ace/os_include/sys/os_msg.h -include/ace/os_include/sys/os_pstat.h -include/ace/os_include/sys/os_resource.h -include/ace/os_include/sys/os_select.h -include/ace/os_include/sys/os_sem.h -include/ace/os_include/sys/os_shm.h -include/ace/os_include/sys/os_socket.h -include/ace/os_include/sys/os_stat.h -include/ace/os_include/sys/os_statvfs.h -include/ace/os_include/sys/os_sysctl.h -include/ace/os_include/sys/os_sysinfo.h -include/ace/os_include/sys/os_time.h -include/ace/os_include/sys/os_timeb.h -include/ace/os_include/sys/os_times.h -include/ace/os_include/sys/os_types.h -include/ace/os_include/sys/os_uio.h -include/ace/os_include/sys/os_un.h -include/ace/os_include/sys/os_utsname.h -include/ace/os_include/sys/os_wait.h -include/ace/post.h -include/ace/pre.h -include/ace/streams.h -include/ace/svc_export.h -lib/libACE.so -lib/libACE.so.6 -lib/libACE.so.%%VERSION%% -lib/libACEXML.so -lib/libACEXML.so.6 -lib/libACEXML.so.%%VERSION%% -lib/libACEXML_Parser.so -lib/libACEXML_Parser.so.6 -lib/libACEXML_Parser.so.%%VERSION%% -lib/libACEXML_XML_Svc_Conf_Parser.so -lib/libACEXML_XML_Svc_Conf_Parser.so.6 -lib/libACEXML_XML_Svc_Conf_Parser.so.%%VERSION%% -lib/libACE_Compression.so -lib/libACE_Compression.so.6 -lib/libACE_Compression.so.%%VERSION%% -lib/libACE_ETCL.so -lib/libACE_ETCL.so.6 -lib/libACE_ETCL.so.%%VERSION%% -lib/libACE_ETCL_Parser.so -lib/libACE_ETCL_Parser.so.6 -lib/libACE_ETCL_Parser.so.%%VERSION%% -%%FLTK%%lib/libACE_FlReactor.so -%%FLTK%%lib/libACE_FlReactor.so.6 -%%FLTK%%lib/libACE_FlReactor.so.%%VERSION%% -lib/libACE_HTBP.so -lib/libACE_HTBP.so.6 -lib/libACE_HTBP.so.%%VERSION%% -lib/libACE_INet.so -lib/libACE_INet.so.6 -lib/libACE_INet.so.%%VERSION%% -%%SSL%%lib/libACE_INet_SSL.so -%%SSL%%lib/libACE_INet_SSL.so.6 -%%SSL%%lib/libACE_INet_SSL.so.%%VERSION%% -lib/libACE_Monitor_Control.so -lib/libACE_Monitor_Control.so.6 -lib/libACE_Monitor_Control.so.%%VERSION%% -lib/libACE_RLECompression.so -lib/libACE_RLECompression.so.6 -lib/libACE_RLECompression.so.%%VERSION%% -lib/libACE_RMCast.so -lib/libACE_RMCast.so.6 -lib/libACE_RMCast.so.%%VERSION%% -%%SSL%%lib/libACE_SSL.so -%%SSL%%lib/libACE_SSL.so.6 -%%SSL%%lib/libACE_SSL.so.%%VERSION%% -lib/libACE_TMCast.so -lib/libACE_TMCast.so.6 -lib/libACE_TMCast.so.%%VERSION%% -%%TK%%lib/libACE_TkReactor.so -%%TK%%lib/libACE_TkReactor.so.6 -%%TK%%lib/libACE_TkReactor.so.%%VERSION%% -%%X11%%lib/libACE_XtReactor.so -%%X11%%lib/libACE_XtReactor.so.6 -%%X11%%lib/libACE_XtReactor.so.%%VERSION%% -lib/libJAWS.so -lib/libJAWS.so.6 -lib/libJAWS.so.%%VERSION%% -lib/libKokyu.so -lib/libKokyu.so.6 -lib/libKokyu.so.%%VERSION%% -libdata/pkgconfig/ACE.pc -libdata/pkgconfig/ACEXML.pc -libdata/pkgconfig/ACEXML_Parser.pc -libdata/pkgconfig/ACEXML_XML_Svc_Conf_Parser.pc -libdata/pkgconfig/ACE_ETCL.pc -libdata/pkgconfig/ACE_ETCL_Parser.pc -%%FLTK%%libdata/pkgconfig/ACE_FlReactor.pc -libdata/pkgconfig/ACE_HTBP.pc -libdata/pkgconfig/ACE_INet.pc -%%SSL%%libdata/pkgconfig/ACE_INet_SSL.pc -libdata/pkgconfig/ACE_RMCast.pc -%%SSL%%libdata/pkgconfig/ACE_SSL.pc -libdata/pkgconfig/ACE_TMCast.pc -%%TK%%libdata/pkgconfig/ACE_TkReactor.pc -%%X11%%libdata/pkgconfig/ACE_XtReactor.pc -libdata/pkgconfig/Kokyu.pc -%%DATADIR%%/AUTHORS -%%DATADIR%%/COPYING -%%DATADIR%%/NEWS -%%DATADIR%%/PROBLEM-REPORT-FORM -%%DATADIR%%/README -%%DATADIR%%/THANKS -%%DATADIR%%/VERSION -%%DATADIR%%/ace-devel.sh -%%DATADIR%%/bin/DependencyGenerator/GNUDependencyWriter.pm -%%DATADIR%%/bin/DependencyGenerator/GNUIDLDependencyWriter.pm -%%DATADIR%%/bin/DependencyGenerator/GNUIDLObjectGenerator.pm -%%DATADIR%%/bin/DependencyGenerator/GNUObjectGenerator.pm -%%DATADIR%%/bin/MakeProjectCreator/README -%%DATADIR%%/bin/MakeProjectCreator/config/MPC.cfg -%%DATADIR%%/bin/MakeProjectCreator/config/ace_athena.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_athena3d.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_bzip2.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_compressionlib.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_etcl.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_etcl_parser.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_fl.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_flreactor.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_for_tao.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_fox.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_foxreactor.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_gl.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_gtk.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_idl_dependencies.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_mc.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_mfc.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_motif.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_openssl.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_output.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_qt.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_qt4.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_qt4reactor.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_qt5.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_qt5reactor.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_qtreactor.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_rlecompressionlib.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_tk.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_tkreactor.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_unicode.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_x11.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_xml_utils.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_xt.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_xtreactor.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_zlib.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ace_zzip.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/acedefaults.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/aceexe.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/acelib.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/acemfcexe.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/acenosubsets.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/acexml.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/avoids_ace_for_tao.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/bmake.features -%%DATADIR%%/bin/MakeProjectCreator/config/conv_lib.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/core.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/crosscompile.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/default.rel -%%DATADIR%%/bin/MakeProjectCreator/config/em3.features -%%DATADIR%%/bin/MakeProjectCreator/config/global.features -%%DATADIR%%/bin/MakeProjectCreator/config/gnuace.features -%%DATADIR%%/bin/MakeProjectCreator/config/htbp.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/inet.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/inetssl.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/install.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/install_bin.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/install_data.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/install_headers.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/install_lib.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ipv6.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/kokyu.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/labviewrt_dll.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/man.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/mc_test_utils.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/minizip.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/nmake.features -%%DATADIR%%/bin/MakeProjectCreator/config/pkgconfig.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/qos.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/rmcast.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/script.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ssl.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ssl_for_tao.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/ssl_full.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/stl.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/support_ostream.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/svc_conf_files.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/test_files.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/threads.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/tmcast.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vc10.features -%%DATADIR%%/bin/MakeProjectCreator/config/vc10nmake.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vc11.features -%%DATADIR%%/bin/MakeProjectCreator/config/vc11nmake.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vc12.features -%%DATADIR%%/bin/MakeProjectCreator/config/vc12nmake.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vc14.features -%%DATADIR%%/bin/MakeProjectCreator/config/vc14nmake.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vc71.features -%%DATADIR%%/bin/MakeProjectCreator/config/vc8.features -%%DATADIR%%/bin/MakeProjectCreator/config/vc8nmake.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vc9.features -%%DATADIR%%/bin/MakeProjectCreator/config/vc9nmake.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vc_warnings.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vcfullmacros.mpt -%%DATADIR%%/bin/MakeProjectCreator/config/vcl.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vcpartialmacros.mpt -%%DATADIR%%/bin/MakeProjectCreator/config/versioned_namespace.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/vs2017.features -%%DATADIR%%/bin/MakeProjectCreator/config/vs2017nmake.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/wb26.features -%%DATADIR%%/bin/MakeProjectCreator/config/wfmo.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/winregistry.mpb -%%DATADIR%%/bin/MakeProjectCreator/config/wxwindows.mpb -%%DATADIR%%/bin/MakeProjectCreator/docs/templates/gnu.txt -%%DATADIR%%/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm -%%DATADIR%%/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm -%%DATADIR%%/bin/MakeProjectCreator/modules/GNUAutobuildProjectCreator.pm -%%DATADIR%%/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm -%%DATADIR%%/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm -%%DATADIR%%/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm -%%DATADIR%%/bin/MakeProjectCreator/templates/gnu.mpd -%%DATADIR%%/bin/MakeProjectCreator/templates/gnudll.mpt -%%DATADIR%%/bin/MakeProjectCreator/templates/gnuexe.mpt -%%DATADIR%%/bin/MakeProjectCreator/templates/vxtest.mpd -%%DATADIR%%/bin/ace_install_pkgconfig.pl -%%DATADIR%%/bin/add_rel_link.sh -%%DATADIR%%/bin/depgen.pl -%%DATADIR%%/bin/mpc.pl -%%DATADIR%%/bin/mwc.pl -%%DATADIR%%/docs/ACE-FMM.html -%%DATADIR%%/docs/ACE-SSL.html -%%DATADIR%%/docs/ACE-bug-process.html -%%DATADIR%%/docs/ACE-categories.html -%%DATADIR%%/docs/ACE-development-process.html -%%DATADIR%%/docs/ACE-guidelines.html -%%DATADIR%%/docs/ACE-lessons.html -%%DATADIR%%/docs/ACE-monotonic-timer.html -%%DATADIR%%/docs/ACE-porting.html -%%DATADIR%%/docs/ACE-subsets.html -%%DATADIR%%/docs/CE-status.txt -%%DATADIR%%/docs/Download.html -%%DATADIR%%/docs/FAQ -%%DATADIR%%/docs/README.tutorials -%%DATADIR%%/docs/Symbol_Versioning.html -%%DATADIR%%/docs/ace_guidelines.vsmacros -%%DATADIR%%/docs/bczar/bczar.html -%%DATADIR%%/docs/bczar/privileges.html -%%DATADIR%%/docs/exceptions.html -%%DATADIR%%/docs/index.html -%%DATADIR%%/docs/msvc_notes.txt -%%DATADIR%%/docs/run_test.txt -%%DATADIR%%/docs/usage-bugzilla.html -%%DATADIR%%/docs/wchar.txt -%%DATADIR%%/include/makeinclude/all_in_one.GNU -%%DATADIR%%/include/makeinclude/component_check.GNU -%%DATADIR%%/include/makeinclude/macros.GNU -%%DATADIR%%/include/makeinclude/platform_aix.GNU -%%DATADIR%%/include/makeinclude/platform_aix_g++.GNU -%%DATADIR%%/include/makeinclude/platform_aix_ibm.GNU -%%DATADIR%%/include/makeinclude/platform_android.GNU -%%DATADIR%%/include/makeinclude/platform_cegcc.GNU -%%DATADIR%%/include/makeinclude/platform_clang_common.GNU -%%DATADIR%%/include/makeinclude/platform_cygwin32.GNU -%%DATADIR%%/include/makeinclude/platform_freebsd.GNU -%%DATADIR%%/include/makeinclude/platform_g++_common.GNU -%%DATADIR%%/include/makeinclude/platform_gnuwin32_common.GNU -%%DATADIR%%/include/makeinclude/platform_hpux_aCC.GNU -%%DATADIR%%/include/makeinclude/platform_hpux_gcc.GNU -%%DATADIR%%/include/makeinclude/platform_integrity_ghs.GNU -%%DATADIR%%/include/makeinclude/platform_linux.GNU -%%DATADIR%%/include/makeinclude/platform_linux_clang.GNU -%%DATADIR%%/include/makeinclude/platform_linux_common.GNU -%%DATADIR%%/include/makeinclude/platform_linux_icc.GNU -%%DATADIR%%/include/makeinclude/platform_linux_pgi.GNU -%%DATADIR%%/include/makeinclude/platform_linux_suncc.GNU -%%DATADIR%%/include/makeinclude/platform_lynxos.GNU -%%DATADIR%%/include/makeinclude/platform_macosx.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_common.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_elcapitan.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_highsierra.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_iOS.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_icc.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_jaguar.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_leopard.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_lion.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_mavericks.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_mojave.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_mountainlion.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_panther.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_sierra.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_snowleopard.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_tiger.GNU -%%DATADIR%%/include/makeinclude/platform_macosx_yosemite.GNU -%%DATADIR%%/include/makeinclude/platform_macros.GNU -%%DATADIR%%/include/makeinclude/platform_mingw32.GNU -%%DATADIR%%/include/makeinclude/platform_netbsd.GNU -%%DATADIR%%/include/makeinclude/platform_openbsd.GNU -%%DATADIR%%/include/makeinclude/platform_openvms.GNU -%%DATADIR%%/include/makeinclude/platform_qnx_gcc.GNU -%%DATADIR%%/include/makeinclude/platform_rtems.x_g++.GNU -%%DATADIR%%/include/makeinclude/platform_sunos5_common.GNU -%%DATADIR%%/include/makeinclude/platform_sunos5_g++.GNU -%%DATADIR%%/include/makeinclude/platform_sunos5_sunc++.GNU -%%DATADIR%%/include/makeinclude/platform_tandem.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks6.2.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks6.3.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks6.4.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks6.5.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks6.6.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks6.7.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks6.8.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks6.9.GNU -%%DATADIR%%/include/makeinclude/platform_vxworks7.0.GNU -%%DATADIR%%/include/makeinclude/platform_win32_dmc.GNU -%%DATADIR%%/include/makeinclude/platform_win32_icc.GNU -%%DATADIR%%/include/makeinclude/platform_win32_interix.GNU -%%DATADIR%%/include/makeinclude/platform_win32_msvc.GNU -%%DATADIR%%/include/makeinclude/rules.bin.GNU -%%DATADIR%%/include/makeinclude/rules.common.GNU -%%DATADIR%%/include/makeinclude/rules.lib.GNU -%%DATADIR%%/include/makeinclude/rules.local.GNU -%%DATADIR%%/include/makeinclude/rules.nested.GNU -%%DATADIR%%/include/makeinclude/rules.nolocal.GNU -%%DATADIR%%/include/makeinclude/rules.nonested.GNU -%%DATADIR%%/include/makeinclude/wrapper_macros.GNU diff --git a/devel/bin86/Makefile b/devel/bin86/Makefile deleted file mode 100644 index bf426322f396..000000000000 --- a/devel/bin86/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Created by: trevor -# $FreeBSD$ - -PORTNAME= bin86 -PORTVERSION= 0.16.21 -CATEGORIES= devel -MASTER_SITES= http://v3.sk/~lkundrak/dev86/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= 16-bit assembler and loader - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -CONFLICTS= bcc-[0-9]* dev86-[0-9]* - -PLIST_FILES= bin/as86 bin/catimage bin/ld86 bin/objchop bin/objdump86 \ - man/man1/as86.1.gz man/man1/ld86.1.gz -PORTDOCS= ChangeLog README README-0.4 - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_MAN} ${WRKSRC}/man/*1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -.for prog in as/as86 ld/ld86 ld/objchop ld/catimage ld/objdump86 - ${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin -.endfor - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/devel/bin86/distinfo b/devel/bin86/distinfo deleted file mode 100644 index 3b431532f186..000000000000 --- a/devel/bin86/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (bin86-0.16.21.tar.gz) = 021e37cde3a20632c4c9000993cb4aa9f58cb82b1d3c26b9aeb62d6566925738 -SIZE (bin86-0.16.21.tar.gz) = 154283 diff --git a/devel/bin86/files/patch-Makefile b/devel/bin86/files/patch-Makefile deleted file mode 100644 index 65531217840b..000000000000 --- a/devel/bin86/files/patch-Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.orig 2005-02-01 05:45:39.000000000 +0900 -+++ Makefile 2012-05-30 05:45:03.000000000 +0900 -@@ -1,16 +1,12 @@ - --CFLAGS=-O2 -D_POSIX_SOURCE -+CFLAGS+=-D_POSIX_SOURCE - LDFLAGS= - DIRS=ld as - --PREFIX=/usr/local -+PREFIX?=/usr/local - BINDIR=$(PREFIX)/bin - LIBDIR=$(PREFIX)/lib --ifeq ($(PREFIX),/usr) --MANDIR=$(PREFIX)/share/man/man1 --else - MANDIR=$(PREFIX)/man/man1 --endif - SUF=86 - - INSTALL_OPT=-m 755 diff --git a/devel/bin86/files/patch-ld_catimage.c b/devel/bin86/files/patch-ld_catimage.c deleted file mode 100644 index bcb4b44b3354..000000000000 --- a/devel/bin86/files/patch-ld_catimage.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ld/catimage.c.orig 2011-09-28 14:37:07.000000000 +0800 -+++ ld/catimage.c 2011-09-28 14:37:59.000000000 +0800 -@@ -30,6 +30,7 @@ - unsigned long text_offt[10]; /* Locations to patch (0=don't) */ - unsigned long data_offt[10]; - -+void patch_bin(long, int); - char * input_file = ""; - FILE * ofd; - FILE * ifd = 0; -@@ -139,6 +140,7 @@ long out_offset, in_offset, length; - } - } - -+void - patch_bin(file_off, value) - long file_off; - int value; diff --git a/devel/bin86/files/patch-ld_ld_c b/devel/bin86/files/patch-ld_ld_c deleted file mode 100644 index ea085687bf08..000000000000 --- a/devel/bin86/files/patch-ld_ld_c +++ /dev/null @@ -1,12 +0,0 @@ ---- ld/ld.c.orig 2004-01-21 16:17:09.000000000 -0500 -+++ ld/ld.c 2008-07-14 14:56:28.000000000 -0500 -@@ -2,6 +2,9 @@ - - /* Copyright (C) 1994 Bruce Evans */ - -+#include <errno.h> -+ -+#undef BUGCOMPAT - #include "syshead.h" - #include "const.h" - #include "byteord.h" diff --git a/devel/bin86/files/patch-ld_x86_aout_h b/devel/bin86/files/patch-ld_x86_aout_h deleted file mode 100644 index b82171d8b8eb..000000000000 --- a/devel/bin86/files/patch-ld_x86_aout_h +++ /dev/null @@ -1,13 +0,0 @@ ---- ld/x86_aout.h.orig 2003-01-29 07:17:14.000000000 +0900 -+++ ld/x86_aout.h 2012-05-30 05:49:38.000000000 +0900 -@@ -13,7 +13,9 @@ - typedef long Long; - #define __OUT_OK 1 - #else --typedef char Long[4]; -+#define __OUT_OK 1 -+#include <sys/types.h> -+typedef int32_t Long; - #endif - - struct exec { /* a.out header */ diff --git a/devel/bin86/files/patch-man_as86_1 b/devel/bin86/files/patch-man_as86_1 deleted file mode 100644 index 14061485cf0e..000000000000 --- a/devel/bin86/files/patch-man_as86_1 +++ /dev/null @@ -1,15 +0,0 @@ ---- man/as86.1.orig Tue Sep 26 13:18:31 2000 -+++ man/as86.1 Thu Nov 2 16:10:08 2000 -@@ -20,8 +20,8 @@ - - .SH DESCRIPTION - .B as86 --is an assembler for the 8086..80386 processors, it's syntax is closer --to the intel/microsoft form rather than the more normal generic form of --the unix system assembler. -+is an assembler for the 8086..80386 processors. Its syntax is closer -+to the Intel/Microsoft form rather than the more normal generic form of -+the Unix system assembler. - - The - .B src diff --git a/devel/bin86/pkg-descr b/devel/bin86/pkg-descr deleted file mode 100644 index 0354afc924ea..000000000000 --- a/devel/bin86/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This consists of a 16-bit assembler and loader for x86 or 6809 -CPUs. Unlike the GNU binutils in the base system (recent versions -of which have 16-bit capability), these are for code written with -Intel syntax. - -WWW: http://www.debath.co.uk/ diff --git a/devel/erlang-oserl/Makefile b/devel/erlang-oserl/Makefile deleted file mode 100644 index 2a6c3b0ffdef..000000000000 --- a/devel/erlang-oserl/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# $FreeBSD$ - -PORTNAME= oserl -PORTVERSION= 3.2.4 -CATEGORIES= devel -PKGNAMEPREFIX= erlang- - -MAINTAINER= erlang@FreeBSD.org -COMMENT= SMPP library for Erlang - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -BUILD_DEPENDS= erlc:lang/erlang \ - txt2tags:textproc/txt2tags -RUN_DEPENDS= erl:lang/erlang \ - erlang-common_lib>=3.3.4:devel/erlang-common_lib - -PLIST_SUB= VERSION="${PORTVERSION}" - -USE_GITHUB= yes -GH_ACCOUNT= iamaleksey - -USES= dos2unix gmake iconv -ALL_TARGET= compile doc -DOS2UNIX_GLOB= Makefile *.hrl *.erl - -post-extract: -# Trick rebar into locating the oserl include files (see also patch-rebar.config) - @${LN} -s ${WRKSRC} ${WRKDIR}/${PORTNAME} - @${REINPLACE_CMD} -e "s@<@<@g" -e "s@>@>@g" ${WRKSRC}/doc/*.ndoc - -do-install: - @for manpage in ${WRKSRC}/doc/man/*; do \ - ${MV} $${manpage} $${manpage}.src; \ - ${ICONV_CMD} -f UTF-8 -t ISO-8859-1 $${manpage}.src > $${manpage}; \ - done - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${STAGEDIR}${MAN1PREFIX}/man/man3 - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/oserl-${PORTVERSION} - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/oserl-${PORTVERSION}/ebin - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/oserl-${PORTVERSION}/include - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/oserl-${PORTVERSION}/src - ${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/oserl-${PORTVERSION}/ebin - ${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/oserl-${PORTVERSION}/include - ${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/oserl-${PORTVERSION}/src - -.include <bsd.port.mk> diff --git a/devel/erlang-oserl/distinfo b/devel/erlang-oserl/distinfo deleted file mode 100644 index 926ba0c134e9..000000000000 --- a/devel/erlang-oserl/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (iamaleksey-oserl-3.2.4_GH0.tar.gz) = c0bf81b296236dd87bf87a510af32903ec1a12c19333501dcbd17531d1ebbfc0 -SIZE (iamaleksey-oserl-3.2.4_GH0.tar.gz) = 248906 diff --git a/devel/erlang-oserl/files/patch-Makefile b/devel/erlang-oserl/files/patch-Makefile deleted file mode 100644 index 98bbce213d7a..000000000000 --- a/devel/erlang-oserl/files/patch-Makefile +++ /dev/null @@ -1,47 +0,0 @@ ---- Makefile.orig 2015-06-25 10:06:03 UTC -+++ Makefile -@@ -10,6 +10,13 @@ HTMS = $(DOCS:.ndoc=.html) - TEXS = $(DOCS:.ndoc=.tex) - PDFS = $(DOCS:.ndoc=.pdf) - -+CD = cd -+ERLDOC = txt2tags -+MKDIR = mkdir -+MV = mv -vf -+RM = rm -vf -+SED = sed -+ - ### Dependecy Search Paths - VPATH = src:include:ebin:doc - -@@ -35,7 +42,11 @@ clobber: clean - @$(RM) -R doc/man - @$(RM) -R doc/pdf - --doc: man html pdf -+doc: dirs man html -+ -+dirs: -+ @$(MKDIR) doc/man -+ @$(MKDIR) doc/html - - man: $(MANS) - @$(MV) doc/man/$(APPNAME)_overview.3 doc/man/$(APPNAME).1 -@@ -49,14 +60,14 @@ pdf: $(PDFS) - %.3: %.ndoc - @$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \ - $(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \ -- $(ERLDOC) -i - -t man --no-toc --erl -o man/$@; $(CD) .. -+ $(ERLDOC) -i - -t man --no-toc -o man/$@; $(CD) .. - - %.html: %.ndoc - @$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \ - $(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \ -- $(ERLDOC) -i - -t xhtml --erl -o html/$@; $(CD) .. -+ $(ERLDOC) -i - -t xhtml -o html/$@; $(CD) .. - - %.pdf: %.ndoc - @$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \ - $(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \ -- $(ERLDOC) -i - -t pdf --no-toc --erl -o pdf/$@; $(CD) .. -+ $(ERLDOC) -i - -t pdf --no-toc -o pdf/$@; $(CD) .. diff --git a/devel/erlang-oserl/files/patch-rebar.config b/devel/erlang-oserl/files/patch-rebar.config deleted file mode 100644 index 830bf8129143..000000000000 --- a/devel/erlang-oserl/files/patch-rebar.config +++ /dev/null @@ -1,14 +0,0 @@ ---- rebar.config.orig 2013-05-10 18:52:27 UTC -+++ rebar.config -@@ -1,9 +1,6 @@ --{lib_dirs, ["deps"]}. -- --{erl_opts, [warnings_as_errors, debug_info]}. -+{lib_dirs, ["deps", ".."]}. - --{deps, [{common_lib, "3.3.4", -- {git, "git://github.com/iamaleksey/common_lib.git", {tag, "3.3.4"}}}]}. -+{erl_opts, [debug_info]}. - - {erl_first_files, ["src/gen_esme_session.erl", - "src/gen_mc_session.erl", diff --git a/devel/erlang-oserl/files/patch-src_smpp__param.hrl b/devel/erlang-oserl/files/patch-src_smpp__param.hrl deleted file mode 100644 index 1ffbadbb1c72..000000000000 --- a/devel/erlang-oserl/files/patch-src_smpp__param.hrl +++ /dev/null @@ -1,11 +0,0 @@ ---- src/smpp_param.hrl.orig 2015-06-25 10:06:03 UTC -+++ src/smpp_param.hrl -@@ -159,7 +159,7 @@ - %% destination_addr - %% - %% %@doc Specifies the destination SME address. For mobile terminated --%% messages, this is the directory number of the recipient MS. IP addresses ç -+%% messages, this is the directory number of the recipient MS. IP addresses - %% are specified in "aaa.bbb.ccc.ddd" notation. C-Octet String, Var. max 21 - %% octets. - %% %@end diff --git a/devel/erlang-oserl/pkg-descr b/devel/erlang-oserl/pkg-descr deleted file mode 100644 index c9d69aab2dc1..000000000000 --- a/devel/erlang-oserl/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -The Short Message Peer-to-Peer (SMPP) in telecommunications is an -open, industry standard protocol designed to provide a flexible -data communication interface for the transfer of short message data -between External Short Messaging Entities (ESME), Routing Entities -(RE) and Message Centres. - -The oserl library provides an Erlang framework to interface with -SMPP entities. - -WWW: https://github.com/iamaleksey/oserl diff --git a/devel/erlang-oserl/pkg-plist b/devel/erlang-oserl/pkg-plist deleted file mode 100644 index 357021a774f7..000000000000 --- a/devel/erlang-oserl/pkg-plist +++ /dev/null @@ -1,61 +0,0 @@ -lib/erlang/lib/oserl-%%VERSION%%/ebin/gen_esme.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/gen_esme_session.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/gen_mc.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/gen_mc_session.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/oserl.app -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_base.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_base_syntax.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_disk_log_hlr.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_error.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_log_mgr.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_operation.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_param_syntax.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_pdu_syntax.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_ref_num.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_req_tab.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_session.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_sm.beam -lib/erlang/lib/oserl-%%VERSION%%/ebin/smpp_tty_log_hlr.beam -lib/erlang/lib/oserl-%%VERSION%%/include/e164.hrl -lib/erlang/lib/oserl-%%VERSION%%/include/oserl.hrl -lib/erlang/lib/oserl-%%VERSION%%/include/smpp_globals.hrl -lib/erlang/lib/oserl-%%VERSION%%/src/gen_esme.erl -lib/erlang/lib/oserl-%%VERSION%%/src/gen_esme_session.erl -lib/erlang/lib/oserl-%%VERSION%%/src/gen_mc.erl -lib/erlang/lib/oserl-%%VERSION%%/src/gen_mc_session.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_base.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_base.hrl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_base_syntax.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_base_syntax.hrl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_disk_log_hlr.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_error.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_log_mgr.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_operation.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_param.hrl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_param_syntax.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_param_syntax.hrl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_pdu.hrl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_pdu_syntax.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_pdu_syntax.hrl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_ref_num.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_req_tab.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_session.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_sm.erl -lib/erlang/lib/oserl-%%VERSION%%/src/smpp_tty_log_hlr.erl -man/man1/oserl.1.gz -man/man3/gen_esme.3.gz -man/man3/gen_esme_session.3.gz -man/man3/gen_mc.3.gz -man/man3/gen_mc_session.3.gz -man/man3/smpp_base.3.gz -man/man3/smpp_base_syntax.3.gz -man/man3/smpp_disk_log_hlr.3.gz -man/man3/smpp_error.3.gz -man/man3/smpp_log_mgr.3.gz -man/man3/smpp_operation.3.gz -man/man3/smpp_param_syntax.3.gz -man/man3/smpp_pdu_syntax.3.gz -man/man3/smpp_ref_num.3.gz -man/man3/smpp_req_tab.3.gz -man/man3/smpp_sm.3.gz -man/man3/smpp_tty_log_hlr.3.gz diff --git a/emulators/Makefile b/emulators/Makefile index 2e1373e18294..379cfdb63811 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -118,7 +118,6 @@ SUBDIR += qemu-user-static-devel SUBDIR += qemu-utils SUBDIR += qemu31 - SUBDIR += qemu40 SUBDIR += qemu41 SUBDIR += qemu50 SUBDIR += qmc2 diff --git a/emulators/qemu40/Makefile b/emulators/qemu40/Makefile deleted file mode 100644 index ba88e082ccdb..000000000000 --- a/emulators/qemu40/Makefile +++ /dev/null @@ -1,165 +0,0 @@ -# Created by: Juergen Lock <nox@jelal.kn-bremen.de> -# $FreeBSD$ - -PORTNAME= qemu -PORTVERSION= 4.0.1 -PORTREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= https://download.qemu.org/ -PKGNAMESUFFIX= 40 -DIST_SUBDIR= qemu/${PORTVERSION} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= QEMU CPU Emulator - 4.0.X version - -LICENSE= GPLv2 - -ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 - -LIB_DEPENDS= libnettle.so:security/nettle \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libepoxy.so:graphics/libepoxy \ - libpcre2-8.so:devel/pcre2 - -USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t perl5 \ - pkgconfig python:build tar:xz -USE_GNOME= cairo glib20 libxml2 -USE_PERL5= build - -DEPRECATED= Please consider using qemu or qemu41 -EXPIRATION_DATE=2020-08-20 -#BROKEN_powerpc64= fails to compile: In function aio_bh_poll: internal compiler error: Segmentation fault - -#.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") -#.endif - -HAS_CONFIGURE= yes -MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 - -OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \ - VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \ - STATIC_LINK DOCS NCURSES -SAMBA_DESC= samba dependency (for -smb) -GNUTLS_DESC= gnutls dependency (vnc encryption) -SASL_DESC= cyrus-sasl dependency (vnc encryption) -JPEG_DESC= jpeg dependency (vnc lossy compression) -PNG_DESC= png dependency (vnc compression) -CDROM_DMA_DESC= IDE CDROM DMA -PCAP_DESC= pcap dependency (networking with bpf) -USBREDIR_DESC= usb device network redirection (experimental!) -X86_TARGETS_DESC= Build only x86 system targets -STATIC_LINK_DESC= Statically link the executables -VDE_DESC= vde dependency (for vde networking) -OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE -OPTIONS_SUB= yes -X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2 -X11_USES= gnome sdl xorg -X11_CONFIGURE_ENABLE= sdl -GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -GTK3_USE= GNOME=gdkpixbuf2,gtk30,vte3 XORG=x11,xext -GTK3_USES= gettext gl xorg -GTK3_CONFIGURE_OFF= --disable-gtk --disable-vte -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -GNUTLS_CONFIGURE_OFF= --disable-gnutls -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASL_CONFIGURE_OFF= --disable-vnc-sasl -JPEG_USES= jpeg -JPEG_CONFIGURE_OFF= --disable-vnc-jpeg -PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_CONFIGURE_OFF= --disable-vnc-png -CURL_LIB_DEPENDS= libcurl.so:ftp/curl -CURL_CONFIGURE_OFF= --disable-curl -OPENGL_USE= GL=gl -OPENGL_USES= gl -OPENGL_CONFIGURE_OFF= --disable-opengl -USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir -USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir -USBREDIR_CONFIGURE_OFF= --disable-usb-redir -PCAP_CONFIGURE_ON= --enable-pcap -PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-patch-qapi_net.json ${FILESDIR}/pcap-patch-net_net.c \ - ${FILESDIR}/pcap-patch-net_clients.h -VDE_LIB_DEPENDS= libvdeplug.so:net/vde2 -VDE_CONFIGURE_OFF= --disable-vde -STATIC_LINK_CONFIGURE_ON= --static -STATIC_LINK_PREVENTS= GTK3 X11 -STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static -NCURSES_USES= ncurses:base -SAMBA_USES= samba:run # smbd -SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd -DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html \ - sphinx-build:textproc/py-sphinx -DOCS_USES= makeinfo -DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1 -X86_TARGETS_USE_OFF= XORG=pixman,x11 -X86_TARGETS_USES_OFF= xorg - -PORTDOCS= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \ - qemu-qmp-ref.html qemu-qmp-ref.txt - -WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation -CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} -CONFIGURE_ARGS= --localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \ - --extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh2 --enable-debug \ - --prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \ - --disable-linux-user --disable-linux-aio --disable-xen \ - --enable-debug-info --python=${PYTHON_CMD} \ - --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" -INSTALLS_ICONS= yes - -.include <bsd.port.options.mk> - -.if !defined(STRIP) || ${STRIP} == "" -CONFIGURE_ARGS+=--disable-strip -.endif - -.if ${ARCH} == "amd64" -MAKE_ARGS+= ARCH=x86_64 -.endif - -.if ${ARCH} == "powerpc" -MAKE_ARGS+= ARCH=ppc -.endif - -.if ${ARCH} == "powerpc64" -MAKE_ARGS+= ARCH=ppc64 -.endif - -.if ${ARCH} == "sparc64" -CONFIGURE_ARGS+= --sparc_cpu=v9 -.endif - -PLIST_SUB+= LINUXBOOT_DMA="" - -# -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) -# but it shouldn't matter much -post-patch: - @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ - -e '/libusb/s/ --atleast-version=1\.0\.[0-9]*//' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -E \ - -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ - -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ - ${WRKSRC}/Makefile - -post-patch-CDROM_DMA-off: - @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h - -# XXX need to disable usb host code on head while it's not ported to the -# new usb stack yet -post-configure: - @${REINPLACE_CMD} -E \ - -e "s|^(HOST_USB=)bsd|\1stub|" \ - ${WRKSRC}/config-host.mak - -.if !target(post-install) -post-install: - ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc - ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* - -post-install-DOCS-on: - @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) -.endif - -.include <bsd.port.mk> diff --git a/emulators/qemu40/distinfo b/emulators/qemu40/distinfo deleted file mode 100644 index e8610eb99faa..000000000000 --- a/emulators/qemu40/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1574541700 -SHA256 (qemu/4.0.1/qemu-4.0.1.tar.xz) = f2674dd6053ef1d48593aa1f0a50c5ac9039f7a059ecb6f9b8307f3fb2fcedad -SIZE (qemu/4.0.1/qemu-4.0.1.tar.xz) = 55637016 diff --git a/emulators/qemu40/files/patch-Makefile b/emulators/qemu40/files/patch-Makefile deleted file mode 100644 index 095b684f8e80..000000000000 --- a/emulators/qemu40/files/patch-Makefile +++ /dev/null @@ -1,42 +0,0 @@ ---- Makefile.orig 2019-04-23 18:14:45 UTC -+++ Makefile -@@ -311,9 +311,14 @@ LIBS+=-lz $(LIBS_TOOLS) - HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF) - - ifdef BUILD_DOCS -+ifdef NOPORTDOCS -+DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 -+DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 -+else - DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 - DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 - DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 -+endif - DOCS+=docs/qemu-block-drivers.7 - DOCS+=docs/qemu-cpu-models.7 - ifdef CONFIG_VIRTFS -@@ -742,11 +747,13 @@ install-sphinxdocs: sphinxdocs - $(call install-manual,interop) - - install-doc: $(DOCS) install-sphinxdocs -+ifndef NOPORTDOCS - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" -+endif - ifdef CONFIG_POSIX - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" -@@ -764,8 +771,10 @@ ifdef CONFIG_TRACE_SYSTEMTAP - endif - ifneq (,$(findstring qemu-ga,$(TOOLS))) - $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" -+ifndef NOPORTDOCS - $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" -+endif - $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" - endif - endif diff --git a/emulators/qemu40/files/patch-configure b/emulators/qemu40/files/patch-configure deleted file mode 100644 index c1222da4d086..000000000000 --- a/emulators/qemu40/files/patch-configure +++ /dev/null @@ -1,213 +0,0 @@ ---- configure.orig 2019-10-17 20:17:43 UTC -+++ configure -@@ -396,7 +396,7 @@ DSOSUF=".so" - LDFLAGS_SHARED="-shared" - modules="no" - prefix="/usr/local" --mandir="\${prefix}/share/man" -+mandir="\${prefix}/man" - datadir="\${prefix}/share" - firmwarepath="\${prefix}/share/qemu-firmware" - qemu_docdir="\${prefix}/share/doc/qemu" -@@ -476,6 +476,9 @@ numa="" - tcmalloc="no" - jemalloc="no" - replication="yes" -+pcap="no" -+pcap_create="no" -+bpf="no" - vxhs="" - bochs="yes" - cloop="yes" -@@ -1118,6 +1121,10 @@ for opt do - ;; - --enable-vnc-png) vnc_png="yes" - ;; -+ --enable-pcap) pcap="yes" -+ ;; -+ --disable-pcap) pcap="no" -+ ;; - --disable-slirp) slirp="no" - ;; - --enable-slirp=system) slirp="system" -@@ -2972,6 +2979,14 @@ if ! check_include "ifaddrs.h" ; then - fi - - ########################################## -+# getifaddrs (for tests/test-io-channel-socket ) -+ -+have_ifaddrs_h=yes -+if ! check_include "ifaddrs.h" ; then -+ have_ifaddrs_h=no -+fi -+ -+########################################## - # VTE probe - - if test "$vte" != "no"; then -@@ -3629,7 +3644,7 @@ for i in $glib_modules; do - glib_libs=$($pkg_config --libs $i) - QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" - LIBS="$glib_libs $LIBS" -- libs_qga="$glib_libs $libs_qga" -+ libs_qga="$glib_libs -lintl $libs_qga" - else - error_exit "glib-$glib_req_ver $i is required to compile QEMU" - fi -@@ -4723,11 +4738,6 @@ has_sphinx_build() { - if test "$docs" != "no" ; then - if has makeinfo && has pod2man && has_sphinx_build; then - docs=yes -- else -- if test "$docs" = "yes" ; then -- feature_not_found "docs" "Install texinfo, Perl/perl-podlators and python-sphinx" -- fi -- docs=no - fi - fi - -@@ -4861,7 +4871,7 @@ fi - - # check for libusb - if test "$libusb" != "no" ; then -- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then -+ if $pkg_config libusb-1.0; then - libusb="yes" - libusb_cflags=$($pkg_config --cflags libusb-1.0) - libusb_libs=$($pkg_config --libs libusb-1.0) -@@ -5251,7 +5261,51 @@ if test "$debug_stack_usage" = "yes"; then - fi - fi - -+########################################## -+# pcap probe - -+if test "$pcap" = "yes" -a "$pcap" != "no"; then -+ cat > $TMPC << EOF -+#include <pcap.h> -+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); } -+EOF -+ if test "$mingw32" = "no" ; then -+ libpcap=-lpcap -+ else -+ libpcap=-lwpcap -+ fi -+ if compile_prog "" "$libpcap" ; then -+ : -+ else -+ echo -+ echo "Error: Could not find pcap" -+ echo "Make sure to have the pcap libs and headers installed." -+ echo -+ exit 1 -+ fi -+ cat > $TMPC << EOF -+#include <pcap.h> -+int main(void) -+{ -+ char errbuf[PCAP_ERRBUF_SIZE]; -+ return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0); -+} -+EOF -+ if compile_prog "" "$libpcap" ; then -+ pcap_create="yes" -+ fi -+ cat > $TMPC << EOF -+#define PCAP_DONT_INCLUDE_PCAP_BPF_H -+#include <pcap.h> -+#include <net/bpf.h> -+int main(void) { return (BPF_MAJOR_VERSION); } -+EOF -+ if compile_prog ; then -+ bpf="yes" -+ fi -+ libs_softmmu="$libpcap $libs_softmmu" -+fi # test "$pcap" -+ - ########################################## - # check if we have open_by_handle_at - -@@ -6196,27 +6250,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] - cat > $TMPC <<EOF - int main(void) { return 0; } - EOF -- textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" -+ textseg_ldflags="-Wl,--image-base=$textseg_addr" - if ! compile_prog "" "$textseg_ldflags"; then -- # In case ld does not support -Ttext-segment, edit the default linker -- # script via sed to set the .text start addr. This is needed on FreeBSD -- # at least. -- if ! $ld --verbose >/dev/null 2>&1; then -- error_exit \ -- "We need to link the QEMU user mode binaries at a" \ -- "specific text address. Unfortunately your linker" \ -- "doesn't support either the -Ttext-segment option or" \ -- "printing the default linker script with --verbose." \ -- "If you don't want the user mode binaries, pass the" \ -- "--disable-user option to configure." -- fi -+ textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" -+ if ! compile_prog "" "$textseg_ldflags"; then -+ # In case ld does not support -Ttext-segment, edit the default linker -+ # script via sed to set the .text start addr. This is needed on FreeBSD -+ # at least. -+ if ! $ld --verbose >/dev/null 2>&1; then -+ error_exit \ -+ "We need to link the QEMU user mode binaries at a" \ -+ "specific text address. Unfortunately your linker" \ -+ "doesn't support either the -Ttext-segment option or" \ -+ "printing the default linker script with --verbose." \ -+ "If you don't want the user mode binaries, pass the" \ -+ "--disable-user option to configure." -+ fi - -- $ld --verbose | sed \ -- -e '1,/==================================================/d' \ -- -e '/==================================================/,$d' \ -- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ -- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld -- textseg_ldflags="-Wl,-T../config-host.ld" -+ $ld --verbose | sed \ -+ -e '1,/==================================================/d' \ -+ -e '/==================================================/,$d' \ -+ -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ -+ -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld -+ textseg_ldflags="-Wl,-T../config-host.ld" -+ fi - fi - fi - fi -@@ -6332,6 +6389,7 @@ echo "Audio drivers $audio_drv_list" - echo "Block whitelist (rw) $block_drv_rw_whitelist" - echo "Block whitelist (ro) $block_drv_ro_whitelist" - echo "VirtFS support $virtfs" -+echo "pcap support $pcap" - echo "Multipath support $mpath" - echo "VNC support $vnc" - if test "$vnc" = "yes" ; then -@@ -6565,6 +6623,15 @@ fi - if test "$profiler" = "yes" ; then - echo "CONFIG_PROFILER=y" >> $config_host_mak - fi -+if test "$pcap" = "yes" ; then -+ echo "CONFIG_PCAP=y" >> $config_host_mak -+ if test "$pcap_create" = "yes" ; then -+ echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak -+ fi -+ if test "$bpf" = "yes" ; then -+ echo "CONFIG_BPF=y" >> $config_host_mak -+ fi -+fi - if test "$slirp" != "no"; then - echo "CONFIG_SLIRP=y" >> $config_host_mak - echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -@@ -6812,6 +6879,9 @@ fi - # if this macro is set. - if test "$have_fsxattr" = "yes" ; then - echo "HAVE_FSXATTR=y" >> $config_host_mak -+fi -+if test "$have_ifaddrs_h" = "yes" ; then -+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak - fi - if test "$have_copy_file_range" = "yes" ; then - echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak diff --git a/emulators/qemu40/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc b/emulators/qemu40/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc deleted file mode 100644 index 546595845c62..000000000000 --- a/emulators/qemu40/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- disas/libvixl/vixl/a64/disasm-a64.cc.orig 2019-04-23 18:14:45 UTC -+++ disas/libvixl/vixl/a64/disasm-a64.cc -@@ -2693,7 +2693,7 @@ void Disassembler::AppendPCRelativeOffsetToOutput(cons - if (offset < 0) { - abs_offset = -abs_offset; - } -- AppendToOutput("#%c0x%" PRIx64, sign, abs_offset); -+ AppendToOutput("#%c0x%" PRIx64, sign, offset < 0 ? -offset : offset); - } - - diff --git a/emulators/qemu40/files/patch-include_net_net.h b/emulators/qemu40/files/patch-include_net_net.h deleted file mode 100644 index 92d57989a03f..000000000000 --- a/emulators/qemu40/files/patch-include_net_net.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/net/net.h.orig 2019-04-23 18:14:46 UTC -+++ include/net/net.h -@@ -209,8 +209,8 @@ void qmp_netdev_add(QDict *qdict, QObject **ret, Error - int net_hub_id_for_client(NetClientState *nc, int *id); - NetClientState *net_hub_port_find(int hub_id); - --#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" --#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" -+#define DEFAULT_NETWORK_SCRIPT PREFIX "/etc/qemu-ifup" -+#define DEFAULT_NETWORK_DOWN_SCRIPT PREFIX "/etc/qemu-ifdown" - #define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" - #define DEFAULT_BRIDGE_INTERFACE "br0" - diff --git a/emulators/qemu40/files/patch-include_qemu_atomic.h b/emulators/qemu40/files/patch-include_qemu_atomic.h deleted file mode 100644 index 623073e0b29a..000000000000 --- a/emulators/qemu40/files/patch-include_qemu_atomic.h +++ /dev/null @@ -1,54 +0,0 @@ ---- include/qemu/atomic.h.orig 2019-04-23 18:14:46 UTC -+++ include/qemu/atomic.h -@@ -201,10 +201,12 @@ - /* Provide shorter names for GCC atomic builtins, return old value */ - #define atomic_fetch_inc(ptr) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST) - #define atomic_fetch_dec(ptr) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST) -+#ifndef __cplusplus - #define atomic_fetch_add(ptr, n) __atomic_fetch_add(ptr, n, __ATOMIC_SEQ_CST) - #define atomic_fetch_sub(ptr, n) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_CST) - #define atomic_fetch_and(ptr, n) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_CST) - #define atomic_fetch_or(ptr, n) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CST) -+#endif - #define atomic_fetch_xor(ptr, n) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST) - - #define atomic_inc_fetch(ptr) __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST) -@@ -218,10 +220,12 @@ - /* And even shorter names that return void. */ - #define atomic_inc(ptr) ((void) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST)) - #define atomic_dec(ptr) ((void) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST)) -+#ifndef __cplusplus - #define atomic_add(ptr, n) ((void) __atomic_fetch_add(ptr, n, __ATOMIC_SEQ_CST)) - #define atomic_sub(ptr, n) ((void) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_CST)) - #define atomic_and(ptr, n) ((void) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_CST)) - #define atomic_or(ptr, n) ((void) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CST)) -+#endif - #define atomic_xor(ptr, n) ((void) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST)) - - #else /* __ATOMIC_RELAXED */ -@@ -389,10 +393,12 @@ - - #define atomic_inc_fetch(ptr) __sync_add_and_fetch(ptr, 1) - #define atomic_dec_fetch(ptr) __sync_add_and_fetch(ptr, -1) -+#ifndef __cplusplus - #define atomic_add_fetch(ptr, n) __sync_add_and_fetch(ptr, n) - #define atomic_sub_fetch(ptr, n) __sync_sub_and_fetch(ptr, n) - #define atomic_and_fetch(ptr, n) __sync_and_and_fetch(ptr, n) - #define atomic_or_fetch(ptr, n) __sync_or_and_fetch(ptr, n) -+#endif - #define atomic_xor_fetch(ptr, n) __sync_xor_and_fetch(ptr, n) - - #define atomic_cmpxchg(ptr, old, new) __sync_val_compare_and_swap(ptr, old, new) -@@ -401,10 +407,12 @@ - /* And even shorter names that return void. */ - #define atomic_inc(ptr) ((void) __sync_fetch_and_add(ptr, 1)) - #define atomic_dec(ptr) ((void) __sync_fetch_and_add(ptr, -1)) -+#ifndef __cplusplus - #define atomic_add(ptr, n) ((void) __sync_fetch_and_add(ptr, n)) - #define atomic_sub(ptr, n) ((void) __sync_fetch_and_sub(ptr, n)) - #define atomic_and(ptr, n) ((void) __sync_fetch_and_and(ptr, n)) - #define atomic_or(ptr, n) ((void) __sync_fetch_and_or(ptr, n)) -+#endif - #define atomic_xor(ptr, n) ((void) __sync_fetch_and_xor(ptr, n)) - - #endif /* __ATOMIC_RELAXED */ diff --git a/emulators/qemu40/files/patch-net_tap-bsd.c b/emulators/qemu40/files/patch-net_tap-bsd.c deleted file mode 100644 index 6d94c1bde1ca..000000000000 --- a/emulators/qemu40/files/patch-net_tap-bsd.c +++ /dev/null @@ -1,10 +0,0 @@ ---- net/tap-bsd.c.orig 2019-04-23 18:14:46 UTC -+++ net/tap-bsd.c -@@ -31,6 +31,7 @@ - - #if defined(__NetBSD__) || defined(__FreeBSD__) - #include <sys/ioctl.h> -+#include <sys/socket.h> - #include <net/if.h> - #include <net/if_tap.h> - #endif diff --git a/emulators/qemu40/files/patch-qemu-doc.texi b/emulators/qemu40/files/patch-qemu-doc.texi deleted file mode 100644 index aa79d423f792..000000000000 --- a/emulators/qemu40/files/patch-qemu-doc.texi +++ /dev/null @@ -1,21 +0,0 @@ ---- qemu-doc.texi.orig 2019-04-23 18:14:46 UTC -+++ qemu-doc.texi -@@ -200,7 +200,7 @@ VGA BIOS. - QEMU uses YM3812 emulation by Tatsuyuki Satoh. - - QEMU uses GUS emulation (GUSEMU32 @url{http://www.deinmeister.de/gusemu/}) --by Tibor "TS" Schütz. -+by Tibor "TS" Schuetz. - - Note that, by default, GUS shares IRQ(7) with parallel ports and so - QEMU must be told to not have parallel ports to have working GUS. -@@ -560,7 +560,8 @@ Send the escape character to the frontend - - @c man begin SEEALSO - The HTML documentation of QEMU for more precise information and Linux --user mode emulator invocation. -+user mode emulator invocation, as well as the FreeBSD host notes in -+@file{pkg-message} in the relevant qemu port directory. - @c man end - - @c man begin AUTHOR diff --git a/emulators/qemu40/files/patch-util-cacheinfo.c b/emulators/qemu40/files/patch-util-cacheinfo.c deleted file mode 100644 index 58f57fbc65a0..000000000000 --- a/emulators/qemu40/files/patch-util-cacheinfo.c +++ /dev/null @@ -1,41 +0,0 @@ ---- util/cacheinfo.c.orig 2019-10-17 15:17:44.000000000 -0500 -+++ util/cacheinfo.c 2020-01-17 21:13:29.459470000 -0600 -@@ -65,25 +65,28 @@ static void sys_cache_info(int *isize, int *dsize) - g_free(buf); - } - --#elif defined(__APPLE__) \ -- || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#elif defined(__APPLE__) - # include <sys/sysctl.h> --# if defined(__APPLE__) --# define SYSCTL_CACHELINE_NAME "hw.cachelinesize" --# else --# define SYSCTL_CACHELINE_NAME "machdep.cacheline_size" --# endif -- - static void sys_cache_info(int *isize, int *dsize) - { - /* There's only a single sysctl for both I/D cache line sizes. */ - long size; - size_t len = sizeof(size); -- if (!sysctlbyname(SYSCTL_CACHELINE_NAME, &size, &len, NULL, 0)) { -+ if (!sysctlbyname("hw.cachelinesize", &size, &len, NULL, 0)) { - *isize = *dsize = size; - } - } -- -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+# include <sys/sysctl.h> -+static void sys_cache_info(int *isize, int *dsize) -+{ -+ /* There's only a single sysctl for both I/D cache line sizes. */ -+ int size; -+ size_t len = sizeof(size); -+ if (!sysctlbyname("machdep.cacheline_size", &size, &len, NULL, 0)) { -+ *isize = *dsize = size; -+ } -+} - #else - /* POSIX */ - diff --git a/emulators/qemu40/files/pcap-patch-net_clients.h b/emulators/qemu40/files/pcap-patch-net_clients.h deleted file mode 100644 index 5b56f1b2f49a..000000000000 --- a/emulators/qemu40/files/pcap-patch-net_clients.h +++ /dev/null @@ -1,13 +0,0 @@ ---- net/clients.h.orig 2018-04-24 16:30:47 UTC -+++ net/clients.h -@@ -61,4 +61,10 @@ int net_init_netmap(const Netdev *netdev, const char * - int net_init_vhost_user(const Netdev *netdev, const char *name, - NetClientState *peer, Error **errp); - -+#ifdef CONFIG_PCAP -+int net_init_pcap(const Netdev *netdev, const char *name, -+ NetClientState *peer, Error **errp); -+#endif -+ -+ - #endif /* QEMU_NET_CLIENTS_H */ diff --git a/emulators/qemu40/files/pcap-patch-net_net.c b/emulators/qemu40/files/pcap-patch-net_net.c deleted file mode 100644 index 6fa5ca941f7d..000000000000 --- a/emulators/qemu40/files/pcap-patch-net_net.c +++ /dev/null @@ -1,250 +0,0 @@ ---- net/net.c.orig 2018-04-24 16:30:47 UTC -+++ net/net.c -@@ -52,6 +52,11 @@ - #include "net/filter.h" - #include "qapi/string-output-visitor.h" - -+#include <sys/ioctl.h> -+#ifdef __FreeBSD__ -+#include <net/if.h> -+#endif -+ - /* Net bridge is currently not supported for W32. */ - #if !defined(_WIN32) - # define CONFIG_NET_BRIDGE -@@ -929,7 +934,225 @@ static int net_init_nic(const Netdev *netdev, const ch - return idx; - } - -+#if defined(CONFIG_PCAP) -+#if defined(CONFIG_BPF) -+#define PCAP_DONT_INCLUDE_PCAP_BPF_H -+#include <net/bpf.h> -+#endif -+#include <pcap.h> - -+struct PCAPState { -+ NetClientState nc; -+ pcap_t *handle; -+ int max_eth_frame_size; -+}; -+ -+static ssize_t pcap_receive(NetClientState *nc, const uint8_t *buf, size_t size) -+{ -+ struct PCAPState *s = DO_UPCAST(struct PCAPState, nc, nc); -+ -+ return pcap_inject(s->handle, (u_char*)buf, size); -+} -+ -+static void pcap_callback(u_char *user, struct pcap_pkthdr *phdr, u_char *pdata -+ ) -+{ -+ NetClientState *nc = (NetClientState *)user; -+ -+ int len = phdr->len; -+#ifdef __FreeBSD__ -+ struct PCAPState *s = DO_UPCAST(struct PCAPState, nc, nc); -+ int max_eth_frame_size = s->max_eth_frame_size; -+ -+ if (len > max_eth_frame_size) { -+ fprintf(stderr, -+ "pcap_send: packet size > %d (%d), truncating\n", -+ max_eth_frame_size, len); -+ len = max_eth_frame_size; -+ } -+#endif -+ qemu_send_packet(nc, pdata, len); -+} -+ -+static void pcap_send(void *opaque) -+{ -+ struct PCAPState *s = (struct PCAPState *)opaque; -+ -+ for (;;) { -+ if (pcap_dispatch(s->handle, 0, (pcap_handler)&pcap_callback, (u_char *)&s->nc) >= 0) -+ break; -+ } -+} -+ -+static void pcap_cleanup(NetClientState *nc) -+{ -+ struct PCAPState *s = DO_UPCAST(struct PCAPState, nc, nc); -+ -+ qemu_purge_queued_packets(nc); -+ pcap_close(s->handle); -+} -+ -+static NetClientInfo net_pcap_info = { -+ .type = NET_CLIENT_DRIVER_PCAP, -+ .size = sizeof(struct PCAPState), -+ .receive = pcap_receive, -+// .receive_raw = pcap_receive_raw, -+// .receive_iov = pcap_receive_iov, -+// .poll = pcap_poll, -+ .cleanup = pcap_cleanup, -+}; -+/* -+ * ... -net pcap,ifname="..." -+ */ -+ -+int net_init_pcap(const Netdev *netdev, -+ const char *name, NetClientState *peer, Error **errp) -+{ -+ const NetdevPcapOptions *pcap_opts; -+ NetClientState *nc; -+ struct PCAPState *s; -+ const char *ifname; -+ char errbuf[PCAP_ERRBUF_SIZE]; -+#if defined(_WIN32) -+ HANDLE h; -+#endif -+ int i; -+ -+ assert(netdev->type == NET_CLIENT_DRIVER_PCAP); -+ pcap_opts = &netdev->u.pcap; -+ if (!pcap_opts->has_ifname) -+ return -1; -+ -+ ifname = pcap_opts->ifname; -+ -+ /* create the object */ -+ nc = qemu_new_net_client(&net_pcap_info, peer, "pcap", ifname); -+ s = DO_UPCAST(struct PCAPState, nc, nc); -+ -+ if (ifname == NULL && (ifname = pcap_lookupdev(errbuf)) == NULL) { -+ fprintf(stderr, "qemu: pcap_create: %s\n", errbuf); -+ goto fail; -+ } -+ -+#ifdef __FreeBSD__ -+ /* -+ * We want to avoid passing oversize packets to the guest, which -+ * at least on FreeBSD can happen if the host interface uses tso -+ * (seen with an em(4) in this case) - so find out the host -+ * interface's mtu and assume the guest is configured the same. -+ */ -+ s->max_eth_frame_size = 1514; -+ i = socket(AF_INET, SOCK_DGRAM, 0); -+ if (i >= 0) { -+ struct ifreq ifr; -+ -+ (void) memset(&ifr, 0, sizeof(ifr)); -+ strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); -+ if (ioctl(i, SIOCGIFMTU, &ifr) != -1) -+ s->max_eth_frame_size = ifr.ifr_mtu + 14; -+ close(i); -+ } -+#endif -+ -+#if defined(CONFIG_PCAP_CREATE) || defined(_WIN32) -+ /* -+ * Create pcap handle for the device, set promiscuous mode and activate. -+ */ -+ s->handle = (void *)pcap_create(ifname, errbuf); -+ if (!s->handle) { -+ fprintf(stderr, "qemu: pcap_create: %s\n", errbuf); -+ goto fail; -+ } -+ if (pcap_set_promisc(s->handle, 1) != 0) { -+ pcap_perror(s->handle, (char *)"qemu: pcap_set_promisc:"); -+ goto fail; -+ } -+ if (pcap_activate(s->handle) != 0) { -+ pcap_perror(s->handle, (char *)"qemu: pcap_activate:"); -+ goto fail; -+ } -+#else -+ /* Attempt to connect device. */ -+ s->handle = (void *)pcap_open_live(ifname, 65535, 1, 0, errbuf); -+ if (!s->handle) { -+ fprintf(stderr, "qemu: pcap_open_live: %s\n", errbuf); -+ goto fail; -+ } -+#endif -+ -+ /* Set non-blocking mode. */ -+ if (pcap_setnonblock(s->handle, 1, errbuf) < 0) { -+ fprintf(stderr, "qemu: pcap_setnonblock: %s\n", errbuf); -+ goto fail; -+ } -+ -+#if defined(_WIN32) -+ /* -+ * Tell the kernel that the packet has to be seen immediately. -+ */ -+ if (pcap_setmintocopy(s->handle, 0) < 0) { -+ fprintf(stderr, "qemu: pcap failed to set immediate mode\n"); -+ goto fail; -+ } -+#else /* !_WIN32 */ -+#if defined(CONFIG_BPF) -+#if defined(BIOCIMMEDIATE) -+ /* -+ * Tell the kernel that the packet has to be seen immediately. -+ */ -+ { -+ unsigned int one = 1; -+ if (ioctl(pcap_fileno(s->handle), BIOCIMMEDIATE, &one) < 0) { -+ fprintf(stderr, "qemu: pcap failed to set immediate mode\n"); -+ goto fail; -+ } -+ } -+#endif /* BIOCIMMEDIATE */ -+#if defined(BIOCFEEDBACK) -+ /* -+ * Tell the kernel that the sent packet has to be fed back. -+ * This is necessary to connect host and guest. -+ */ -+ { -+ unsigned int one = 1; -+ if (ioctl(pcap_fileno(s->handle), BIOCFEEDBACK, &one) < 0) { -+ fprintf(stderr, "qemu: pcap failed to set feedback mode\n"); -+ goto fail; -+ } -+ } -+#endif /* BIOCFEEDBACK */ -+#endif /* CONFIG_BPF */ -+#endif /* _WIN32 */ -+ -+ snprintf(s->nc.info_str, sizeof(s->nc.info_str), "pcap redirector"); -+ -+#if defined(_WIN32) -+ if ((h = pcap_getevent(s->handle)) == NULL) { -+ fprintf(stderr, "qemu: pcap_getevent failed\n"); -+ goto fail; -+ } -+ qemu_add_wait_object(h, pcap_send, s); -+#else /* !_WIN32 */ -+ if ((i = pcap_get_selectable_fd(s->handle)) < 0) { -+ fprintf(stderr, "qemu: pcap_get_selectable_fd failed\n"); -+ goto fail; -+ } -+ qemu_set_fd_handler(i, pcap_send, NULL, s); -+#endif /* _WIN32 */ -+ -+ return 0; -+ -+fail: -+ if (s) { -+ if (s->handle) -+ pcap_close(s->handle); -+ } -+ -+ return -1; -+} -+ -+#endif -+ - static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])( - const Netdev *netdev, - const char *name, -@@ -955,6 +1178,9 @@ static int (* const net_client_init_fun[NET_CLIENT_DRI - #endif - #ifdef CONFIG_L2TPV3 - [NET_CLIENT_DRIVER_L2TPV3] = net_init_l2tpv3, -+#endif -+#ifdef CONFIG_PCAP -+ [NET_CLIENT_DRIVER_PCAP] = net_init_pcap, - #endif - }; - diff --git a/emulators/qemu40/files/pcap-patch-qapi_net.json b/emulators/qemu40/files/pcap-patch-qapi_net.json deleted file mode 100644 index 39114c65d591..000000000000 --- a/emulators/qemu40/files/pcap-patch-qapi_net.json +++ /dev/null @@ -1,56 +0,0 @@ ---- qapi/net.json.orig 2018-04-24 16:30:47 UTC -+++ qapi/net.json -@@ -388,6 +388,19 @@ - '*helper': 'str' } } - - ## -+# @NetdevPcapOptions: -+# -+# Use ifname as a source to capture -+# -+# @ifname: #required to determine which interface to capture -+# -+# Since: 1.2 -+## -+{ 'struct': 'NetdevPcapOptions', -+ 'data': { -+ '*ifname': 'str' } } -+ -+## - # @NetdevHubPortOptions: - # - # Connect two or more net clients through a software hub. -@@ -454,7 +467,7 @@ - ## - { 'enum': 'NetClientDriver', - 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', -- 'bridge', 'hubport', 'netmap', 'vhost-user' ] } -+ 'bridge', 'hubport', 'netmap', 'vhost-user', 'pcap' ] } - - ## - # @Netdev: -@@ -478,6 +491,7 @@ - 'user': 'NetdevUserOptions', - 'tap': 'NetdevTapOptions', - 'l2tpv3': 'NetdevL2TPv3Options', -+ 'pcap': 'NetdevPcapOptions', - 'socket': 'NetdevSocketOptions', - 'vde': 'NetdevVdeOptions', - 'bridge': 'NetdevBridgeOptions', -@@ -514,7 +528,7 @@ - ## - { 'enum': 'NetLegacyOptionsType', - 'data': ['none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', -- 'bridge', 'netmap', 'vhost-user'] } -+ 'bridge', 'netmap', 'vhost-user', 'pcap'] } - - ## - # @NetLegacyOptions: -@@ -532,6 +546,7 @@ - 'user': 'NetdevUserOptions', - 'tap': 'NetdevTapOptions', - 'l2tpv3': 'NetdevL2TPv3Options', -+ 'pcap': 'NetdevPcapOptions', - 'socket': 'NetdevSocketOptions', - 'vde': 'NetdevVdeOptions', - 'bridge': 'NetdevBridgeOptions', diff --git a/emulators/qemu40/files/qemu-ifdown.sample b/emulators/qemu40/files/qemu-ifdown.sample deleted file mode 100644 index 89d9a9bff436..000000000000 --- a/emulators/qemu40/files/qemu-ifdown.sample +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec true diff --git a/emulators/qemu40/files/qemu-ifup.sample b/emulators/qemu40/files/qemu-ifup.sample deleted file mode 100644 index 89d9a9bff436..000000000000 --- a/emulators/qemu40/files/qemu-ifup.sample +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec true diff --git a/emulators/qemu40/pkg-descr b/emulators/qemu40/pkg-descr deleted file mode 100644 index 018952f53cf1..000000000000 --- a/emulators/qemu40/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -QEMU is a FAST! processor emulator using dynamic translation to achieve -good emulation speed. -QEMU has two operating modes: - - * Full system emulation. In this mode, QEMU emulates a full system -(for example a PC), including a processor and various peripherials. -It can be used to launch different Operating Systems without rebooting -the PC or to debug system code. - * User mode emulation (Linux host only). In this mode, QEMU can launch -Linux processes compiled for one CPU on another CPU. It can be used to -launch the Wine Windows API emulator or to ease cross-compilation and -cross-debugging. - -As QEMU requires no host kernel patches to run, it is very safe and easy to use. - -See also the preconfigured system images on http://oszoo.org/ -Many live cd isos also work. - -WWW: http://wiki.qemu.org/Main_Page diff --git a/emulators/qemu40/pkg-message b/emulators/qemu40/pkg-message deleted file mode 100644 index 4ce5e9a61853..000000000000 --- a/emulators/qemu40/pkg-message +++ /dev/null @@ -1,188 +0,0 @@ -[ -{ type: install - message: <<EOM -FreeBSD host notes -================== - -- Needs to set net.link.tap.user_open sysctl in order to use /dev/tap* - networking as non-root. Don't forget to adjust device node permissions in - /etc/devfs.rules. - -- slirp (usermode networking) is fixed now in cvs, on FreeSBIE 1.0 guests you - still have to manually do: echo nameserver 10.0.2.3 >/etc/resolv.conf but - i've been told that that's normal. (fixed on FreeSBIE 1.1.) And you have - to wait a bit for dhclient to do its thing; traffic to address 10.0.2.2 is - routed to 127.1 on the host. - -- Expect timer problems when guest kernel HZ is > hosts, for example time - sleep 1 takes 49 seconds and booting sleeps for minutes at the acd0 probe - with a FreeSBIE 1.0 guest, thats because its kernel is built with HZ=5000, - and FreeBSD's default is 100... (no longer a problem with FreeSBIE 1.1.) - The linux 2.6 kernel uses 1000 by default btw. (changed to 250 later, and - recent linux kernels now no longer have a fixed HZ, aka `tickless - kernel'...) Enabling /dev/rtc doesn't seem to help either (not included - since it needs a patch to emulators/rtc.) - -- Update: the above problem has gotten worse with FreeBSD guests - somewhere before 8.0, mainly since the kernel now usually wants - double or even quadruple number of timer irqs compared to HZ if - it detects an apic (and at least early versions of FreeBSD 8 had - a bug that essentially halved qemu's clock rate too); the only - reason you usually don't see symptoms of this with FreeBSD 8 - guests is they automatically reduce their HZ to 100 when running - in a VM while the default for the host kernel is still HZ=1000. - Workaround: you can disable the apic clock in the guest by setting - - hint.apic.0.clock="0" - - in loader.conf(5) (or manually at the loader prompt), if that - doesn't work the only things you can do is either reduce the - guest's HZ to, say, 100 by setting e.g. - - kern.hz="100" - - from the loader as above (which usually is a good idea in a VM - anyway and FreeBSD 8 now does by itself as mentioned), or otherwise - increase the host's HZ to 2000 or even 4000 from the loader in - the same way. - -- The -smb option (smb-export local dir to guest using the default - slirp networking) needs the samba port/package installed - in addition to qemu. (SAMBA knob.) - -- If you want to use usb devices connected to the host in the guest - yot need either recent 10-current (not tested yet much) or you can - use usbredir over the network (see below); also unless you are - running qemu as root you then need to fix permissions for /dev/ugen* - device nodes: if you are on 5.x or later (devfs) put a rule in - /etc/devfs.rules, activate it in /etc/rc.conf and run /etc/rc.d/devfs - restart. Example devfs.rules: - - [ugen_ruleset=20] - add path 'ugen*' mode 660 group operator - - corresponding rc.conf line: - - devfs_system_ruleset="ugen_ruleset" - -- If you want to test the new (in 0.15.0) usb network redirection (USBREDIR - option) see this thread by Hans de Goede <hdegoede <at> redhat.com>: - - http://thread.gmane.org/gmane.comp.emulators.qemu/110176/focus=110183 - - Quote: - - Example usage: - - 1) Start usbredirserver for a usb device: - sudo usbredirserver 045e:0772 - 2) Start qemu with usb2 support + a chardev talking to usbredirserver + - a usb-redir device using this chardev: - qemu -usb \ - -readconfig docs/ich9-ehci-uhci.cfg \ - -chardev socket,id=usbredirchardev,host=localhost,port=4000 \ - -device usb-redir,chardev=usbredirchardev,id=usbredirdev ... - - [you would replace docs/ich9-ehci-uhci.cfg with e.g. - /usr/local/share/doc/qemu/docs/ich9-ehci-uhci.cfg, but turns out - ehci was broken for me here with FreeBSD guests and the previous - qemu version at least, I got: - - FETCHENTRY: entry at 22C5484 is of type 2 which is not supported yet -processing error - resetting ehci HC - Assertion failed: (0), function ehci_advance_state, file /data/ports/emulators/qemu-devel/work/qemu-0.15.0/hw/usb-ehci.c, line 2045. - - The new qemu version works better tho.] - -- Still usb: since the hub is no longer attached to the uchi controller and - the wakeup mechanism, resume interrupt is not implemented yet linux guests - will suspend the bus, i.e. they wont see devices usb_add'ed after its - (linux') uhci module got loaded. Workaround: either add devices before - linux loads the module or rmmod and modprobe it afterwards. [Not sure - if this still applies to the new libusb host code used on recent - 10-current.] - -- If you get repeated `atapi_poll called!' console messages with FreeBSD - guests or other weird cdrom problems then thats probably because the guest - has atapicam loaded, which for reasons still to be determined has problems - with qemu's now by default enabled cdrom dma. You can build the port with - CDROM_DMA disabled to disable it. [Looks like this is fixed in recent - FreeBSD guest versions.] - -- If you build qemu wihout SDL and then get crashes running it try passing it - -nographic. This should probably be default in that case... - -- qemu's network boot roms (-boot n) have a bug when bootfiles sizes are a - multiple of blksize, if this affects you (like with FreeBSD's /boot/pxeboot) - you can do like - - cp /boot/pxeboot pxeboot-qemu && chmod +w pxeboot-qemu && echo >>pxeboot-qemu - - and then use pxeboot-qemu. Actually you need recent btx code - (from after 7.0 was released) because of the real mode boot - problem, so use at least pxeboot from there. And I just did that - for the pxeboot extracted out of - - ftp://ftp.freebsd.org/pub/FreeBSD/snapshots/200805/7.0-STABLE-200805-i386-bootonly.iso - - and placed it here: - - http://people.freebsd.org/~nox/qemu/pxeboot-qemu - -- If you use slirp (usernet, the default) and want to mount nfs into the guest - and you are not running qemu as root, then mountd(8) on the exporting box - needs to be run with -n in order to accept requests from ports >= 1024. - -- (not FreeBSD-specific:) There have been reports of qcow2 corruption with (at - least) win2k guests on recent kvm (which uses similar qcow2 code than qemu - now, see this thread: - - http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg00713.html - - - the consensus on that thread seems to be that qcow(2) code has always been - experimental and you should use raw images if you want reliability; raw is - also usually faster.) You should be able to migrate existing images to raw - using qemu-img(1)'s convert function; raw doesn't support advanced features - like snapshots tho. [a few important qcow2 bugfixed have been committed in - the meantime so this _might_ be less of an issue now; and meanwhile there - also is the new qed format - I don't know how stable that one is.] - -- (also not FreeBSD-specific:) It is recommended to pass raw images using the - new -drive syntax, specifying format=raw explicitly in order to avoid - malicious guests being able to exploit the format autodetection thats - otherwise getting used. (Not that you should run malicious guests anyway, - but this eleminates at least a known attack vector.) - -- qemu now has improved physical cdrom support, but still there is at - least one known problem: you need to have the guest eject the disc if you - want to change it/take it out, or otherwise the guest may continue using - state (like size) of the old disc. (You can also do like `change ide1-cd0 - /dev/acd0' in the monitor after taking out the disc if a guest cannot eject - it itself.) - -- The default configuration location (qemu-ifup script etc.) has been changed - from /etc to PREFIX/etc (usually /usr/local/etc). Move your files - accordingly. - -- The pcap code (-net nic... -net pcap,ifname=...) should work properly now, - with only one exception: Advanced features like TSO used on the host - interface can cause oversize packets which now do get truncated to avoid - confusing/panicing guests but of course still will cause retransmissions. - So if you see slow throughput and `pcap_send: packet size > ..., truncating' - messages on qemu's tty try disabling TSO etc on the host interface at least - while using pcap. - -- kqemu is no longer supported in qemu upstream after the 0.11 branch - was created, which means also not in this version. (Linux has moved - on to kvm now for qemu(-like) virtualization needs, so if you want qemu - to go faster and don't want to switch to virtualbox or stick to the older - emulators/qemu port which is at 0.11.1 atm and as such still supports - kqemu you should help getting the FreeBSD kvm port updated and - completed: - - http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD - - ) -EOM -} -] diff --git a/emulators/qemu40/pkg-plist b/emulators/qemu40/pkg-plist deleted file mode 100644 index bf144fa1a856..000000000000 --- a/emulators/qemu40/pkg-plist +++ /dev/null @@ -1,155 +0,0 @@ -bin/elf2dmp -bin/qemu-edid -bin/qemu-ga -bin/qemu-i386 -bin/qemu-img -bin/qemu-io -%%GTK3%%bin/qemu-keymap -bin/qemu-nbd -%%NO_X86_TARGETS%%bin/qemu-sparc -%%NO_X86_TARGETS%%bin/qemu-sparc64 -%%NO_X86_TARGETS%%bin/qemu-system-aarch64 -%%NO_X86_TARGETS%%bin/qemu-system-alpha -%%NO_X86_TARGETS%%bin/qemu-system-arm -%%NO_X86_TARGETS%%bin/qemu-system-cris -%%NO_X86_TARGETS%%bin/qemu-system-hppa -bin/qemu-system-i386 -%%NO_X86_TARGETS%%bin/qemu-system-lm32 -%%NO_X86_TARGETS%%bin/qemu-system-m68k -%%NO_X86_TARGETS%%bin/qemu-system-microblaze -%%NO_X86_TARGETS%%bin/qemu-system-microblazeel -%%NO_X86_TARGETS%%bin/qemu-system-mips -%%NO_X86_TARGETS%%bin/qemu-system-mips64 -%%NO_X86_TARGETS%%bin/qemu-system-mips64el -%%NO_X86_TARGETS%%bin/qemu-system-mipsel -%%NO_X86_TARGETS%%bin/qemu-system-moxie -%%NO_X86_TARGETS%%bin/qemu-system-nios2 -%%NO_X86_TARGETS%%bin/qemu-system-or1k -%%NO_X86_TARGETS%%bin/qemu-system-ppc -%%NO_X86_TARGETS%%bin/qemu-system-ppc64 -%%NO_X86_TARGETS%%bin/qemu-system-riscv32 -%%NO_X86_TARGETS%%bin/qemu-system-riscv64 -%%NO_X86_TARGETS%%bin/qemu-system-s390x -%%NO_X86_TARGETS%%bin/qemu-system-sh4 -%%NO_X86_TARGETS%%bin/qemu-system-sh4eb -%%NO_X86_TARGETS%%bin/qemu-system-sparc -%%NO_X86_TARGETS%%bin/qemu-system-sparc64 -%%NO_X86_TARGETS%%bin/qemu-system-tricore -%%NO_X86_TARGETS%%bin/qemu-system-unicore32 -bin/qemu-system-x86_64 -%%NO_X86_TARGETS%%bin/qemu-system-xtensa -%%NO_X86_TARGETS%%bin/qemu-system-xtensaeb -bin/qemu-x86_64 -man/man1/qemu.1.gz -man/man1/qemu-img.1.gz -man/man7/qemu-block-drivers.7.gz -man/man7/qemu-cpu-models.7.gz -man/man7/qemu-ga-ref.7.gz -man/man7/qemu-qmp-ref.7.gz -man/man8/qemu-ga.8.gz -man/man8/qemu-nbd.8.gz -@sample etc/qemu-ifup.sample -@sample etc/qemu-ifdown.sample -%%DATADIR%%/QEMU,tcx.bin -%%DATADIR%%/QEMU,cgthree.bin -%%DATADIR%%/bios-256k.bin -%%DATADIR%%/bios.bin -%%DATADIR%%/canyonlands.dtb -%%DATADIR%%/efi-e1000.rom -%%DATADIR%%/efi-e1000e.rom -%%DATADIR%%/efi-eepro100.rom -%%DATADIR%%/efi-ne2k_pci.rom -%%DATADIR%%/efi-pcnet.rom -%%DATADIR%%/efi-rtl8139.rom -%%DATADIR%%/efi-virtio.rom -%%DATADIR%%/efi-vmxnet3.rom -%%DATADIR%%/hppa-firmware.img -%%DATADIR%%/qemu_vga.ndrv -%%DATADIR%%/s390-netboot.img -%%DATADIR%%/u-boot-sam460-20100605.bin -%%DATADIR%%/vgabios.bin -%%DATADIR%%/vgabios-cirrus.bin -%%DATADIR%%/vgabios-qxl.bin -%%DATADIR%%/vgabios-stdvga.bin -%%DATADIR%%/vgabios-virtio.bin -%%DATADIR%%/vgabios-vmware.bin -%%DATADIR%%/palcode-clipper -%%DATADIR%%/ppc_rom.bin -%%DATADIR%%/openbios-ppc -%%DATADIR%%/openbios-sparc32 -%%DATADIR%%/openbios-sparc64 -%%DATADIR%%/pxe-e1000.rom -%%DATADIR%%/pxe-eepro100.rom -%%DATADIR%%/pxe-ne2k_pci.rom -%%DATADIR%%/pxe-rtl8139.rom -%%DATADIR%%/pxe-pcnet.rom -%%DATADIR%%/pxe-virtio.rom -%%DATADIR%%/petalogix-ml605.dtb -%%DATADIR%%/spapr-rtas.bin -%%DATADIR%%/slof.bin -%%DATADIR%%/s390-ccw.img -%%DATADIR%%/linuxboot.bin -%%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin -%%DATADIR%%/multiboot.bin -%%DATADIR%%/sgabios.bin -%%DATADIR%%/skiboot.lid -%%DATADIR%%/trace-events-all -%%DATADIR%%/petalogix-s3adsp1800.dtb -%%DATADIR%%/bamboo.dtb -%%DATADIR%%/kvmvapic.bin -%%DATADIR%%/u-boot.e500 -%%DATADIR%%/keymaps/ar -%%DATADIR%%/keymaps/bepo -%%DATADIR%%/keymaps/cz -%%DATADIR%%/keymaps/da -%%DATADIR%%/keymaps/de -%%DATADIR%%/keymaps/de-ch -%%DATADIR%%/keymaps/en-gb -%%DATADIR%%/keymaps/en-us -%%DATADIR%%/keymaps/es -%%DATADIR%%/keymaps/et -%%DATADIR%%/keymaps/fi -%%DATADIR%%/keymaps/fo -%%DATADIR%%/keymaps/fr -%%DATADIR%%/keymaps/fr-be -%%DATADIR%%/keymaps/fr-ca -%%DATADIR%%/keymaps/fr-ch -%%DATADIR%%/keymaps/hr -%%DATADIR%%/keymaps/hu -%%DATADIR%%/keymaps/is -%%DATADIR%%/keymaps/it -%%DATADIR%%/keymaps/ja -%%DATADIR%%/keymaps/lt -%%DATADIR%%/keymaps/lv -%%DATADIR%%/keymaps/mk -%%DATADIR%%/keymaps/nl -%%DATADIR%%/keymaps/no -%%DATADIR%%/keymaps/pl -%%DATADIR%%/keymaps/pt -%%DATADIR%%/keymaps/pt-br -%%DATADIR%%/keymaps/ru -%%DATADIR%%/keymaps/sl -%%DATADIR%%/keymaps/sv -%%DATADIR%%/keymaps/th -%%DATADIR%%/keymaps/tr -%%DATADIR%%/pvh.bin -%%DATADIR%%/vgabios-bochs-display.bin -%%DATADIR%%/vgabios-ramfb.bin -share/icons/hicolor/128x128/apps/qemu.png -share/icons/hicolor/16x16/apps/qemu.png -share/icons/hicolor/24x24/apps/qemu.png -share/icons/hicolor/256x256/apps/qemu.png -share/icons/hicolor/32x32/apps/qemu.bmp -share/icons/hicolor/32x32/apps/qemu.png -share/icons/hicolor/48x48/apps/qemu.png -share/icons/hicolor/512x512/apps/qemu.png -share/icons/hicolor/64x64/apps/qemu.png -share/icons/hicolor/scalable/apps/qemu.svg -share/applications/qemu.desktop -%%GTK3%%share/locale/bg/LC_MESSAGES/qemu.mo -%%GTK3%%share/locale/de_DE/LC_MESSAGES/qemu.mo -%%GTK3%%share/locale/fr_FR/LC_MESSAGES/qemu.mo -%%GTK3%%share/locale/hu/LC_MESSAGES/qemu.mo -%%GTK3%%share/locale/it/LC_MESSAGES/qemu.mo -%%GTK3%%share/locale/tr/LC_MESSAGES/qemu.mo -%%GTK3%%share/locale/zh_CN/LC_MESSAGES/qemu.mo diff --git a/games/Makefile b/games/Makefile index c4f6fffa47a4..b286b739bc80 100644 --- a/games/Makefile +++ b/games/Makefile @@ -538,8 +538,6 @@ SUBDIR += lightyears SUBDIR += lincity SUBDIR += lincity-ng - SUBDIR += linux-darwinia-demo - SUBDIR += linux-defcon SUBDIR += linux-doom3 SUBDIR += linux-doom3-demo SUBDIR += linux-dwarffortress @@ -561,7 +559,6 @@ SUBDIR += linux-unigine-heaven SUBDIR += linux-unigine-valley SUBDIR += linux-unrealgold - SUBDIR += linux-uplink-demo SUBDIR += linux-ut SUBDIR += linux-ut2003-demo SUBDIR += linux-virtual-jay-peak @@ -1047,7 +1044,6 @@ SUBDIR += xdigger SUBDIR += xdino SUBDIR += xemeraldia - SUBDIR += xevil SUBDIR += xeyesplus SUBDIR += xfireworks SUBDIR += xfrisk @@ -1078,7 +1074,6 @@ SUBDIR += xmine SUBDIR += xminehunter SUBDIR += xmines - SUBDIR += xminesweep SUBDIR += xmlink SUBDIR += xmoto SUBDIR += xmris diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile deleted file mode 100644 index c0f9ea79691b..000000000000 --- a/games/linux-darwinia-demo/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# $FreeBSD$ - -PORTNAME= darwinia-demo -PORTVERSION= 1.3.0 -PORTREVISION= 2 -CATEGORIES= games linux -MASTER_SITES= http://download.introversion.co.uk/mirror/introversion/darwinia/downloads/ -PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}2-${PORTVERSION} -EXTRACT_SUFX= .sh - -MAINTAINER= ports@FreeBSD.org -COMMENT= Real-time action strategy with programs - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -ONLY_FOR_ARCHS= i386 amd64 -USES= linux -USE_LINUX= dri libogg libvorbis sdl12 xorglibs -NO_CDROM= Redistribution is limited, see license -NO_BUILD= yes -NO_WRKSUBDIR= yes - -DATADIR= ${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME} -SUB_FILES= darwinia - -OPTIONS_DEFINE= DOCS - -do-extract: - @cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ - ${TAR} zxf - - -do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - @cd ${WRKSRC}/lib && \ - ${INSTALL_PROGRAM} darwinia.bin.x86 ${STAGEDIR}${DATADIR} && \ - ${INSTALL_DATA} *.dat open-www.sh ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/darwinia \ - ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}darwinia - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}/LICENSE - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README - -.include <bsd.port.mk> diff --git a/games/linux-darwinia-demo/distinfo b/games/linux-darwinia-demo/distinfo deleted file mode 100644 index c71c1b378377..000000000000 --- a/games/linux-darwinia-demo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (darwinia-demo2-1.3.0.sh) = 2a51ca4e881f7aafe237fedf2e45ea84b48f02488482f55fb3af605a37833d85 -SIZE (darwinia-demo2-1.3.0.sh) = 22470072 diff --git a/games/linux-darwinia-demo/files/darwinia.in b/games/linux-darwinia-demo/files/darwinia.in deleted file mode 100644 index 3e28971bd402..000000000000 --- a/games/linux-darwinia-demo/files/darwinia.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd %%DATADIR%% || exit 1 -exec ./darwinia.bin.x86 "$@" diff --git a/games/linux-darwinia-demo/pkg-descr b/games/linux-darwinia-demo/pkg-descr deleted file mode 100644 index 8a367ea589ea..000000000000 --- a/games/linux-darwinia-demo/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -From the homepage: The world of Darwinia is a virtual themepark, -running entirely inside a computer network and populated by a -sentient evolving life form called the Darwinians. Unfortunately -Darwinia has been overrun by a computer virus which has multiplied -out of control. Your task is to destroy the Viral Infection and -save the Darwinians from extinction. - -WWW: http://www.introversion.co.uk/darwinia/ diff --git a/games/linux-darwinia-demo/pkg-message b/games/linux-darwinia-demo/pkg-message deleted file mode 100644 index c268e17949c5..000000000000 --- a/games/linux-darwinia-demo/pkg-message +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ type: install - message: <<EOM -This game will attempt to obtain some system information by -accessing files in linux's procfs. You must install the Linux -emulation procfs filesystem for this to work correctly. This can be -accomplished by adding the following line to your /etc/fstab file: - - linprocfs /compat/linux/proc linprocfs rw 0 0 - -and then, as root, executing the commands: - -kldload linprocfs -mount /compat/linux/proc -EOM -} -] diff --git a/games/linux-darwinia-demo/pkg-plist b/games/linux-darwinia-demo/pkg-plist deleted file mode 100644 index 3a8b0dfe3130..000000000000 --- a/games/linux-darwinia-demo/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/linux-darwinia -%%DATADIR%%/darwinia.bin.x86 -%%DATADIR%%/main.dat -%%DATADIR%%/sounds.dat -%%DATADIR%%/language.dat -%%DATADIR%%/open-www.sh -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README diff --git a/games/linux-defcon/Makefile b/games/linux-defcon/Makefile deleted file mode 100644 index d0e4c71f54e2..000000000000 --- a/games/linux-defcon/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Created by: Marcus von Appen <mva@sysfault.org -# $FreeBSD$ - -PORTNAME= defcon -PORTVERSION= 1.42 -PORTREVISION= 2 -CATEGORIES= games linux -MASTER_SITES= http://download.introversion.co.uk/defcon/linux/ -PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-v${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Defcon for Linux - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -ONLY_FOR_ARCHS= i386 amd64 -USES= linux -USE_LINUX= dri libogg libvorbis sdl12 xorglibs -NO_CDROM= Redistribution is limited, see license -NO_BUILD= yes - -DATADIR= ${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME} -SUB_FILES= defcon - -OPTIONS_DEFINE= DOCS - -do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - @cd ${WRKSRC}/lib && \ - ${INSTALL_PROGRAM} defcon.bin.x86 ${STAGEDIR}${DATADIR} && \ - ${INSTALL_DATA} *.dat open-www.sh ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/defcon \ - ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}defcon - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/license.txt ${STAGEDIR}${DOCSDIR}/license.txt - ${INSTALL_DATA} ${WRKSRC}/manual.pdf ${STAGEDIR}${DOCSDIR}/manual.pdf - -.include <bsd.port.mk> diff --git a/games/linux-defcon/distinfo b/games/linux-defcon/distinfo deleted file mode 100644 index a322a744550a..000000000000 --- a/games/linux-defcon/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (defcon-v1.42.tar.gz) = 5973c32ef55d245b9adfbce33bb7c503d3f0ad7bf5deb55eba8754f9850cdf40 -SIZE (defcon-v1.42.tar.gz) = 63093946 diff --git a/games/linux-defcon/files/defcon.in b/games/linux-defcon/files/defcon.in deleted file mode 100644 index 883f7c52d04b..000000000000 --- a/games/linux-defcon/files/defcon.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd %%DATADIR%% || exit 1 -exec ./defcon.bin.x86 "$@" diff --git a/games/linux-defcon/pkg-descr b/games/linux-defcon/pkg-descr deleted file mode 100644 index c23a8f1af3c8..000000000000 --- a/games/linux-defcon/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Defcon is announced as "The World's first Genocide 'em up". It is a -global thermonuclear war simulation inspired by movies like WarGames -and features multiplayer support, different game modes and support for -own game mods. - -WWW: http://www.introversion.co.uk/defcon/ diff --git a/games/linux-defcon/pkg-message b/games/linux-defcon/pkg-message deleted file mode 100644 index c268e17949c5..000000000000 --- a/games/linux-defcon/pkg-message +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ type: install - message: <<EOM -This game will attempt to obtain some system information by -accessing files in linux's procfs. You must install the Linux -emulation procfs filesystem for this to work correctly. This can be -accomplished by adding the following line to your /etc/fstab file: - - linprocfs /compat/linux/proc linprocfs rw 0 0 - -and then, as root, executing the commands: - -kldload linprocfs -mount /compat/linux/proc -EOM -} -] diff --git a/games/linux-defcon/pkg-plist b/games/linux-defcon/pkg-plist deleted file mode 100644 index 29c120c8dfc5..000000000000 --- a/games/linux-defcon/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/linux-defcon -%%DATADIR%%/defcon.bin.x86 -%%DATADIR%%/main.dat -%%DATADIR%%/sounds.dat -%%DATADIR%%/open-www.sh -%%PORTDOCS%%%%DOCSDIR%%/license.txt -%%PORTDOCS%%%%DOCSDIR%%/manual.pdf diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile deleted file mode 100644 index e5c54a7a22fc..000000000000 --- a/games/linux-uplink-demo/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# Created by: Marcus von Appen <mva@sysfault.org> -# $FreeBSD$ - -PORTNAME= uplink-demo -PORTVERSION= 1.55 -PORTREVISION= 4 -CATEGORIES= games linux -MASTER_SITES= http://www.introversion.co.uk/uplink/downloads/ -PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION}DEMO -EXTRACT_SUFX= .sh - -MAINTAINER= ports@FreeBSD.org -COMMENT= High tech computer crime and industrial espionage on the Internet - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -ONLY_FOR_ARCHS= i386 amd64 -USES= linux -USE_LINUX= dri jpeg sdl12 sdlmixer -USE_LDCONFIG= yes -NO_CDROM= Redistribution is limited, see license -NO_BUILD= yes -NO_WRKSUBDIR= yes - -DATADIR= ${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME} -SUB_FILES= uplink -SUB_LIST= LINUXBASE=${LINUXBASE} -DOCFILES= license.txt mods.txt Readme-UplinkSupport.txt readme.txt - -OPTIONS_DEFINE= DOCS - -do-extract: - @cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ - ${TAR} zxf - - -do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - @cd ${WRKSRC}/lib && \ - ${INSTALL_PROGRAM} uplink.bin.x86 libftgl.so.0 ${STAGEDIR}${DATADIR} && \ - ${INSTALL_DATA} *.dat ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/uplink \ - ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}uplink - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for file in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}/${file} -.endfor - -.include <bsd.port.mk> diff --git a/games/linux-uplink-demo/distinfo b/games/linux-uplink-demo/distinfo deleted file mode 100644 index 7ebc3ea59933..000000000000 --- a/games/linux-uplink-demo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (uplink-demo-1.55DEMO.sh) = d00de7891a7ee47afb5b39345d14afdad3563bc17c9ef356284f3edffbe515e8 -SIZE (uplink-demo-1.55DEMO.sh) = 10545660 diff --git a/games/linux-uplink-demo/files/uplink.in b/games/linux-uplink-demo/files/uplink.in deleted file mode 100644 index bf5e24e76d57..000000000000 --- a/games/linux-uplink-demo/files/uplink.in +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -LD_PRELOAD_FTGL=%%LINUXBASE%%/usr/lib/libfreetype.so.6:%%DATADIR%%/libftgl.so.0 - -if [ -n "$LD_PRELOAD" ]; then - export LD_PRELOAD="$LD_PRELOAD_FTGL:$LD_PRELOAD" -else - export LD_PRELOAD="$LD_PRELOAD_FTGL" -fi - -cd %%DATADIR%% || exit 1 -exec ./uplink.bin.x86 "$@" diff --git a/games/linux-uplink-demo/pkg-descr b/games/linux-uplink-demo/pkg-descr deleted file mode 100644 index f19eeb81e8f8..000000000000 --- a/games/linux-uplink-demo/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -From the homepage: You play an Uplink Agent who makes a living by performing -jobs for major corporations. Your tasks involve hacking into rival computer -systems, stealing research data, sabotaging other companies, laundering money, -erasing evidence, or framing innocent people. -You use the money you earn to upgrade your computer systems, and to buy new -software and tools. As your experience level increases you find more -dangerous and profitable missions become available. You can speculate on a -fully working stock market (and even influence its outcome). You can modify -peoples academic or criminal records. You can divert money from bank transfers -into your own accounts. You can even take part in the construction of the most -deadly computer virus ever designed. - -WWW: http://uplink.co.uk diff --git a/games/linux-uplink-demo/pkg-message b/games/linux-uplink-demo/pkg-message deleted file mode 100644 index c268e17949c5..000000000000 --- a/games/linux-uplink-demo/pkg-message +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ type: install - message: <<EOM -This game will attempt to obtain some system information by -accessing files in linux's procfs. You must install the Linux -emulation procfs filesystem for this to work correctly. This can be -accomplished by adding the following line to your /etc/fstab file: - - linprocfs /compat/linux/proc linprocfs rw 0 0 - -and then, as root, executing the commands: - -kldload linprocfs -mount /compat/linux/proc -EOM -} -] diff --git a/games/linux-uplink-demo/pkg-plist b/games/linux-uplink-demo/pkg-plist deleted file mode 100644 index 81bcefe3be66..000000000000 --- a/games/linux-uplink-demo/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/linux-uplink -%%DATADIR%%/uplink.bin.x86 -%%DATADIR%%/libftgl.so.0 -%%DATADIR%%/data.dat -%%DATADIR%%/fonts.dat -%%DATADIR%%/graphics.dat -%%DATADIR%%/loading.dat -%%DATADIR%%/music.dat -%%DATADIR%%/patch.dat -%%DATADIR%%/patch2.dat -%%DATADIR%%/patch3.dat -%%DATADIR%%/sounds.dat -%%PORTDOCS%%%%DOCSDIR%%/license.txt -%%PORTDOCS%%%%DOCSDIR%%/mods.txt -%%PORTDOCS%%%%DOCSDIR%%/Readme-UplinkSupport.txt -%%PORTDOCS%%%%DOCSDIR%%/readme.txt diff --git a/games/xevil/Makefile b/games/xevil/Makefile deleted file mode 100644 index f299961a1c49..000000000000 --- a/games/xevil/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# Created by: G_ran Runfeldt <goranrunfeldt@home.se> -# $FreeBSD$ - -PORTNAME= xevil -PORTVERSION= 2.02.r2 -PORTREVISION= 2 -CATEGORIES= games -MASTER_SITES= http://www.xevil.com/download/stable/ -DISTNAME= ${PORTNAME}src${PORTVERSION:S/.r/r/} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Fast-action, networked, anti-social, kill-everything game - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/gpl.txt - -NO_WRKSUBDIR= yes - -USES= dos2unix xorg zip -USE_XORG= xpm -DOS2UNIX_GLOB= *.cpp *.h config.mk makefile -MAKEFILE= makefile -MAKE_ARGS= DEPTH="${WRKSRC}" -ALL_TARGET= ${OPSYS:tl} - -PORTDOCS= * -PLIST_FILES= bin/${PORTNAME} - -OPTIONS_DEFINE= DOCS - -post-patch: - @${FIND} ${WRKSRC} -name "*.xpm" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|^static char|static const char|' - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/x11/${OPSYS:tu}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/instructions - ${INSTALL_DATA} ${WRKSRC}/instructions/* ${STAGEDIR}${DOCSDIR}/instructions - -.include <bsd.port.mk> diff --git a/games/xevil/distinfo b/games/xevil/distinfo deleted file mode 100644 index 061544d5b158..000000000000 --- a/games/xevil/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xevilsrc2.02r2.zip) = 45a72def6f7532bd4b7193932df09c1ba4eada2433382c494b37d4733e743188 -SIZE (xevilsrc2.02r2.zip) = 1857315 diff --git a/games/xevil/files/patch-cmn__actual.cpp b/games/xevil/files/patch-cmn__actual.cpp deleted file mode 100644 index 1b4fdd54e96c..000000000000 --- a/games/xevil/files/patch-cmn__actual.cpp +++ /dev/null @@ -1,208 +0,0 @@ ---- cmn/actual.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ cmn/actual.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -32,7 +32,7 @@ - - // Include Files - #if X11 --#include <strstream.h> -+#include <sstream> - #endif - #if WIN32 - #include <strstrea.h> -@@ -122,6 +122,7 @@ - #include "bitmaps/yeti/yeti.bitmaps" - - -+using namespace std; - - ///// Some helper macros to define creatures with certain abilities. - #define DEFINE_CREATURE_CTORS_2(CLASSNAME,ABILITY0,ability0,ABILITY1,ability1) \ -@@ -454,9 +455,9 @@ - } - } - -- ostrstream msg; -- msg << "Explosion hits " << hit << " objects." << ends; -- locator->message_enq(msg.str()); -+ stringstream msg; -+ msg << "Explosion hits " << hit << " objects."; -+ locator->message_enq(Utils::strdup(msg.str().c_str())); - - kill_self(); - Physical::act(); -@@ -1001,7 +1002,7 @@ - if (other && (other->get_class_id() != A_AltarOfSin) && - (intel = other->get_intel())) { - LocatorP locator = get_locator(); -- ostrstream str; -+ stringstream str; - - // Turned into a frog/baby seal. - if (Utils::coin_flip() && other->is_moving() && -@@ -1014,8 +1015,8 @@ - - str << intel->get_name() << " attacks the Altar of Sin and is " - << "turned into a " << (doFrog ? "frog" : "baby-seal") -- << "." << ends; -- locator->message_enq(str.str()); -+ << "."; -+ locator->message_enq(Utils::strdup(str.str().c_str())); - - other->set_intel(NULL); - if (!other->get_mapped()) { -@@ -1047,8 +1048,8 @@ - // Lose all health. - else { - str << "BLASPHMER! " << intel->get_name() << -- " loses health for daring to attack the Altar of Sin." << ends; -- locator->message_enq(str.str()); -+ " loses health for daring to attack the Altar of Sin."; -+ locator->message_enq(Utils::strdup(str.str().c_str())); - - int damage = other->get_health(); - other->corporeal_attack(this,damage); -@@ -1075,8 +1076,8 @@ - (intel = other->get_intel()) && intel->is_human()) { - int lives = intel->get_lives(); - LocatorP locator = get_locator(); -- ostrstream msg; -- ostrstream arenaMsg; -+ stringstream msg; -+ stringstream arenaMsg; - - // Choose different blessings to give. - int n = 0; -@@ -1112,8 +1113,8 @@ - } - else { - intel->set_lives(lives + 1); -- msg << intel->get_name() << " sells soul for an extra life." << ends; -- arenaMsg << "You Sold Your Soul For an Extra Life" << ends; -+ msg << intel->get_name() << " sells soul for an extra life."; -+ arenaMsg << "You Sold Your Soul For an Extra Life"; - } - break; - -@@ -1123,8 +1124,8 @@ - mod = new DoubleSpeed(); - assert(mod); - modList->append_unique(mod); -- msg << intel->get_name() << " sells soul for Double Speed." << ends; -- arenaMsg << "Double Speed" << ends; -+ msg << intel->get_name() << " sells soul for Double Speed."; -+ arenaMsg << "Double Speed"; - break; - - -@@ -1138,9 +1139,8 @@ - mod = new DoubleJump(); - assert(mod); - modList->append_unique(mod); -- msg << intel->get_name() << " sells soul for extra jumping powers." -- << ends; -- arenaMsg << "Extra Jumping Powers" << ends; -+ msg << intel->get_name() << " sells soul for extra jumping powers."; -+ arenaMsg << "Extra Jumping Powers"; - break; - - -@@ -1157,8 +1157,8 @@ - // So max health takes effect immediately. - other->heal(); - -- msg << intel->get_name() << " sells soul for Double Health." << ends; -- arenaMsg << "Double Health" << ends; -+ msg << intel->get_name() << " sells soul for Double Health."; -+ arenaMsg << "Double Health"; - break; - - -@@ -1176,8 +1176,8 @@ - // Might as well make sure they can take advantage of it now. - other->heal(); - -- msg << intel->get_name() << " sells soul for Healing Powers." << ends; -- arenaMsg << "Healing Powers" << ends; -+ msg << intel->get_name() << " sells soul for Healing Powers."; -+ arenaMsg << "Healing Powers"; - } - break; - -@@ -1193,8 +1193,8 @@ - // Already checked that other is a Creature(). - ((CreatureP)other)->add_ability(a); - -- msg << intel->get_name() << " sells soul for HellFire Powers." << ends; -- arenaMsg << "HellFire Powers" << ends; -+ msg << intel->get_name() << " sells soul for HellFire Powers."; -+ arenaMsg << "HellFire Powers"; - } - break; - -@@ -1217,8 +1217,8 @@ - // Already checked that other is a Creature(). - ((CreatureP)other)->add_ability(a); - -- msg << intel->get_name() << " sells soul for Fireballs." << ends; -- arenaMsg << "Fireballs" << ends; -+ msg << intel->get_name() << " sells soul for Fireballs."; -+ arenaMsg << "Fireballs"; - } - break; - -@@ -1241,8 +1241,8 @@ - // Already checked that other is a Creature(). - ((CreatureP)other)->add_ability(a); - -- msg << intel->get_name() << " sells soul for Flying Powers." << ends; -- arenaMsg << "Flying Powers" << ends; -+ msg << intel->get_name() << " sells soul for Flying Powers."; -+ arenaMsg << "Flying Powers"; - } - break; - -@@ -1274,8 +1274,8 @@ - // Already checked that other is a Creature(). - ((CreatureP)other)->add_ability(a); - -- msg << intel->get_name() << " sells soul for Sticky Powers." << ends; -- arenaMsg << "Sticky Powers" << ends; -+ msg << intel->get_name() << " sells soul for Sticky Powers."; -+ arenaMsg << "Sticky Powers"; - } - break; - -@@ -1285,8 +1285,8 @@ - } - } // while - -- locator->message_enq(msg.str()); -- locator->arena_message_enq(arenaMsg.str(),other); -+ locator->message_enq(Utils::strdup(msg.str().c_str())); -+ locator->arena_message_enq(Utils::strdup(arenaMsg.str().c_str()),other); - - kill_self(); - turnTaken = True; -@@ -1534,7 +1534,7 @@ - void *closure) { - // notThis is used to prevent transmogifying into the same class an object - // already is. -- ClassId notThis = (ClassId)closure; -+ ClassId notThis = (long)closure; - if (pc->classId == notThis) { - return False; - } -@@ -2087,10 +2087,9 @@ - PhysicalP seal = new Seal(w,l,pos); - assert(seal); - -- char sealStr[20]; -- ostrstream str(sealStr,20); -- str << "seal-" << sealsNum << ends; -- NeutralP sealIntel = new SealIntel(w,l,sealStr,homeId); -+ stringstream str; -+ str << "seal-" << sealsNum; -+ NeutralP sealIntel = new SealIntel(w,l,Utils::strdup(str.str().c_str()),homeId); - seal->set_intel(sealIntel); - l->register_neutral(sealIntel); - seals[sealsNum] = sealIntel->get_intel_id(); diff --git a/games/xevil/files/patch-cmn__area.cpp b/games/xevil/files/patch-cmn__area.cpp deleted file mode 100644 index 1c268954c8a0..000000000000 --- a/games/xevil/files/patch-cmn__area.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- cmn/area.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ cmn/area.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -34,12 +34,13 @@ - extern "C" { - #include <limits.h> // For INT_MAX - } --#include <iostream.h> -+#include <iostream> - #include "utils.h" - #include "coord.h" - #include "area.h" - - -+using namespace std; - - Size Area::operator - (const Area &other) const { - assert ((shape == AR_RECT) && (other.shape == AR_RECT)); diff --git a/games/xevil/files/patch-cmn__coord.h b/games/xevil/files/patch-cmn__coord.h deleted file mode 100644 index 677ad5fb2a67..000000000000 --- a/games/xevil/files/patch-cmn__coord.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cmn/coord.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/coord.h 2012-05-27 06:53:11.000000000 +0900 -@@ -619,7 +619,7 @@ - int enemiesInitial; // enemies on first level - int enemiesIncr; // this many more enemies each level - int enemiesMax; // maximum number of enemies (for levels) -- char *name; // of this difficulty level -+ const char *name; // of this difficulty level - }; - enum {DIFF_TRIVIAL,DIFF_NORMAL,DIFF_HARD,DIFF_BEND_OVER, - DIFFICULTY_LEVELS_NUM, DIFF_NONE=DIFFICULTY_LEVELS_NUM}; diff --git a/games/xevil/files/patch-cmn__game.cpp b/games/xevil/files/patch-cmn__game.cpp deleted file mode 100644 index b7407b7d8370..000000000000 --- a/games/xevil/files/patch-cmn__game.cpp +++ /dev/null @@ -1,577 +0,0 @@ ---- cmn/game.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ cmn/game.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -31,16 +31,17 @@ - #include "stdafx.h" - extern "C" { - #include <string.h> -+#include <stdlib.h> - } - - #if X11 --#include <strstream.h> -+#include <sstream> - #endif - #if WIN32 - #include <strstrea.h> - #endif - --#include <iomanip.h> -+#include <iomanip> - - #include "utils.h" - #include "coord.h" -@@ -123,7 +124,7 @@ - #define SOUNDONOFF_DEFAULT True - - --char *Game::wittySayings[Game::WITTY_SAYINGS_NUM] = { -+const char *Game::wittySayings[Game::WITTY_SAYINGS_NUM] = { - "If it moves it's a threat. If it doesn't move it's a potential threat.", - "Happy, happy. Joy, joy.", - "For the mother country!!!", -@@ -271,11 +272,19 @@ - "Prepare to Qualify.", - "I got a bad feeling about this drop.", - "Cowboys never quit!", -+ "The voices say I'm not crazy, so I'm OK!", -+ "Cure Sars!?!", -+ "Ha Ha Ha, Loser!", -+ "It's all fun and games until someone loses an eye.", -+ "Eye for an eye, tooth for a tooth.", -+ "Mo-o-m!", -+ "Timmy's touching me!", -+ "I'm not touching you! See? I'm not touching you!" - }; - - - --char *Game::intelNames[Game::INTEL_NAMES_NUM] = { -+const char *Game::intelNames[Game::INTEL_NAMES_NUM] = { - "Dr. Pain", - "Steve", - "hardts", -@@ -350,6 +359,9 @@ - "Stan", - "Mr. Hat", - "Cid", -+ "Mr. Hankey", -+ "Michael Jackson", -+ "O.J. Simpson" - }; - - -@@ -793,7 +805,7 @@ - - // Just for tracing in the debugger. - char* version = Utils::get_OS_info(); -- delete version; -+ delete [] version; - - noUi = False; - noNewLevel = False; -@@ -1056,7 +1068,7 @@ - - Game::~Game() { - if (oneItem) { -- delete oneItem; -+ delete [] oneItem; - } - - delete ui; -@@ -1500,13 +1512,13 @@ - - if (mask & UIconnectServer) { - delete role; -- ostrstream portName; -- portName << settings.connectPort << ends; -+ stringstream portName; -+ portName << settings.connectPort; - IViewportInfo* vInfo = Ui::get_viewport_info(); -- ClientP client = new Client(settings.connectHostname,portName.str(), -+ ClientP client = new Client(settings.connectHostname, -+ Utils::strdup(portName.str().c_str()), - 0,settings.humanName,vInfo, - Connection::ADJUST_SKIP,&locator); -- delete portName.str(); - assert(client); - role = client; - ui->set_role_type(role->get_type()); -@@ -1544,10 +1556,9 @@ - } - - delete role; -- ostrstream portName; -- portName << settings.serverPort << ends; -- role = new Server(settings.localHuman,portName.str(),&locator); -- delete portName.str(); -+ stringstream portName; -+ portName << settings.serverPort; -+ role = new Server(settings.localHuman,portName.str().c_str(),&locator); - assert(role); - restartEnd = RE_RESTART; - ui->set_role_type(role->get_type()); -@@ -1573,9 +1584,9 @@ - ui->set_style(styleType); - } - -- ostrstream str; -+ stringstream str; - styleNext->describe(str); -- locator.message_enq(str.str()); -+ locator.message_enq(Utils::strdup(str.str().c_str())); - } - - -@@ -1589,9 +1600,9 @@ - human->reincarnate(); - obj->set_intel(human); - -- ostrstream msg; -- msg << human->get_name() << " is back from the dead." << ends; -- locator.message_enq(msg.str()); -+ stringstream msg; -+ msg << human->get_name() << " is back from the dead."; -+ locator.message_enq(Utils::strdup(msg.str().c_str())); - } - } - -@@ -1615,7 +1626,7 @@ - void Game::new_level_check(int enemiesPlaying) { - assert(state == gameOn); - -- ostrstream str; -+ stringstream str; - Boolean lStrChanged = False; - int val = style->new_level_check(enemiesPlaying,&world,&locator, - level,lStrChanged,str,timer, -@@ -1645,11 +1656,8 @@ - // if str has anything in it. Fucking Linux compilers. - if (lStrChanged) { - if (ui) { -- ui->set_level(str.str()); -+ ui->set_level(str.str().c_str()); - } -- // Ok to delete even if ui is NULL, str.str() will allocate the memory to -- // kill off. -- delete str.str(); - } - } - -@@ -1841,7 +1849,7 @@ - - - --char *Game::choose_ranking(int kills) { -+const char *Game::choose_ranking(int kills) { - // Figure out the ranking set, they are listed in order. - int setNum = 0; - assert(kills >= 0 && rankingSets[0].killsMin == 0); -@@ -1876,7 +1884,7 @@ - if (showMessages) { - for (int n = 0; n < locator.humans_registered(); n++) { - HumanP human = locator.get_human(n); -- ostrstream msg; -+ stringstream msg; - - // Soups are only taken into account if you have unlimited lives. - int totalKills; -@@ -1894,11 +1902,11 @@ - totalKills = human->get_human_kills() + human->get_enemy_kills(); - } - -- char *ranking = choose_ranking(totalKills); -+ const char *ranking = choose_ranking(totalKills); - msg << totalKills << (totalKills == 1 ? "Kill" : " Kills") -- << ", Rank: " << ranking << ends; -+ << ", Rank: " << ranking; - IntelId humanIntelId = human->get_intel_id(); -- locator.arena_message_enq(msg.str(),&humanIntelId,10000); -+ locator.arena_message_enq(Utils::strdup(msg.str().c_str()),&humanIntelId,10000); - } - } - } -@@ -1919,8 +1927,8 @@ - // Will clean out non-persistent teams. - locator.level_reset(); - -- ostrstream lStr; // For level box on the side of the ui-> -- ostrstream lTitleStr; // For Ui title screen. -+ stringstream lStr; // For level box on the side of the ui-> -+ stringstream lTitleStr; // For Ui title screen. - Boolean doBonus; - - // Possibly increment level count number. -@@ -1960,7 +1968,7 @@ - if (doBonus) { - delete levelTitleStored; // If it already exists. - // Store levelTitle string for later use. -- levelTitleStored = lTitleStr.str(); -+ levelTitleStored = Utils::strdup(lTitleStr.str().c_str()); - - // Tell user about the bonus. - award_bonuses_now(); -@@ -1970,13 +1978,12 @@ - } - // Go to getBearings state. - else { -- get_bearings(lTitleStr.str()); -+ get_bearings(Utils::strdup(lTitleStr.str().c_str())); - } - - if (ui) { -- ui->set_level(lStr.str()); -+ ui->set_level(lStr.str().c_str()); - } -- delete lStr.str(); - - // Will pass in more info later. - role->new_level(this,&world,&locator); -@@ -1997,7 +2004,7 @@ - continue; - } - -- char* awardMsg = NULL; -+ const char* awardMsg = NULL; - int count = 0; - while (!awardMsg && count < AWARD_BONUS_TRIES) { - count++; -@@ -2184,9 +2191,9 @@ - - // Moved resetting world rooms to new_level(); - -- ostrstream msg; -- msg << wittySayings[Utils::choose(WITTY_SAYINGS_NUM)] << ends; -- locator.message_enq(msg.str()); -+ stringstream msg; -+ msg << wittySayings[Utils::choose(WITTY_SAYINGS_NUM)]; -+ locator.message_enq(Utils::strdup(msg.str().c_str())); - - /* Don't need to call Ui::set_* because the new values originally came - from ui-> */ -@@ -2242,41 +2249,39 @@ - { // Right keys. - right[n][which] = 0; - -- ostrstream strm; -+ stringstream strm; - if (which == 0) -- strm << "right_" << keysNames[n] << ends; -+ strm << "right_" << keysNames[n]; - else -- strm << "right_" << keysNames[n] << "_2" << ends; -- char *option = strm.str(); -+ strm << "right_" << keysNames[n] << "_2"; -+ const string & option = strm.str(); - - // Should we free value?? -- char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option); -+ char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option.c_str()); - if (value) { - KeySym keysym = XStringToKeysym(value); - if (keysym != NoSymbol) - right[n][which] = keysym; - } -- delete option; - } - - { // Left Keys. - left[n][which] = 0; - -- ostrstream strm; -+ stringstream strm; - if (which == 0) -- strm << "left_" << keysNames[n] << ends; -+ strm << "left_" << keysNames[n]; - else -- strm << "left_" << keysNames[n] << "_2" << ends; -- char *option = strm.str(); -+ strm << "left_" << keysNames[n] << "_2"; -+ const string & option = strm.str(); - - // Should we free value?? -- char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option); -+ char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option.c_str()); - if (value) { - KeySym keysym = XStringToKeysym(value); - if (keysym != NoSymbol) - left[n][which] = keysym; - } -- delete option; - } - } - -@@ -2291,10 +2296,10 @@ - void Game::parse_args(int *argc,char **argv) { - // Create a bunch of "-name<x>" strings for comparing with command-line - // args. -- ostrstream dashName[Locator::HUMANS_MAX]; -+ stringstream dashName[Locator::HUMANS_MAX]; - int n; - for (n = 0; n < Locator::HUMANS_MAX; n++) { -- dashName[n] << "-name" << n << ends; -+ dashName[n] << "-name" << n; - } - - // Defaults -@@ -2351,7 +2356,7 @@ - // Check "-name<x>" arguments. - else { - for (int j = 0; j < Locator::HUMANS_MAX; j++) { -- if ((! strcmp(dashName[j].str(),argv[n])) && (n + 1 < *argc)) { -+ if ((! strcmp(dashName[j].str().c_str(),argv[n])) && (n + 1 < *argc)) { - humanNames[j] = Utils::strdup(argv[n+1]); - n++; - } -@@ -2728,12 +2733,6 @@ - n++; - } - } // for -- -- -- // Delete memory for "-name" strings. -- for (n = 0; n < Locator::HUMANS_MAX; n++) { -- delete dashName[n].str(); -- } - } - - -@@ -2741,15 +2740,15 @@ - char **Game::display_names(int *argc,char **argv) { - - #if X11 -- ostrstream dashDisplay[UI_VIEWPORTS_MAX][2]; -+ stringstream dashDisplay[UI_VIEWPORTS_MAX][2]; - char **displayNames = new charP [UI_VIEWPORTS_MAX]; - - int n; - for (n = 0; n < UI_VIEWPORTS_MAX; n++) { - displayNames[n] = new char [Xvars::DISPLAY_NAME_LENGTH]; - strcpy(displayNames[n],""); -- dashDisplay[n][0] << "-display" << n << ends; -- dashDisplay[n][1] << "-d" << n << ends; -+ dashDisplay[n][0] << "-display" << n; -+ dashDisplay[n][1] << "-d" << n; - } - - // Loop through all command line arguments. -@@ -2765,7 +2764,7 @@ - // Set display name for one viewport. - for (int m = 0; m < UI_VIEWPORTS_MAX; m++) { - for (int which = 0; which < 2; which++) { -- if (!strcmp(argv[n],dashDisplay[m][which].str())) { -+ if (!strcmp(argv[n],dashDisplay[m][which].str().c_str())) { - assert(strlen(argv[n+1]) < Xvars::DISPLAY_NAME_LENGTH); - strcpy(displayNames[m],argv[n+1]); - } -@@ -2773,11 +2772,6 @@ - } - } - -- for (n = 0; n < UI_VIEWPORTS_MAX; n++) { -- for (int which = 0; which < 2; which++) { -- delete dashDisplay[n][which].str(); -- } -- } - return displayNames; - #endif - -@@ -2890,7 +2884,7 @@ - assert(role->get_type() != R_CLIENT); - - // Choose random name if -name was not specified for this player. -- char *nameNonPc = -+ const char *nameNonPc = - Utils::strlen(humanNames[h]) ? - humanNames[h] : - intelNames[intelNamesIndices[h % INTEL_NAMES_NUM]]; -@@ -2954,13 +2948,12 @@ - - // Put message in the status bar when the game starts up. - // Use \n in string for locator.message_enq. -- ostrstream msg; -+ stringstream msg; - msg - << "XEvil(TM) " << VERSION - << " http://www.xevil.com satan@xevil.com " << XETP::versionStr << "\n" -- << "Copyright(C) 1994,2000 Steve Hardt and Michael Judge" -- << ends; -- locator.message_enq(msg.str()); -+ << "Copyright(C) 1994,2000 Steve Hardt and Michael Judge"; -+ locator.message_enq(Utils::strdup(msg.str().c_str())); - - - // Print message to standard out. Doesn't really do anything on Windows. -@@ -3075,11 +3068,10 @@ - IntelOptions ops; - ITmask opMask = intel_options_for(ops,obj->get_class_id()); - -- ostrstream name; -- name << "Machine-" << (enemyNameCount++) << ends; -- EnemyP enemy = new Enemy(&world,&locator,name.str(),&ops,opMask); -+ stringstream name; -+ name << "Machine-" << (enemyNameCount++); -+ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(),&ops,opMask); - assert(enemy); -- delete name.str(); - locator.register_enemy(enemy); - - if (addToLocator) { -@@ -3235,14 +3227,13 @@ - switch (Utils::choose(8)) { - case 0: { // A bunch of Heros and an Alien. - for (int n = 0; n < 10; n++) { -- ostrstream name; -- name << "Enemy-" << n << ends; -+ stringstream name; -+ name << "Enemy-" << n; - IntelOptions ops; - ops.harmless = True; -- EnemyP enemy = new Enemy(&world,&locator,name.str(), -+ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), - &ops,ITharmless); - assert(enemy); -- delete name.str(); - locator.register_enemy(enemy); - - Pos pos = world.empty_rect(Hero::get_size_max()); -@@ -3268,16 +3259,15 @@ - - case 1: { // Hero, FThrower, and a bunch of Frogs (does not mean Frenchmen). - for (int n = 0; n < 15; n++) { -- ostrstream name; -- name << "Enemy-" << n << ends; -+ stringstream name; -+ name << "Enemy-" << n; - IntelOptions ops; - ops.psychotic = Utils::coin_flip(); -- EnemyP enemy = new Enemy(&world,&locator,name.str(), -+ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), - &ops,ITpsychotic); - assert(enemy); -- delete name.str(); - locator.register_enemy(enemy); -- -+ - Pos pos = world.empty_rect(Frog::get_size_max()); - PhysicalP obj = new Frog(&world,&locator,pos); - assert(obj); -@@ -3304,15 +3294,14 @@ - case 2: { // A bunch of Enforcers. - for (int n = 0; n < 10; n++) - { -- ostrstream name; -- name << "Enemy-" << n << ends; -+ stringstream name; -+ name << "Enemy-" << n; - IntelOptions ops; - ops.classFriends = False; - ops.psychotic = True; -- EnemyP enemy = new Enemy(&world,&locator,name.str(), -+ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), - &ops,ITclassFriends|ITpsychotic); - assert(enemy); -- delete name.str(); - locator.register_enemy(enemy); - - Pos pos = world.empty_rect(Enforcer::get_size_max()); -@@ -3327,14 +3316,13 @@ - - case 3: { // A bunch of Ninjas and a chainsaw. - for (int n = 0; n < 10; n++) { -- ostrstream name; -- name << "Enemy-" << n << ends; -+ stringstream name; -+ name << "Enemy-" << n; - IntelOptions ops; - ops.classFriends = False; -- EnemyP enemy = new Enemy(&world,&locator,name.str(), -+ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), - &ops,ITclassFriends); - assert(enemy); -- delete name.str(); - locator.register_enemy(enemy); - - Pos pos = world.empty_rect(Ninja::get_size_max()); -@@ -3373,12 +3361,11 @@ - } - - for (int m = 0; m < 10; m++) { -- ostrstream name; -- name << "Enemy-" << m << ends; -- EnemyP enemy = new Enemy(&world,&locator,name.str(), -+ stringstream name; -+ name << "Enemy-" << m; -+ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), - NULL,ITnone); - assert(enemy); -- delete name.str(); - locator.register_enemy(enemy); - - Pos pos = world.empty_rect(Hero::get_size_max()); -@@ -3414,14 +3401,13 @@ - case 5: { // Ninjas and ChopperBoys. - int n; - for (n = 0; n < 10; n++) { -- ostrstream name; -- name << "Enemy-" << n << ends; -+ stringstream name; -+ name << "Enemy-" << n; - IntelOptions ops; - ops.classFriends = False; -- EnemyP enemy = new Enemy(&world,&locator,name.str(), -+ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), - &ops,ITclassFriends); - assert(enemy); -- delete name.str(); - locator.register_enemy(enemy); - - PhysicalP obj; -@@ -3458,11 +3444,10 @@ - // and the scenario isn't set up yet. - - for (n = 0; n < 9; n++) { -- ostrstream name; -- name << "Dog-" << n << ends; -- EnemyP intel = new Enemy(&world,&locator,name.str(),NULL,ITnone); -+ stringstream name; -+ name << "Dog-" << n; -+ EnemyP intel = new Enemy(&world,&locator,name.str().c_str(),NULL,ITnone); - assert(intel); -- delete name.str(); - locator.register_enemy(intel); - - Pos pos = world.empty_rect(Dog::get_size_max()); -@@ -3473,13 +3458,12 @@ - } - - for (n = 0; n < 3; n++) { -- ostrstream name; -- name << "Enemy-" << n << ends; -+ stringstream name; -+ name << "Enemy-" << n; - IntelOptions ops; - ops.harmless = True; -- EnemyP enemy = new Enemy(&world,&locator,name.str(),&ops,ITharmless); -+ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(),&ops,ITharmless); - assert(enemy); -- delete name.str(); - locator.register_enemy(enemy); - - PhysicalP obj; -@@ -3510,13 +3494,12 @@ - Segmented::create_and_add_composite(ret,&world,&locator,Dragon::SEGMENTS_NUM,pos, - Dragon::create,NULL); - for (int m = 0; m < ret.length(); m++) { -- ostrstream name; -- name << "Enemy-" << n << ends; -+ stringstream name; -+ name << "Enemy-" << n; - IntelOptions ops; - ops.harmless = True; -- EnemyP enemy = new Enemy(&world,&locator,name.str(),&ops,ITharmless); -+ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(),&ops,ITharmless); - assert(enemy); -- delete name.str(); - locator.register_enemy(enemy); - PhysicalP p = (PhysicalP)ret.get(m); - p->set_intel(enemy); diff --git a/games/xevil/files/patch-cmn__game.h b/games/xevil/files/patch-cmn__game.h deleted file mode 100644 index 9fb9045baaa4..000000000000 --- a/games/xevil/files/patch-cmn__game.h +++ /dev/null @@ -1,51 +0,0 @@ ---- cmn/game.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/game.h 2012-05-27 06:53:11.000000000 +0900 -@@ -35,7 +35,7 @@ - extern "C" { - #include <time.h> - } --#include <iostream.h> -+#include <iostream> - #include "utils.h" - #include "ui.h" - #include "world.h" -@@ -136,7 +136,7 @@ - struct RankingSet { - enum {RANKING_SET_MAX = 8}; // Max number of rankings in a set. - int killsMin; // Min number of kills to get this rank. -- char *rankings[RANKING_SET_MAX + 1]; // Extra for NULL. -+ const char *rankings[RANKING_SET_MAX + 1]; // Extra for NULL. - }; - - -@@ -268,8 +268,8 @@ - - private: - enum { -- WITTY_SAYINGS_NUM = 147, -- INTEL_NAMES_NUM = 74, -+ WITTY_SAYINGS_NUM = 155, -+ INTEL_NAMES_NUM = 77, - RANKING_SETS_NUM = 12, - }; - -@@ -306,7 +306,7 @@ - static Boolean potential_enemy_filter(const PhysicalContext* pc,void*); - /* EFFECTS: Filter those classes whose potentialEnemy flag is True. */ - -- char *choose_ranking(int kills); -+ const char *choose_ranking(int kills); - /* EFFECTS: Choose a rank for the player at the end of game based on the - number of kills. */ - -@@ -412,8 +412,8 @@ - SoundName currentSoundName; - //keeps track of current sound track being played: can be 0 - -- static char *wittySayings[WITTY_SAYINGS_NUM]; -- static char *intelNames[INTEL_NAMES_NUM]; -+ static const char *wittySayings[WITTY_SAYINGS_NUM]; -+ static const char *intelNames[INTEL_NAMES_NUM]; - static DifficultyLevel difficultyLevels[DIFFICULTY_LEVELS_NUM]; - static RankingSet rankingSets[RANKING_SETS_NUM]; - diff --git a/games/xevil/files/patch-cmn__game_style.cpp b/games/xevil/files/patch-cmn__game_style.cpp deleted file mode 100644 index c7179626de05..000000000000 --- a/games/xevil/files/patch-cmn__game_style.cpp +++ /dev/null @@ -1,911 +0,0 @@ ---- cmn/game_style.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ cmn/game_style.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -33,15 +33,9 @@ - #include <string.h> - } - --#if X11 --#include <strstream.h> --#endif -- --#if WIN32 --#include <strstrea.h> --#endif -+#include <sstream> - --#include <iomanip.h> -+#include <iomanip> - #include "utils.h" - #include "coord.h" - #include "world.h" -@@ -109,13 +103,13 @@ - /* DEFAULT: True */ - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP) = 0; - - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &) = 0; - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum) = 0; - /* EFFECTS: These two functions start a new level in a scenario. setup_world() should - just setup the map and size of the world. new_level() is called after world.reset() -@@ -158,13 +152,13 @@ - virtual ScenarioType get_scenario_type() {return EXTERMINATE;} - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - - -@@ -183,13 +177,13 @@ - virtual Boolean can_refill_game_objects(); - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - - virtual void new_level_set_timer(Timer &timer); -@@ -209,7 +203,7 @@ - virtual ScenarioType get_scenario_type() {return HIVE;} - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual Boolean award_bonus(); -@@ -218,7 +212,7 @@ - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - - virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); -@@ -242,13 +236,13 @@ - virtual ScenarioType get_scenario_type() {return CAPTURE_THE_FLAG;} - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - - virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); -@@ -269,7 +263,7 @@ - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - - virtual Boolean advance_level(); -@@ -292,7 +286,7 @@ - - virtual Boolean (*get_team())(LocatorP,PhysicalP,PhysicalP) = 0; - -- virtual void set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr) = 0; -+ virtual void set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr) = 0; - /* EFFECTS: Called in new_level() to set the appropriate messages. */ - - -@@ -311,7 +305,7 @@ - virtual ScenarioType get_scenario_type() {return SEALS;} - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual Boolean award_bonus(); -@@ -323,7 +317,7 @@ - #endif - virtual Boolean (*get_team())(LocatorP,PhysicalP,PhysicalP); - -- virtual void set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr); -+ virtual void set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr); - - - private: -@@ -342,7 +336,7 @@ - virtual ScenarioType get_scenario_type() {return ANTI_SEALS;} - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - -@@ -351,7 +345,7 @@ - #endif - virtual Boolean (*get_team())(LocatorP,PhysicalP,PhysicalP); - -- virtual void set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr); -+ virtual void set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr); - - - private: -@@ -369,13 +363,13 @@ - virtual SoundName get_midisoundtrack(){return SoundNames::FIRE_SOUNDTRACK;} - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - - virtual Boolean award_bonus(); -@@ -391,13 +385,13 @@ - virtual ScenarioType get_scenario_type() {return KILL_THE_DRAGON;} - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - - virtual SoundName get_midisoundtrack(){return SoundNames::FIRE_SOUNDTRACK;} -@@ -419,13 +413,13 @@ - virtual Pos human_initial_pos(WorldP,LocatorP,const Size &s); - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - - virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); -@@ -447,13 +441,13 @@ - virtual ScenarioType get_scenario_type() {return THE_POUND;} - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - }; - -@@ -466,13 +460,13 @@ - virtual ScenarioType get_scenario_type() {return JAPAN_TOWN;} - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); - virtual void new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum); - - virtual void filter_weapons_and_other_items(LocatorP,int &weaponsNum, -@@ -581,7 +575,7 @@ - - - int GameStyle::new_level_check(int,WorldP,LocatorP, -- int,Boolean &,ostrstream &,Timer &timer, -+ int,Boolean &,stringstream &,Timer &timer, - IPhysicalManagerP) { - // A timer-based level. - if (timer.ready()) { -@@ -791,8 +785,8 @@ - - - --void Normal::describe(ostrstream &str) { -- str << "Complete each level/scenario to proceed to the next one." << ends; -+void Normal::describe(stringstream &str) { -+ str << "Complete each level/scenario to proceed to the next one."; - } - - -@@ -852,7 +846,7 @@ - - - int Normal::new_level_check(int enemiesPlaying,WorldP w,LocatorP l, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP manager) { - GameStyleP delegate = get_delegate(); - return delegate->new_level_check(enemiesPlaying,w,l,level,lStrChanged,levelStr,timer,manager); -@@ -876,7 +870,7 @@ - - void Normal::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum) { - // Choose which delegate to use. - if (level % NORMAL_SCENARIOS_FREQUENCY == 0) { -@@ -934,11 +928,10 @@ - - - --void Levels::describe(ostrstream &str) { -+void Levels::describe(stringstream &str) { - str << "Human player(s) fights through increasing levels of " - << "difficulty." << "\n" -- << "To complete a level you must kill all enemy players." -- << ends; -+ << "To complete a level you must kill all enemy players."; - } - - -@@ -969,7 +962,7 @@ - - - int Levels::new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int,Boolean &,ostrstream &,Timer &, -+ int,Boolean &,stringstream &,Timer &, - IPhysicalManagerP) { - if (enemiesPlaying == 0) { - return 1; -@@ -983,7 +976,7 @@ - - void Levels::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - world->reset(); - -@@ -991,8 +984,8 @@ - clean_physicals(False,world,locator,manager); - - -- lTitleStr << "[" << level << "] Kill All Machines" << ends; -- lStr << "Level: " << level << ends; -+ lTitleStr << "[" << level << "] Kill All Machines"; -+ lStr << "Level: " << level; - - enemiesNum += dLevel.enemiesIncr; - enemiesNum = Utils::minimum(enemiesNum,dLevel.enemiesMax); -@@ -1037,8 +1030,8 @@ - - - --void KillKillKill::describe(ostrstream &str) { -- str << "Every human and machine for him/her/itself." << ends; -+void KillKillKill::describe(stringstream &str) { -+ str << "Every human and machine for him/her/itself."; - } - - -@@ -1095,15 +1088,15 @@ - - void KillKillKill::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - world->reset(); - - // Don't wipe out the Enemies. - clean_physicals(True,world,locator,manager); - -- lTitleStr << "Level: " << level << ends; -- lStr << "Level: " << level << ends; -+ lTitleStr << "Level: " << level; -+ lStr << "Level: " << level; - - // Only create enemies first time or if enemiesRefill is set. - if (justReset) { -@@ -1152,9 +1145,9 @@ - - - --void Duel::describe(ostrstream &str) { -+void Duel::describe(stringstream &str) { - str << "Human vs. human battle to the death." -- << "\n" << "Each human has 3 lives." << ends; -+ << "\n" << "Each human has 3 lives."; - } - - -@@ -1207,13 +1200,13 @@ - - void Duel::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - world->reset(); - clean_physicals(False,world,locator,manager); - -- lTitleStr << "Level: " << level << ends; -- lStr << "Level: " << level << ends; -+ lTitleStr << "Level: " << level; -+ lStr << "Level: " << level; - - // Only create enemies first time. - if (justReset) { -@@ -1256,9 +1249,9 @@ - - - --void ExtendedDuel::describe(ostrstream &str) { -+void ExtendedDuel::describe(stringstream &str) { - str << "Human vs. human battle to the death." -- << "\n" << "Unlimited lives." << ends; -+ << "\n" << "Unlimited lives."; - } - - -@@ -1318,13 +1311,13 @@ - - void ExtendedDuel::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - world->reset(); - clean_physicals(False,world,locator,manager); - -- lTitleStr << "Level: " << level << ends; -- lStr << "Level: " << level << ends; -+ lTitleStr << "Level: " << level; -+ lStr << "Level: " << level; - - // Only create enemies first time. - if (justReset) { -@@ -1367,8 +1360,8 @@ - - - --void Training::describe(ostrstream &str) { -- str << "No enemies. Useful for learning the controls." << ends; -+void Training::describe(stringstream &str) { -+ str << "No enemies. Useful for learning the controls."; - } - - -@@ -1392,13 +1385,13 @@ - - void Training::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - world->reset(); - clean_physicals(False,world,locator,manager); - -- lTitleStr << "Level: " << level << ends; -- lStr << "Level: " << level << ends; -+ lTitleStr << "Level: " << level; -+ lStr << "Level: " << level; - } - - -@@ -1428,10 +1421,10 @@ - - - --void Scenarios::describe(ostrstream &str) { -+void Scenarios::describe(stringstream &str) { - str << "A number of different scenarios." << "\n" - << "You must complete each scenario to continue on to the " -- << "next one." << ends; -+ << "next one."; - } - - -@@ -1499,7 +1492,7 @@ - - int Scenarios::new_level_check(int enemiesPlaying,WorldP w,LocatorP l, - int level,Boolean &lStrChanged, -- ostrstream &levelStr,Timer &timer, -+ stringstream &levelStr,Timer &timer, - IPhysicalManagerP manager) { - assert(scenario); - return scenario->new_level_check(enemiesPlaying,w,l,level, -@@ -1534,7 +1527,7 @@ - - void Scenarios::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int humansNum) { - // Works even if scenario is NULL. - if (!scenario || scenario->advance_level()) { -@@ -1804,7 +1797,7 @@ - - - int Exterminate::new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int,Boolean &,ostrstream &,Timer &, -+ int,Boolean &,stringstream &,Timer &, - IPhysicalManagerP) { - if (enemiesPlaying == 0) { - return 1; -@@ -1822,10 +1815,10 @@ - - void Exterminate::new_level(int level,WorldP,LocatorP, - const DifficultyLevel &dLevel, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { -- lTitleStr << "[" << level << "] EXTERMINATE" << ends; -- lStr << "[" << level << "] EXTERMINATE\nKill all machines." << ends; -+ lTitleStr << "[" << level << "] EXTERMINATE"; -+ lStr << "[" << level << "] EXTERMINATE\nKill all machines."; - - // Doesn't increment like LEVELS game style - enemiesNum = dLevel.enemiesIncr; -@@ -1852,7 +1845,7 @@ - - int Bonus::new_level_check(int,WorldP,LocatorP locator, - int level,Boolean &lStrChanged, -- ostrstream &levelStr,Timer &timer, -+ stringstream &levelStr,Timer &timer, - IPhysicalManagerP) { - // Ran out of time. - if (timer.ready()) { -@@ -1873,13 +1866,13 @@ - if (remaining != frogsRemaining) { - frogsRemaining = remaining; - levelStr << "[" << level << "] BONUS LEVEL\nfrogs remaining: " -- << remaining << ends; -+ << remaining; - lStrChanged = True; - if (remaining > 0) { -- ostrstream arenaStr; -+ stringstream arenaStr; - arenaStr << remaining << " Frog" << -- (remaining > 1 ? "s" : "") << " Remaining" << ends; -- locator->arena_message_enq(arenaStr.str()); -+ (remaining > 1 ? "s" : "") << " Remaining"; -+ locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); - } - - // Will only be called once per level. -@@ -1907,7 +1900,7 @@ - - void Bonus::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - // Create frogs - for (int n = 0; n < SCENARIO_BONUS_FROGS; n++) { -@@ -1940,9 +1933,9 @@ - frogsRemaining = SCENARIO_BONUS_FROGS; - - lTitleStr << "[" << level << "] Bonus Level: Kill " -- << (int)SCENARIO_BONUS_FROGS << " Frogs" << ends; -+ << (int)SCENARIO_BONUS_FROGS << " Frogs"; - lStr << "[" << level << "] BONUS LEVEL\nfrogs remaining: " -- << (int)SCENARIO_BONUS_FROGS << ends; -+ << (int)SCENARIO_BONUS_FROGS; - } - - -@@ -1960,7 +1953,7 @@ - - - int Hive::new_level_check(int,WorldP,LocatorP locator, -- int,Boolean &,ostrstream &,Timer &, -+ int,Boolean &,stringstream &,Timer &, - IPhysicalManagerP) { - PhysicalP xit = locator->lookup(xitId); - assert(xit); // The Xit should never be destroyed. -@@ -1987,7 +1980,7 @@ - - void Hive::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - // Aliens are created in Game::clock. - -@@ -2012,8 +2005,8 @@ - locator->add(egg); - } - -- lTitleStr << "[" << level << "] HIVE" << ends; -- lStr << "[" << level << "] HIVE.\nFind the exit." << ends; -+ lTitleStr << "[" << level << "] HIVE"; -+ lStr << "[" << level << "] HIVE.\nFind the exit."; - } - - -@@ -2073,7 +2066,7 @@ - - - int CaptureTheFlag::new_level_check(int,WorldP,LocatorP locator, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &, - IPhysicalManagerP manager) { - int fRemaining = 0; - for (int n = 0; n < SCENARIO_FLAG_FLAGS; n++) { -@@ -2091,19 +2084,19 @@ - flagsRemaining = fRemaining; - levelStr << "[" << level << "] COLLECT " - << (int)SCENARIO_FLAG_FLAGS -- << " FLAGS\nremaining: "<< flagsRemaining << ends; -+ << " FLAGS\nremaining: "<< flagsRemaining; - lStrChanged = True; - -- ostrstream arenaStr; -+ stringstream arenaStr; - if (fRemaining != 0) { - arenaStr << flagsRemaining << " Flag" << -- (flagsRemaining > 1 ? "s" : "") << " Remaining" << ends; -+ (flagsRemaining > 1 ? "s" : "") << " Remaining"; - } - else { -- arenaStr << "All Flags Collected" << ends; -+ arenaStr << "All Flags Collected"; - } - -- locator->arena_message_enq(arenaStr.str()); -+ locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); - } - - if (fRemaining == 0) { // All flags are gone, so end level. -@@ -2124,7 +2117,7 @@ - - void CaptureTheFlag::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP,int) { - for (int n = 0; n < SCENARIO_FLAG_FLAGS; n++) { - Pos pos = world->empty_accessible_rect(Flag::get_size_max()); -@@ -2136,9 +2129,9 @@ - flagsRemaining = SCENARIO_FLAG_FLAGS; - - lTitleStr << "[" << level << "] Capture The Flag: " -- << (int)SCENARIO_FLAG_FLAGS << " Flags" << ends; -+ << (int)SCENARIO_FLAG_FLAGS << " Flags"; - lStr << "[" << level << "] COLLECT " << (int)SCENARIO_FLAG_FLAGS -- << " FLAGS.\nremaining: " << (int)SCENARIO_FLAG_FLAGS << ends; -+ << " FLAGS.\nremaining: " << (int)SCENARIO_FLAG_FLAGS; - } - - -@@ -2169,7 +2162,7 @@ - - void GenericSeals::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP,int) { - // Add a team for each human in the game. - // Don't use locator->humans_registered() because they may not have been -@@ -2298,7 +2291,7 @@ - - - int Seals::new_level_check(int,WorldP,LocatorP locator, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &, - IPhysicalManagerP) { - int lemOut,lemSafe,lemActive,lemDead; - compute_out_safe_active_dead(locator,lemOut,lemSafe,lemActive,lemDead); -@@ -2312,10 +2305,10 @@ - - // Only update arena string if sealsSafe has changed. - if (lemSafe != sealsSafe && lemSafe != SCENARIO_SEALS_NEED) { -- ostrstream arenaStr; -+ stringstream arenaStr; - arenaStr << "Save " << (SCENARIO_SEALS_NEED - lemSafe) -- << " More Baby Seals" << ends; -- locator->arena_message_enq(arenaStr.str()); -+ << " More Baby Seals"; -+ locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); - } - - sealsSafe = lemSafe; -@@ -2324,18 +2317,17 @@ - levelStr << "[" << level << "] SAVE " - << (int)SCENARIO_SEALS_NEED << " BABY SEALS\n" - << "out: " << sealsOut << " safe: " << sealsSafe -- << " dead: " << lemDead -- << ends; -+ << " dead: " << lemDead; - lStrChanged = True; - - // New level if enough seals are safe or too many are dead. - if (lemDead > (SCENARIO_SEALS_SEALS - SCENARIO_SEALS_NEED) - || lemSafe >= SCENARIO_SEALS_NEED) { - if (lemSafe < SCENARIO_SEALS_NEED) { -- ostrstream msg; -+ stringstream msg; - msg << "YOU FAILED TO SAVE " << (int)SCENARIO_SEALS_NEED -- << " BABY SEALS. TRY THIS LEVEL AGAIN." << ends; -- locator->arena_message_enq(msg.str()); -+ << " BABY SEALS. TRY THIS LEVEL AGAIN."; -+ locator->arena_message_enq(Utils::strdup(msg.str().c_str())); - } - else { - locator->arena_message_enq(Utils::strdup("Good work. Go to the next level.")); -@@ -2365,11 +2357,10 @@ - - - --void Seals::set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr) { -- lTitleStr << "[" << level << "] SAVE THE BABY SEALS" << ends; -+void Seals::set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr) { -+ lTitleStr << "[" << level << "] SAVE THE BABY SEALS"; - lStr << "[" << level << "] SAVE "<< -- (int)SCENARIO_SEALS_NEED << " BABY SEALS\n" -- << "out: 0 safe: 0 dead: 0" << ends; -+ (int)SCENARIO_SEALS_NEED << " BABY SEALS\n" << "out: 0 safe: 0 dead: 0"; - } - - -@@ -2430,7 +2421,7 @@ - - - int AntiSeals::new_level_check(int,WorldP,LocatorP locator, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &, - IPhysicalManagerP) { - // level not over by default. - int ret = -1; -@@ -2441,15 +2432,13 @@ - - // Failure - if (lemSafe > SCENARIO_ANTI_SEALS_MAX_SLIPPAGE) { -- ostrstream msg; - #if 0 - // Not enough space on screen, need two lines. - msg << "YOU LET TOO MANY OF THE FAT BASTARDS GET AWAY\n" - << "Try this level again" << ends; - #else -- msg << "YOU LET TOO MANY OF THE FAT BASTARDS GET AWAY" << ends; - #endif -- locator->arena_message_enq(msg.str()); -+ locator->arena_message_enq(Utils::strdup("YOU LET TOO MANY OF THE FAT BASTARDS GET AWAY")); - - // start new level - ret = 1; -@@ -2473,13 +2462,11 @@ - } - // Update UI - else if (lemSafe == sealsSafe) { // o.w. the "one got away" message takes priority -- ostrstream arenaStr; -- arenaStr << "Kill " -- << lemToKill << " More Baby Seals" << ends; -- locator->arena_message_enq(arenaStr.str()); -+ stringstream arenaStr; -+ arenaStr << "Kill " << lemToKill << " More Baby Seals"; -+ locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); - -- levelStr << "[" << level << "] KILL " -- << lemToKill << " BABY SEALS" << ends; -+ levelStr << "[" << level << "] KILL " << lemToKill << " BABY SEALS"; - lStrChanged = True; - } - } // lemDead != sealsDead -@@ -2502,10 +2489,10 @@ - - - --void AntiSeals::set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr) { -- lTitleStr << "[" << level << "] KILL THE BABY SEALS" << ends; -+void AntiSeals::set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr) { -+ lTitleStr << "[" << level << "] KILL THE BABY SEALS"; - lStr << "[" << level << "] KILL "<< -- (int)SCENARIO_SEALS_SEALS << " BABY SEALS" << ends; -+ (int)SCENARIO_SEALS_SEALS << " BABY SEALS"; - } - - -@@ -2552,7 +2539,7 @@ - - - int KillTheFireDemon::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, -- int,Boolean &,ostrstream &,Timer &, -+ int,Boolean &,stringstream &,Timer &, - IPhysicalManagerP) { - if (enemiesPlaying == 0) { - locator->arena_message_enq(Utils::strdup("Take That, You Mother-Fucking Spawn From Hell")); -@@ -2572,12 +2559,12 @@ - - void KillTheFireDemon::new_level(int level,WorldP,LocatorP, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - manager->create_enemy(manager->enemy_physical(A_FireDemon)); - -- lTitleStr << "[" << level << "] FIRE DEMON" << ends; -- lStr << "[" << level << "] Kill the Fire Demon." << ends; -+ lTitleStr << "[" << level << "] FIRE DEMON"; -+ lStr << "[" << level << "] Kill the Fire Demon."; - } - - -@@ -2594,7 +2581,7 @@ - - - int KillTheDragon::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, -- int,Boolean &,ostrstream &,Timer &, -+ int,Boolean &,stringstream &,Timer &, - IPhysicalManagerP) { - if (enemiesPlaying == 0) { - locator->arena_message_enq(Utils::strdup("The Infernal Worm has been vanquished")); -@@ -2614,7 +2601,7 @@ - - void KillTheDragon::new_level(int level,WorldP w,LocatorP l, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - const PhysicalContext *cx = &Dragon::creatureContext.movingContext.physicalContext; - Pos pos = w->empty_rect(cx->sizeMax); -@@ -2628,8 +2615,8 @@ - manager->create_enemy(p,False); - } - -- lTitleStr << "[" << level << "] Dragon" << ends; -- lStr << "[" << level << "] Kill the Dragon." << ends; -+ lTitleStr << "[" << level << "] Dragon"; -+ lStr << "[" << level << "] Kill the Dragon."; - } - - -@@ -2667,7 +2654,7 @@ - - - int ZigZag::new_level_check(int,WorldP world,LocatorP locator, -- int,Boolean &,ostrstream &,Timer &, -+ int,Boolean &,stringstream &,Timer &, - IPhysicalManagerP) { - PhysicalP xit = locator->lookup(xitId); - assert(xit); // The Xit should never be destroyed. -@@ -2680,7 +2667,7 @@ - HumanP human = locator->get_human(n); - if (human) { - // previous depth -- int depthOld = (int)human->get_data(); -+ long depthOld = (long)human->get_data(); - Id id = human->get_id(); - - // Get physical for intelligence -@@ -2697,9 +2684,9 @@ - human->set_data((void *)depth); - - // Use 1-based counting for the User. -- ostrstream str; -- str << "Depth " << (depth + 1) << ends; -- locator->arena_message_enq(str.str(),p); -+ stringstream str; -+ str << "Depth " << (depth + 1); -+ locator->arena_message_enq(Utils::strdup(str.str().c_str()),p); - } - } - } -@@ -2718,7 +2705,7 @@ - - void ZigZag::new_level(int level,WorldP world,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP,int) { - Rooms worldRooms = world->get_rooms(); - RoomIndex upperRight(0,worldRooms.acrossMax - 1); -@@ -2731,9 +2718,8 @@ - xitId = p->get_id(); - - // 1-based counting of depth for the user. -- lTitleStr << "[" << level << "] ZIG-ZAG: Depth " -- << worldRooms.downMax << ends; -- lStr << "[" << level << "] ZIG-ZAG.\nFind the exit." << ends; -+ lTitleStr << "[" << level << "] ZIG-ZAG: Depth " << worldRooms.downMax; -+ lStr << "[" << level << "] ZIG-ZAG.\nFind the exit."; - } - - -@@ -2761,7 +2747,7 @@ - - - int ThePound::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, -- int,Boolean &,ostrstream &,Timer &, -+ int,Boolean &,stringstream &,Timer &, - IPhysicalManagerP) { - if (enemiesPlaying == 0) { - locator->arena_message_enq(Utils::strdup("Killed the Mutts")); -@@ -2781,7 +2767,7 @@ - - void ThePound::new_level(int level,WorldP,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - locator->add_team(Scenarios::dog_team,NULL); - -@@ -2789,8 +2775,8 @@ - manager->create_enemy(manager->enemy_physical(A_Dog)); - } - -- lTitleStr << "[" << level << "] The Pound" << ends; -- lStr << "[" << level << "] The Pound" << ends; -+ lTitleStr << "[" << level << "] The Pound"; -+ lStr << "[" << level << "] The Pound"; - } - - -@@ -2801,7 +2787,7 @@ - - - int JapanTown::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, -- int,Boolean &,ostrstream &,Timer &, -+ int,Boolean &,stringstream &,Timer &, - IPhysicalManagerP) { - if (enemiesPlaying == 0) { - locator->arena_message_enq(Utils::strdup("Damn Ninjas. Worse than roaches.")); -@@ -2821,7 +2807,7 @@ - - void JapanTown::new_level(int level,WorldP,LocatorP locator, - const DifficultyLevel &, -- ostrstream &lStr,ostrstream &lTitleStr, -+ stringstream &lStr,stringstream &lTitleStr, - IPhysicalManagerP manager,int) { - locator->add_team(JapanTown::ninja_team,NULL); - -@@ -2829,8 +2815,8 @@ - manager->create_enemy(manager->enemy_physical(A_Ninja)); - } - -- lTitleStr << "[" << level << "] Japan-Town" << ends; -- lStr << "[" << level << "] Japan-Town" << ends; -+ lTitleStr << "[" << level << "] Japan-Town"; -+ lStr << "[" << level << "] Japan-Town"; - } - - diff --git a/games/xevil/files/patch-cmn__game_style.h b/games/xevil/files/patch-cmn__game_style.h deleted file mode 100644 index 665984e9708d..000000000000 --- a/games/xevil/files/patch-cmn__game_style.h +++ /dev/null @@ -1,201 +0,0 @@ ---- cmn/game_style.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/game_style.h 2012-05-27 06:53:11.000000000 +0900 -@@ -30,12 +30,7 @@ - #endif - #endif - --#if X11 --#include <strstream.h> --#endif --#if WIN32 --#include <strstrea.h> --#endif -+#include <sstream> - - #include "utils.h" - #include "coord.h" -@@ -44,6 +39,8 @@ - #include "intel.h" - - -+using namespace std; -+ - #define SCENARIO_SEALS_TRAPDOORS 2 - #define SCENARIO_BONUS_FROGS 12 - #define SCENARIO_FLAG_FLAGS 15 -@@ -91,7 +88,7 @@ - - virtual GameStyle *clone() = 0; - -- virtual void describe(ostrstream &) = 0; -+ virtual void describe(stringstream &) = 0; - /* EFFECTS: Write a two-line description of the style to the stream. */ - - virtual GameStyleType get_type() = 0; -@@ -137,7 +134,7 @@ - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level, -- Boolean &lStrChanged,ostrstream &levelStr, -+ Boolean &lStrChanged,stringstream &levelStr, - Timer &timer, - IPhysicalManagerP); - /* MODIFIES: lStrChanged */ -@@ -166,7 +163,7 @@ - - virtual void new_level(int level,WorldP,LocatorP, - const DifficultyLevel &dLevel, -- ostrstream &levelStr,ostrstream &levelTitleStr, -+ stringstream &levelStr,stringstream &levelTitleStr, - IPhysicalManagerP,int humansNum) = 0; - /* MODIFIES: level */ - /* EFFECTS: Start a new level. Use levelStr levelTitleStr to -@@ -249,7 +246,7 @@ - - virtual GameStyleP clone(); - -- virtual void describe(ostrstream &); -+ virtual void describe(stringstream &); - - virtual GameStyleType get_type(); - -@@ -269,7 +266,7 @@ - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged, -- ostrstream &levelStr,Timer &timer, -+ stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual Boolean advance_level(); -@@ -277,7 +274,7 @@ - virtual Boolean award_bonus(); - - virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, -- ostrstream &levelStr,ostrstream &levelTitleStr, -+ stringstream &levelStr,stringstream &levelTitleStr, - IPhysicalManagerP,int humansNum); - - virtual void new_level_set_timer(Timer &timer); -@@ -305,7 +302,7 @@ - - virtual GameStyleP clone(); - -- virtual void describe(ostrstream &); -+ virtual void describe(stringstream &); - - virtual GameStyleType get_type(); - -@@ -314,11 +311,11 @@ - virtual void reset(WorldP,LocatorP,const DifficultyLevel &,int enemiesNumNext); - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, -- ostrstream &levelStr,ostrstream &levelTitleStr, -+ stringstream &levelStr,stringstream &levelTitleStr, - IPhysicalManagerP,int humansNum); - - virtual void new_level_set_timer(Timer &timer); -@@ -340,7 +337,7 @@ - - virtual GameStyleP clone(); - -- virtual void describe(ostrstream &); -+ virtual void describe(stringstream &); - - virtual GameStyleType get_type(); - -@@ -355,7 +352,7 @@ - virtual Boolean game_over_check(int humansPlaying,int enemiesPlaying); - - virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, -- ostrstream &levelStr,ostrstream &levelTitleStr, -+ stringstream &levelStr,stringstream &levelTitleStr, - IPhysicalManagerP,int humansNum); - - virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); -@@ -376,7 +373,7 @@ - - virtual GameStyleP clone(); - -- virtual void describe(ostrstream &); -+ virtual void describe(stringstream &); - - virtual GameStyleType get_type(); - -@@ -389,7 +386,7 @@ - virtual Boolean game_over_check(int humansPlaying,int enemiesPlaying); - - virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, -- ostrstream &levelStr,ostrstream &levelTitleStr, -+ stringstream &levelStr,stringstream &levelTitleStr, - IPhysicalManagerP,int humansNum); - - virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); -@@ -408,7 +405,7 @@ - - virtual GameStyleP clone(); - -- virtual void describe(ostrstream &); -+ virtual void describe(stringstream &); - - virtual GameStyleType get_type(); - -@@ -423,7 +420,7 @@ - virtual Boolean game_over_check(int humansPlaying,int enemiesPlaying); - - virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, -- ostrstream &levelStr,ostrstream &levelTitleStr, -+ stringstream &levelStr,stringstream &levelTitleStr, - IPhysicalManagerP,int humansNum); - - virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); -@@ -442,7 +439,7 @@ - - virtual GameStyleP clone(); - -- virtual void describe(ostrstream &); -+ virtual void describe(stringstream &); - - virtual GameStyleType get_type(); - -@@ -451,7 +448,7 @@ - virtual void reset(WorldP,LocatorP,const DifficultyLevel &dLevel,int); - - virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, -- ostrstream &levelStr,ostrstream &levelTitleStr, -+ stringstream &levelStr,stringstream &levelTitleStr, - IPhysicalManagerP,int humansNum); - - virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); -@@ -466,7 +463,7 @@ - - virtual GameStyleP clone(); - -- virtual void describe(ostrstream &); -+ virtual void describe(stringstream &); - - virtual GameStyleType get_type(); - -@@ -485,7 +482,7 @@ - virtual void reset(WorldP,LocatorP,const DifficultyLevel &,int enemiesNumNext); - - virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, -- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, -+ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, - IPhysicalManagerP); - - virtual Boolean advance_level(); -@@ -493,7 +490,7 @@ - virtual Boolean award_bonus(); - - virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, -- ostrstream &levelStr,ostrstream &levelTitleStr, -+ stringstream &levelStr,stringstream &levelTitleStr, - IPhysicalManagerP manager,int humansNum); - - virtual void new_level_set_timer(Timer &timer); diff --git a/games/xevil/files/patch-cmn__intel.cpp b/games/xevil/files/patch-cmn__intel.cpp deleted file mode 100644 index 8d364a7f736e..000000000000 --- a/games/xevil/files/patch-cmn__intel.cpp +++ /dev/null @@ -1,109 +0,0 @@ ---- cmn/intel.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ cmn/intel.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -35,7 +35,7 @@ - #include <string.h> - } - #if X11 --#include <strstream.h> -+#include <sstream> - #endif - #if WIN32 - #include <strstrea.h> -@@ -50,6 +50,7 @@ - #include "xdata.h" - - -+using namespace std; - - // Defines - #define FIGHT_RANGE 40 // made it smaller for Dogs 45 // [50-40] -@@ -212,7 +213,7 @@ - - - --Intel::Intel(WorldP w,LocatorP l,char *name, -+Intel::Intel(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask) { - intelStatusChanged = True; - living = True; -@@ -755,7 +756,7 @@ - - - --Human::Human(WorldP w,LocatorP l,char *name,int lves, -+Human::Human(WorldP w,LocatorP l,const char *name,int lves, - int *sharedLves,ColorNum cNum) - : Intel(w,l,name,NULL,ITnone) { - lives = lves; -@@ -931,7 +932,7 @@ - - - --Machine::Machine(WorldP w,LocatorP l,char *name,const IntelOptions *ops, -+Machine::Machine(WorldP w,LocatorP l,const char *name,const IntelOptions *ops, - ITmask opMask) - : Intel(w,l,name,ops,opMask) - { -@@ -1829,7 +1830,7 @@ - - - --Enemy::Enemy(WorldP w,LocatorP l,char *name, -+Enemy::Enemy(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask) - :Machine(w,l,name,ops,opMask) {} - -@@ -1854,7 +1855,7 @@ - - - --Neutral::Neutral(WorldP w,LocatorP l,char *name, -+Neutral::Neutral(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask) - :Machine(w,l,name,ops,opMask) {} - -@@ -1867,7 +1868,7 @@ - - - --SealIntel::SealIntel(WorldP w,LocatorP l,char *name,const Id &home_id) -+SealIntel::SealIntel(WorldP w,LocatorP l,const char *name,const Id &home_id) - :Neutral(w,l,name,NULL,ITnone) - { - // Timer oTimer(LADDER_JUMP_TIME); -@@ -1906,7 +1907,7 @@ - - - --DoppelIntel::DoppelIntel(WorldP w,LocatorP l,char *name, -+DoppelIntel::DoppelIntel(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask,IntelP master) - :Neutral(w,l,name,ops,opMask) { - assert(master); -@@ -2073,7 +2074,7 @@ - - - --Pet::Pet(WorldP w,LocatorP l,char *name, -+Pet::Pet(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask,IntelP master) - :DoppelIntel(w,l,name,ops,opMask,master) { - mode = Heel; -@@ -2095,7 +2096,7 @@ - char buffer[80]; - ostrstream str(buffer,80); - str << "mode changing from:" << Pet::mode_string(prev) << -- " to: " << Pet::mode_string(curr) << endl << ends; -+ " to: " << Pet::mode_string(curr) << endl; - #if WIN32 - TRACE(buffer); - #endif -@@ -2308,7 +2309,7 @@ - - - --char *Pet::mode_string(int mode) { -+const char *Pet::mode_string(int mode) { - switch (mode) { - case Heel: - return "Heel"; diff --git a/games/xevil/files/patch-cmn__intel.h b/games/xevil/files/patch-cmn__intel.h deleted file mode 100644 index e5946e814b78..000000000000 --- a/games/xevil/files/patch-cmn__intel.h +++ /dev/null @@ -1,83 +0,0 @@ ---- cmn/intel.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/intel.h 2012-05-27 06:53:11.000000000 +0900 -@@ -123,7 +123,7 @@ - // Class Definitions. - class Intel { - public: -- Intel(WorldP w,LocatorP l,char *name, -+ Intel(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask); - /* EFFECTS: Create a new intel with the options specified in opMakse that are - in ops. ops will never be referenced if opMask is ITnone. lives now -@@ -293,7 +293,7 @@ - // Simply buffers input from a user interface. - class Human: public Intel { - public: -- Human(WorldP w,LocatorP l,char *name,int lives, -+ Human(WorldP w,LocatorP l,const char *name,int lives, - int *sharedLives,ColorNum colorNum); - /* NOTE: Uses all default options. intelOptions should be meaningless for - a human. If "sharedLives" is non-null, ignore "lives" and share the lives. */ -@@ -346,7 +346,7 @@ - - class Machine: public Intel { - public: -- Machine(WorldP w,LocatorP l,char *name, -+ Machine(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask); - - virtual IntelId get_master_intel_id(); -@@ -464,7 +464,7 @@ - - class Enemy: public Machine { - public: -- Enemy(WorldP w,LocatorP l,char *name, -+ Enemy(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask); - - static void set_reflexes_time(int time) {reflexesTime = time;} -@@ -491,7 +491,7 @@ - - class Neutral: public Machine { - public: -- Neutral(WorldP w,LocatorP l,char *name, -+ Neutral(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask); - - virtual Boolean is_enemy(); -@@ -502,7 +502,7 @@ - - class SealIntel: public Neutral { - public: -- SealIntel(WorldP w,LocatorP l,char *name,const Id &homeId); -+ SealIntel(WorldP w,LocatorP l,const char *name,const Id &homeId); - - virtual Boolean is_seal_intel(); - -@@ -522,7 +522,7 @@ - - class DoppelIntel: public Neutral { - public: -- DoppelIntel(WorldP w,LocatorP l,char *name, -+ DoppelIntel(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask, - IntelP master = NULL); - -@@ -572,7 +572,7 @@ - // in choose_strategy() and go_get_em(). - class Pet: public DoppelIntel { - public: -- Pet(WorldP w,LocatorP l,char *name, -+ Pet(WorldP w,LocatorP l,const char *name, - const IntelOptions *ops,ITmask opMask, - IntelP master = NULL); - -@@ -583,7 +583,7 @@ - IT_WEAPON_{some dir}, or to come back to him if command is IT_WEAPON_CENTER. - This will also set p to be the new master. */ - -- static char *mode_string(int mode); -+ static const char *mode_string(int mode); - /* NOTE: For debugging. */ - - diff --git a/games/xevil/files/patch-cmn__locator.cpp b/games/xevil/files/patch-cmn__locator.cpp deleted file mode 100644 index 534d959f4036..000000000000 --- a/games/xevil/files/patch-cmn__locator.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- cmn/locator.cpp.orig 2012-05-27 06:52:30.000000000 +0900 -+++ cmn/locator.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -50,6 +50,7 @@ - - #include "bitmaps/locator/locator.bitmaps" // for arrows - -+using namespace std; - - // When we reach this, start deleting objects. - #define OL_LIST_WARN ((int)(OL_LIST_MAX * 0.9)) diff --git a/games/xevil/files/patch-cmn__locator.h b/games/xevil/files/patch-cmn__locator.h deleted file mode 100644 index 68d27544fc5f..000000000000 --- a/games/xevil/files/patch-cmn__locator.h +++ /dev/null @@ -1,20 +0,0 @@ ---- cmn/locator.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/locator.h 2012-05-27 06:53:11.000000000 +0900 -@@ -47,7 +47,7 @@ - - - // Include Files --#include <iostream.h> -+#include <iostream> - - #include "utils.h" - #include "coord.h" -@@ -96,6 +96,8 @@ - #define OL_RECENT_SOUNDS_MAX 30 - - -+class OLgridEntry; -+class OLshadowEntry; - - // An entry for one object in the list of all objects currently in the game. - class OLentry { diff --git a/games/xevil/files/patch-cmn__physical.cpp b/games/xevil/files/patch-cmn__physical.cpp deleted file mode 100644 index b9d29be92103..000000000000 --- a/games/xevil/files/patch-cmn__physical.cpp +++ /dev/null @@ -1,191 +0,0 @@ ---- cmn/physical.cpp.orig 2012-05-27 06:52:30.000000000 +0900 -+++ cmn/physical.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -33,10 +33,10 @@ - // Include Files - #include "xdata.h" - #include "physical.h" --#include <iostream.h> -+#include <iostream> - - #if X11 --#include <strstream.h> -+#include <sstream> - #endif - #if WIN32 - #include <strstrea.h> -@@ -54,6 +54,7 @@ - - #include "bitmaps/transform/transform.bitmaps" - -+using namespace std; - - // Defines - #define VEL_SMALL 1 -@@ -523,9 +524,9 @@ - - if (heat == 0 && heatNext > 0) { - LocatorP l = get_locator(); -- ostrstream str; -- str << get_class_name() << " is on fire." << ends; -- locator->message_enq(str.str()); -+ stringstream str; -+ str << get_class_name() << " is on fire."; -+ locator->message_enq(Utils::strdup(str.str().c_str())); - } - } - previousHeatWasSecondary = secondary; -@@ -1844,7 +1845,7 @@ - } - - // Use the pixmap resource id as the base. -- u_int cmnBitsId = (unsigned int)mc->pixmapBits[baseDir][animNum]; -+ u_int cmnBitsId = (unsigned long)mc->pixmapBits[baseDir][animNum]; - - // It is ok to call OneTransform::compute_key() even if there is no - // transformation, will just return 0x0. -@@ -2556,17 +2557,17 @@ - - void Item::die() { - LocatorP locator = get_locator(); -- ostrstream msg; -+ stringstream msg; - switch (dieMessage) { - case NONE: - break; - case USED: -- msg << get_class_name() << " has been used." << ends; -- locator->message_enq(msg.str()); -+ msg << get_class_name() << " has been used."; -+ locator->message_enq(Utils::strdup(msg.str().c_str())); - break; - case DESTROYED: -- msg << get_class_name() << " is destroyed." << ends; -- locator->message_enq(msg.str()); -+ msg << get_class_name() << " is destroyed."; -+ locator->message_enq(Utils::strdup(msg.str().c_str())); - break; - }; - -@@ -2650,10 +2651,8 @@ - // Prevent non-biologicals from picking up drugs. - - if (p->is_creature() && !((CreatureP)p)->biological()) { -- ostrstream msg; -- msg << "Non-Biological Creatures Cannot Use Drugs" << ends; - LocatorP locator = get_locator(); -- locator->arena_message_enq(msg.str(),p); -+ locator->arena_message_enq(Utils::strdup("Non-Biological Creatures Cannot Use Drugs"), p); - kill_self(); - } - else { -@@ -2673,13 +2672,11 @@ - assert(context->odChance >= 0); - if (context->odChance && Utils::choose(context->odChance) == 0) { - p->kill_self(); -- ostrstream msg; -- msg << p->get_class_name() << " dies from crack overdose." << ends; -- locator->message_enq(msg.str()); -+ stringstream msg; -+ msg << p->get_class_name() << " dies from crack overdose."; -+ locator->message_enq(Utils::strdup(msg.str().c_str())); - -- ostrstream arenaMsg; -- arenaMsg << "You Died From Drug Overdose" << ends; -- locator->arena_message_enq(arenaMsg.str(),p); -+ locator->arena_message_enq(Utils::strdup("You Died From Drug Overdose"),p); - - set_quiet_death(); // so doesn't report "has been used" message. - } -@@ -2693,9 +2690,7 @@ - } - else { - // Shouldn't get here, should kill self when picking it up. -- ostrstream msg; -- msg << "Non-Biological Creatures Cannot Use Drugs" << ends; -- locator->arena_message_enq(msg.str(),p); -+ locator->arena_message_enq(Utils::strdup("Non-Biological Creatures Cannot Use Drugs"),p); - } - - kill_self(); -@@ -4334,14 +4329,14 @@ - if (!get_quiet_death() && !alive() && - (corpseTimer.ready() || (get_health() < - cc->corpseHealth))) { - LocatorP locator = get_locator(); -- ostrstream msg; -+ stringstream msg; - if (corpseTimer.ready()) { -- msg << get_class_name() << " corpse has decomposed." << ends; -- locator->message_enq(msg.str()); -+ msg << get_class_name() << " corpse has decomposed."; -+ locator->message_enq(Utils::strdup(msg.str().c_str())); - } - else { -- msg << get_class_name() << " corpse has been destroyed." << ends; -- locator->message_enq(msg.str()); -+ msg << get_class_name() << " corpse has been destroyed."; -+ locator->message_enq(Utils::strdup(msg.str().c_str())); - } - set_delete_me(); - } -@@ -4399,9 +4394,9 @@ - set_vel_next(velNew); - set_stance_next(CO_air); - -- ostrstream msg; -- msg << get_class_name() << " has died." << ends; -- locator->message_enq(msg.str()); -+ stringstream msg; -+ msg << get_class_name() << " has died."; -+ locator->message_enq(Utils::strdup(msg.str().c_str())); - - set_no_death_delete(); - } -@@ -6072,10 +6067,10 @@ - } - // If User is already holding the max number of weapons. - else if (weaponsNum >= PH_WEAPONS_MAX) { -- ostrstream msg; -- msg << "Can only hold " << PH_WEAPONS_MAX << " weapons" << ends; -+ stringstream msg; -+ msg << "Can only hold " << PH_WEAPONS_MAX << " weapons"; - LocatorP locator = cre->get_locator(); -- locator->arena_message_enq(msg.str(),cre); -+ locator->arena_message_enq(Utils::strdup(msg.str().c_str()),cre); - destroyOther = True; - } - // Actually pick it up. -@@ -6124,15 +6119,14 @@ - else { - LocatorP locator = cre->get_locator(); - if (itemsNum == PH_ITEMS_MAX) { -- ostrstream msg; -- msg << "Can only hold " << PH_ITEMS_MAX << " items" << ends; -- locator->arena_message_enq(msg.str(),cre); -+ stringstream msg; -+ msg << "Can only hold " << PH_ITEMS_MAX << " items"; -+ locator->arena_message_enq(Utils::strdup(msg.str().c_str()),cre); - } - else if (itemClassCount >= ITEM_CLASS_MAX) { -- ostrstream msg; -- msg << "Can only hold " << ITEM_CLASS_MAX -- << " of any one item" << ends; -- locator->arena_message_enq(msg.str(),cre); -+ stringstream msg; -+ msg << "Can only hold " << ITEM_CLASS_MAX << " of any one item"; -+ locator->arena_message_enq(Utils::strdup(msg.str().c_str()),cre); - } - - other->set_quiet_death(); -@@ -6661,9 +6655,9 @@ - ((ItemP)p)->use(cre); - } - else { -- ostrstream str; -- str << "Cannot use " << p->get_class_name() << ends; -- locator->arena_message_enq(str.str(),cre); -+ stringstream str; -+ str << "Cannot use " << p->get_class_name(); -+ locator->arena_message_enq(Utils::strdup(str.str().c_str()),cre); - } - } - break; diff --git a/games/xevil/files/patch-cmn__physical.h b/games/xevil/files/patch-cmn__physical.h deleted file mode 100644 index 5f668d4dbe36..000000000000 --- a/games/xevil/files/patch-cmn__physical.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cmn/physical.h.orig Wed Jan 19 12:54:08 2000 -+++ cmn/physical.h Mon Nov 3 21:36:14 2003 -@@ -93,7 +93,7 @@ - CLASSNAME::CLASSNAME(InStreamP in,const CLASSNAME ## Context &cx, \ - CLASSNAME ## Xdata &x_data, \ - WorldP w,LocatorP l) \ -- : PARENT(in,cx. ## parent ## Context,x_data,w,l) -+ : PARENT(in,cx. parent ## Context,x_data,w,l) - - // Used by internal nodes and leaves. - #define DEFINE_UPDATE_FROM_STREAM(CLASSNAME,PARENT) \ diff --git a/games/xevil/files/patch-cmn__role.cpp b/games/xevil/files/patch-cmn__role.cpp deleted file mode 100644 index 14aab160de04..000000000000 --- a/games/xevil/files/patch-cmn__role.cpp +++ /dev/null @@ -1,487 +0,0 @@ ---- cmn/role.cpp.orig 2012-05-27 06:52:30.000000000 +0900 -+++ cmn/role.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -29,9 +29,9 @@ - - #include "stdafx.h" - --#include <iostream.h> -+#include <iostream> - #if X11 --#include <strstream.h> -+#include <sstream> - #include <time.h> - #endif - #if WIN32 -@@ -266,43 +266,39 @@ - - - void Role::error(const char *msg1,const char *msg2,const char *msg3) { -- ostrstream str; -+ stringstream str; - - if (msg2 == NULL) { -- str << msg1 << ends; -+ str << msg1; - } - else if (msg3 == NULL) { -- str << msg1 << msg2 << ends; -+ str << msg1 << msg2; - } - else { -- str << msg1 << msg2 << msg3 << ends; -+ str << msg1 << msg2 << msg3; - } - - // Call one argument version. -- _error(str.str()); -- -- delete str.str(); -+ _error(str.str().c_str()); - } - - - - void Role::message(const char *msg1,const char *msg2,const char *msg3) { -- ostrstream str; -+ stringstream str; - - if (msg2 == NULL) { -- str << msg1 << ends; -+ str << msg1; - } - else if (msg3 == NULL) { -- str << msg1 << msg2 << ends; -+ str << msg1 << msg2; - } - else { -- str << msg1 << msg2 << msg3 << ends; -+ str << msg1 << msg2 << msg3; - } - - // Call one argument version. -- _message(str.str()); -- -- delete str.str(); -+ _message(str.str().c_str()); - } - - -@@ -605,11 +601,11 @@ - // Display message that we are looking up IP address. - // Assumes that caller will call Client::connect_server after a turn or two, - // so the message will be displayed on the Ui. -- ostrstream str; -- str << "Looking up IP address for server " << serverName << ends; -+ stringstream str; -+ str << "Looking up IP address for server " << serverName; - // Display for a long time. -- errLocator->arena_message_enq(str.str(),NULL,1000000); -- errLocator->message_enq(Utils::strdup(str.str())); -+ errLocator->arena_message_enq(Utils::strdup(str.str().c_str()),NULL,1000000); -+ errLocator->message_enq(Utils::strdup(str.str().c_str())); - // Probably would be better to use Role::message(), but we want it to stay - // up for a long time. Should add argument to Role::message(). - -@@ -657,18 +653,16 @@ void Client::connect_server() { - client.sin_family = AF_INET; - client.sin_addr.s_addr = htonl(INADDR_ANY); - client.sin_port = htons((u_short)(clientPortBase + n)); -- if (bind(udpSock,(CMN_SOCKADDR *)&client,sizeof(client)) >= 0) { -+ if (::bind(udpSock,(CMN_SOCKADDR *)&client,sizeof(client)) >= 0) { - // Success. - break; - } - } - if (n == CLIENT_PORT_TRIES) { -- ostrstream str; -+ stringstream str; - str << "Could not bind local UDP port to any of " -- << clientPortBase << "-" << (clientPortBase + CLIENT_PORT_TRIES - 1) -- << ends; -- error(str.str()); -- delete str.str(); -+ << clientPortBase << "-" << (clientPortBase + CLIENT_PORT_TRIES - 1); -+ error(str.str().c_str()); - return; - } - // cout << "UDP port seems to be" << client.sin_port << endl; -@@ -703,22 +697,19 @@ - - // Inform user of failed connection - if (!ok()) { -- strstream msg; -+ stringstream msg; - msg << "Could not connect to " << serverName << " on port " << -- port << "." << ends; -- error(msg.str()); -- delete(msg.str()); -+ port << "."; -+ error(msg.str().c_str()); - delete tcpOut; - return; - } - - // Inform user of successful connection -- strstream msg; -+ stringstream msg; - msg << hostName << " connected to " << serverName << " on port " << -- port << ends; -- message(msg.str()); -- delete msg.str(); -- -+ port; -+ message(msg.str().c_str()); - - // Create TCP and UDP streams. - tcpIn = new NetInStream(tcpSock,False); -@@ -967,11 +958,11 @@ - Role::_error(msg); - - if (errorLocator) { -- ostrstream str2; -- str2 << "ERROR: " << msg << ends; -- errorLocator->arena_message_enq(str2.str(),NULL,ROLE_FAILED_TIME); -+ stringstream str2; -+ str2 << "ERROR: " << msg; -+ errorLocator->arena_message_enq(Utils::strdup(str2.str().c_str()),NULL,ROLE_FAILED_TIME); - // Don't delete str2.str(), give memory to the Locator. -- errorLocator->message_enq(Utils::strdup(str2.str())); -+ errorLocator->message_enq(Utils::strdup(str2.str().c_str())); - } - #if WIN32 - // Only the client can afford to block on error messages. -@@ -986,11 +977,9 @@ - Role::_error(msg); - - if (errorLocator) { -- ostrstream str2; -- str2 << msg << ends; -- errorLocator->arena_message_enq(str2.str()); -+ errorLocator->arena_message_enq(Utils::strdup(msg)); - // Don't delete str2.str(), give memory to the Locator. -- errorLocator->message_enq(Utils::strdup(str2.str())); -+ errorLocator->message_enq(Utils::strdup(msg)); - } - } - -@@ -1256,10 +1245,9 @@ - if (turn > turnMax) { - turnMax = turn; - if (echoPingPong) { -- ostrstream str; -- str << "PONG the server with turn " << turnMax << ends; -- message(str.str()); -- delete str.str(); -+ stringstream str; -+ str << "PONG the server with turn " << turnMax; -+ message(str.str().c_str()); - } - // Tell server so it can free turn windows to send more data. - XETP::send_pong(udpOut,turnMax); -@@ -1365,10 +1353,9 @@ - } - } - else { -- ostrstream str; -- str << "No context for classId " << classId << ends; -- error(str.str()); -- delete str.str(); -+ stringstream str; -+ str << "No context for classId " << classId; -+ error(str.str().c_str()); - } - } - } -@@ -1582,9 +1569,9 @@ - return Utils::strdup(clientName); - } - -- ostrstream str; -- str << '\"' << intel->get_name() << "\"@" << clientName << ends; -- return str.str(); -+ stringstream str; -+ str << '\"' << intel->get_name() << "\"@" << clientName; -+ return Utils::strdup(str.str().c_str()); - } - - -@@ -1695,11 +1682,10 @@ - } - - #ifdef SKIP_MESSAGES -- ostrstream msg; -+ stringstream msg; - msg << "Average delay is " << avg << " out of " -- << delaysNum << " samples." << ends; -+ << delaysNum << " samples."; - server->message(msg.str()); -- delete msg.str(); - #endif - - #if 0 -@@ -1723,10 +1709,9 @@ - // server->error("Client has reached maximum skip value."); - // } - #ifdef SKIP_MESSAGES -- ostrstream msg; -- msg << "Increasing skip to " << skip << ends; -+ stringstream msg; -+ msg << "Increasing skip to " << skip; - server->message(msg.str()); -- delete msg.str(); - #endif - } - // We have moved back into our target range, can send more data now. -@@ -1734,10 +1719,9 @@ - skip--; - - #ifdef SKIP_MESSAGES -- ostrstream msg; -- msg << "Decreasing skip to " << skip << ends; -+ stringstream msg; -+ msg << "Decreasing skip to " << skip; - server->message(msg.str()); -- delete msg.str(); - #endif - } - -@@ -1777,7 +1761,7 @@ - - - --Server::Server(Boolean lHuman,char *portName,LocatorP errLocator) { -+Server::Server(Boolean lHuman,const char *portName,LocatorP errLocator) { - // Hack, using errLocator for more than reporting errors. - errLocator->set_remember_deleted(True); - errLocator->set_remember_sounds(True); -@@ -1842,20 +1826,18 @@ void Server::run() { - serverAddr.sin_port = htons(port); - - // Give address to both the TCP and UDP sockets. -- if (bind(tcpSock, (CMN_SOCKADDR *)&serverAddr, sizeof(serverAddr)) < 0) { -- ostrstream str; -+ if (::bind(tcpSock, (CMN_SOCKADDR *)&serverAddr, sizeof(serverAddr)) < 0) { -+ stringstream str; - str << "Couldn't bind socket name to TCP socket on port " -- << port << "." << ends; -- error(str.str()); -- delete str.str(); -+ << port << "."; -+ error(str.str().c_str()); - return; - } -- if (bind(udpSock, (CMN_SOCKADDR *)&serverAddr, sizeof(serverAddr)) < 0) { -- ostrstream str; -+ if (::bind(udpSock, (CMN_SOCKADDR *)&serverAddr, sizeof(serverAddr)) < 0) { -+ stringstream str; - str << "Couldn't bind socket name to UDP socket on port " -- << port << "." << ends; -- error(str.str()); -- delete str.str(); -+ << port << "."; -+ error(str.str().c_str()); - return; - } - -@@ -1868,10 +1850,9 @@ - assert(udpIn); - - // Message to server log. -- strstream msg; -- msg << "Set up server on port " << port << ends; -- message(msg.str()); -- delete(msg.str()); -+ stringstream msg; -+ msg << "Set up server on port " << port; -+ message(msg.str().c_str()); - - running = True; - } -@@ -1951,10 +1932,9 @@ - localHumanId = hId; - - // Log the human's name. -- strstream msg; -- msg << "Player 0 \"" << human->get_name() << '\"' << "@SERVER" << ends; -- message(msg.str()); -- delete(msg.str()); -+ stringstream msg; -+ msg << "Player 0 \"" << human->get_name() << '\"' << "@SERVER"; -+ message(msg.str().c_str()); - - return; - } -@@ -1985,12 +1965,11 @@ - - // Log all the players in the game, some code duplication for the - // local human. -- ostrstream str; -+ stringstream str; - char* fullName = cn->get_full_client_name(); -- str << "Player " << num << " " << fullName << ends; -- message(str.str()); -+ str << "Player " << num << " " << fullName; -+ message(str.str().c_str()); - delete fullName; -- delete str.str(); - - // Send assign_intel via TCP - OutStreamP out = cn->get_tcp_out_stream(); -@@ -2007,13 +1986,12 @@ - // anyway. - for (m = 0; m < connections.length() && m != n; m++) { - char* fullName = cn->get_full_client_name(); -- ostrstream str; -- str << fullName << " has joined the game" << ends; -+ stringstream str; -+ str << fullName << " has joined the game"; - delete fullName; - - OutStreamP out = cn->get_udp_out_stream(); -- XETP::send_arena_message(out,timeMS,str.str()); -- delete str.str(); -+ XETP::send_arena_message(out,timeMS,str.str().c_str()); - } - cn->creation_message_sent(); - } -@@ -2101,13 +2079,12 @@ - // Give the connection some slack when it is first starting up. - turn - cn->get_start_turn() >= MINIMUM_CUTOFF) { - char* fullName = cn->get_full_client_name(); -- ostrstream str; -+ stringstream str; - str << fullName - << " has not responded in " -- << diff << " turns. Disconnect." << ends; -- message(str.str()); -+ << diff << " turns. Disconnect."; -+ message(str.str().c_str()); - delete fullName; -- delete str.str(); - tooOld = True; - } - } -@@ -2147,11 +2124,10 @@ - diff == NO_ACTIVITY_WARN_2 || - diff == NO_ACTIVITY_WARN_3) { - if (echoPingPong) { -- ostrstream str; -+ stringstream str; - str << "Haven't heard from " << cn->get_client_name() -- << " in " << diff << " turns, sending PING." << ends; -- message(str.str()); -- delete str.str(); -+ << " in " << diff << " turns, sending PING."; -+ message(str.str().c_str()); - } - XETP::send_ping(cn->get_udp_out_stream()); - } -@@ -2311,7 +2287,11 @@ - for (m = 0; m < followers.length(); m++) { - PhysicalP q = (PhysicalP)followers.get(m); - netData = q->get_net_data(); -- assert(!netData->get_sent_flag()); -+ // This line was aborting network games, often in the pound scenario. -+ // Without it, the server seems to continue without error. -+ // I tried replacing it with a warning, but there is so much of it -+ // that it is nearly impossible to see anything else. -Brandon -+// assert(!netData->get_sent_flag()); - netData->set_sent_flag(True); - } - -@@ -2713,9 +2693,9 @@ - // Careful to set the propagate flag to False so the message doesn't get - // sent to the clients. - if (errorLocator) { -- ostrstream str2; -- str2 << "SERVER: " << msg << ends; -- errorLocator->arena_message_enq(str2.str(),NULL,ROLE_FAILED_TIME,False); -+ stringstream str2; -+ str2 << "SERVER: " << msg; -+ errorLocator->arena_message_enq(Utils::strdup(str2.str().c_str()),NULL,ROLE_FAILED_TIME,False); - // Don't delete str2.str(), give memory to the Locator. - - // Could do a regular message_enq(), but would have to deal with the -@@ -2728,10 +2708,9 @@ - void Server::display_chat_message(LocatorP l,const char* sender, - const char* msg) { - // Log the chat message, then let Role handle it. -- strstream logMsg; -- logMsg << '<' << sender << '>' << msg << ends; -- message(logMsg.str()); -- delete logMsg.str(); -+ stringstream logMsg; -+ logMsg << '<' << sender << '>' << msg; -+ message(logMsg.str().c_str()); - - Role::display_chat_message(l,sender,msg); - } -@@ -2851,12 +2830,11 @@ - udpAddr->sin_port = htons(udpPort); - - // Log the connection. -- strstream msg; -+ stringstream msg; - msg << clientName << - " connected (TCP port " << ntohs(tcpAddr.sin_port) << -- ", UDP port " << udpPort << ")" << ends; -- message(msg.str()); -- delete(msg.str()); -+ ", UDP port " << udpPort << ")"; -+ message(msg.str().c_str()); - - Connection* cn = - new Connection(this,errorLocator, -@@ -2874,7 +2852,7 @@ - XETP::send_reset(out,manager->get_game_style_type()); - - // Say hello to the new client. -- ostrstream greeting; -+ stringstream greeting; - greeting << "Welcome to " << hostName << "."; - - if (get_humans_num() == 1) { -@@ -2884,10 +2862,8 @@ - greeting << " There are now " - << get_humans_num() << " players."; - } -- greeting << ends; - int timeMS = quantaToMS(UI_ARENA_MESSAGE_TIME,manager); -- XETP::send_arena_message(out,timeMS,greeting.str()); -- delete greeting.str(); -+ XETP::send_arena_message(out,timeMS,greeting.str().c_str()); - - manager->humans_num_incremented(); - } -@@ -2918,18 +2894,16 @@ - Connection* cm = get_connection(m); - - char* fullName = cn->get_full_client_name(); -- ostrstream str; -+ stringstream str; - str << fullName << " has disconnected"; - if (intel) { - str << ", " << kills << " human kills"; - } -- str << ends; - XETP::send_arena_message(cm->get_udp_out_stream(), -- timeMS,str.str()); -+ timeMS,str.str().c_str()); - - - delete fullName; -- delete str.str(); - } - } - -@@ -3262,8 +3236,8 @@ - void Server::send_udp_server_pong(IGameManager* manager,LocatorP locator, - CMN_SOCKET udpSock, - CMN_SOCKADDR_IN* destAddr) { -- static char* unknownString = "<unknown>"; -- static char* serverString = "<server>"; -+ static const char* unknownString = "<unknown>"; -+ static const char* serverString = "<server>"; - - - // Temporary stream. diff --git a/games/xevil/files/patch-cmn__role.h b/games/xevil/files/patch-cmn__role.h deleted file mode 100644 index 959454ce1dab..000000000000 --- a/games/xevil/files/patch-cmn__role.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cmn/role.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/role.h 2012-05-27 06:53:11.000000000 +0900 -@@ -539,7 +539,7 @@ - - - public: -- Server(Boolean localHuman,char *portName,LocatorP); -+ Server(Boolean localHuman,const char *portName,LocatorP); - /* EFFECTS: Create a server that listens for connections on given port. - If NULL is passed in, use XETP::DEFAULT_PORT. */ - diff --git a/games/xevil/files/patch-cmn__streams.cpp b/games/xevil/files/patch-cmn__streams.cpp deleted file mode 100644 index 09bd066253bc..000000000000 --- a/games/xevil/files/patch-cmn__streams.cpp +++ /dev/null @@ -1,35 +0,0 @@ ---- cmn/streams.cpp.orig 2012-05-27 06:52:30.000000000 +0900 -+++ cmn/streams.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -31,12 +31,13 @@ - #include "utils.h" - #include "neth.h" // needed for recv, send, recvfrom, sendto - --#include <iostream.h> -+#include <iostream> - - #include "streams.h" - #include "xetp.h" // yuck, need this for XETP::versionStr - - -+using namespace std; - - Checksum GenericStream::compute_checksum(u_char *data,int len) { - Checksum c = 0; -@@ -205,7 +206,7 @@ - - - --Boolean NetOutStream::write(void *buf,int size) { -+Boolean NetOutStream::write(const void *buf,int size) { - if (!isAlive) { - return False; - } -@@ -518,7 +519,7 @@ - - - --Boolean UDPOutStream::write(void *buf,int size) { -+Boolean UDPOutStream::write(const void *buf,int size) { - if (!isAlive) { - return False; - } diff --git a/games/xevil/files/patch-cmn__streams.h b/games/xevil/files/patch-cmn__streams.h deleted file mode 100644 index 10ef5721781c..000000000000 --- a/games/xevil/files/patch-cmn__streams.h +++ /dev/null @@ -1,29 +0,0 @@ ---- cmn/streams.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/streams.h 2012-05-27 06:53:11.000000000 +0900 -@@ -97,7 +97,7 @@ - public: - OutStream(Boolean ownSock) : GenericStream(ownSock) {} - -- virtual Boolean write(void *buf,int size) = 0; -+ virtual Boolean write(const void *buf,int size) = 0; - /* EFFECTS: Write size number of bytes into buf. Return True if - successful. */ - -@@ -171,7 +171,7 @@ - - virtual Boolean alive(); - -- virtual Boolean write(void *buf,int size); -+ virtual Boolean write(const void *buf,int size); - - virtual void write_char(u_char); - -@@ -253,7 +253,7 @@ - - virtual void done_packet(); - -- virtual Boolean write(void *buf,int size); -+ virtual Boolean write(const void *buf,int size); - - void flush(); - diff --git a/games/xevil/files/patch-cmn__utils.cpp b/games/xevil/files/patch-cmn__utils.cpp deleted file mode 100644 index 5cfdfd2a410b..000000000000 --- a/games/xevil/files/patch-cmn__utils.cpp +++ /dev/null @@ -1,107 +0,0 @@ ---- cmn/utils.cpp.orig 2012-05-27 06:52:30.000000000 +0900 -+++ cmn/utils.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -30,16 +30,16 @@ - - // Include Files - #include "stdafx.h" --#include <iostream.h> -+#include <iostream> - #include <limits.h> - #include <string.h> - #include <ctype.h> --#include <fstream.h> -+#include <fstream> - #if WIN32 - #include <strstrea.h> - #endif - #if X11 --#include <strstream.h> -+#include <sstream> - #endif - - #ifdef WIN32 -@@ -422,10 +422,8 @@ - - - char* Utils::get_OS_info() { -- ostrstream ret; -- -- - #ifdef WIN32 -+ stringstream ret; - OSVERSIONINFO osInfo; - osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - Boolean set = False; -@@ -465,12 +463,11 @@ - Utils::strcmp(osInfo.szCSDVersion," ")) { - ret << '(' << osInfo.szCSDVersion << ')'; - } -- ret << ends; - } - } - - if (!set) { -- ret << "Unknown Win32" << ends; -+ ret << "Unknown Win32"; - } - #endif - -@@ -494,20 +491,15 @@ - if (buffer[strLen - 1] == '\n') { - buffer[strLen - 1] = '\0'; - } -- ret << buffer << ends; -- set = True; -+ return strdup(buffer); - } - } - pclose(fp); - } - -- if (!set) { -- ret << "Unknown UNIX" << ends; -- } -+ return strdup("Unknown UNIX"); - #endif - -- -- return ret.str(); - } - - -@@ -605,7 +597,7 @@ - // Not tested. - out->write_int(len); - for (int n = 0; n < len; n++) { -- out->write_int((int)data[n]); -+ out->write_int((long)data[n]); - } - } - -@@ -761,7 +753,7 @@ - - - private: -- Bucket* HashTable::_get(int &index,void* key); -+ Bucket* _get(int &index,void* key); - /* MODIFIES: index */ - /* EFFECTS: Internal helper function. Return the Bucket containing key - or NULL if not found. Set index to the bucket list for key whether -@@ -944,7 +936,7 @@ - // Pretty crappy hash function, I know. - // Careful if bucketsNum is a power of 2. - int HashTable::defaultHash(void* key,int bucketsNum) { -- return ((unsigned int)key) % bucketsNum; -+ return ((unsigned long)key) % bucketsNum; - } - - -@@ -1024,7 +1016,7 @@ - #endif - - #if X11 -- cout << str << endl; -+ std::cout << str << std::endl; - #endif - } - diff --git a/games/xevil/files/patch-cmn__utils.h b/games/xevil/files/patch-cmn__utils.h deleted file mode 100644 index e88b3e8d7a3d..000000000000 --- a/games/xevil/files/patch-cmn__utils.h +++ /dev/null @@ -1,28 +0,0 @@ ---- cmn/utils.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/utils.h 2012-05-27 06:53:11.000000000 +0900 -@@ -159,7 +159,7 @@ - - typedef int GameStyleType; - // Possible values of GameStyleType. --enum {SCENARIOS,LEVELS_ONLY,KILL,DUEL,EXTENDED,TRAINING,LEVELS}; -+enum {SCENARIOS,LEVELS_ONLY,KILL,DUEL,EXTENDED,TRAINING,LEVELS,NUM_GAME_STYLES}; - - - -@@ -237,13 +237,13 @@ - /* EFFECTS: Wrapper for C library strcmp(). Return 0 if strings are the - same. */ - -- static char* strchr(const char* cs,int c) -+ static const char* strchr(const char* cs,int c) - {return ::strchr(cs,c);} - -- static char* strrchr(const char* cs,int c) -+ static const char* strrchr(const char* cs,int c) - {return ::strrchr(cs,c);} - -- static char* strstr(const char* cs,const char* ct) -+ static const char* strstr(const char* cs,const char* ct) - {return ::strstr(cs,ct);} - - static void strcpy(char* s,const char* ct) diff --git a/games/xevil/files/patch-cmn__world.cpp b/games/xevil/files/patch-cmn__world.cpp deleted file mode 100644 index eb2b22c4f7a2..000000000000 --- a/games/xevil/files/patch-cmn__world.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- cmn/world.cpp.orig 2012-05-27 06:52:30.000000000 +0900 -+++ cmn/world.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -35,7 +35,7 @@ - #endif - - // Include Files. --#include <iostream.h> -+#include <iostream> - - #include "utils.h" - #include "coord.h" -@@ -48,6 +48,7 @@ - // For PhysMover. - #include "actual.h" - -+using namespace std; - - // Defines. - #define HANGING_PERCENT 0.40 // The % of the edge hanging off the corner. diff --git a/games/xevil/files/patch-cmn__xetp.cpp b/games/xevil/files/patch-cmn__xetp.cpp deleted file mode 100644 index ab2a4f22859d..000000000000 --- a/games/xevil/files/patch-cmn__xetp.cpp +++ /dev/null @@ -1,50 +0,0 @@ ---- cmn/xetp.cpp.orig 2012-05-27 06:52:30.000000000 +0900 -+++ cmn/xetp.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -29,9 +29,9 @@ - - #include "stdafx.h" - --#include <iostream.h> -+#include <iostream> - #if X11 --#include <strstream.h> -+#include <sstream> - #endif - #if WIN32 - #include <strstrea.h> -@@ -53,6 +53,8 @@ - #include "xetp.h" - - -+using namespace std; -+ - - void XETP::check_sizes() { - XETPBasic::check_sizes(); -@@ -159,7 +161,7 @@ - for (n = 0; n < physicals.length(); n++) { - PhysicalP p = (PhysicalP)physicals.get(n); - // computing object_length twice, but who cares. -- _send_object(out,p,turn,(TickType)tickTypes.get(n), -+ _send_object(out,p,turn,(long)tickTypes.get(n), - compute_object_length(p)); - } - -@@ -274,7 +276,7 @@ - - - --void XETP::send_message(OutStreamP out,char *msg) { -+void XETP::send_message(OutStreamP out,const char *msg) { - assert(msg); - u_int len = strlen(msg); - -@@ -293,7 +295,7 @@ - - - --void XETP::send_arena_message(OutStreamP out,int time,char *msg) { -+void XETP::send_arena_message(OutStreamP out,int time,const char *msg) { - assert(msg); - u_int len = sizeof(int) + // time - strlen(msg); // string body diff --git a/games/xevil/files/patch-cmn__xetp.h b/games/xevil/files/patch-cmn__xetp.h deleted file mode 100644 index bfae80558cac..000000000000 --- a/games/xevil/files/patch-cmn__xetp.h +++ /dev/null @@ -1,14 +0,0 @@ ---- cmn/xetp.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/xetp.h 2012-05-27 06:53:11.000000000 +0900 -@@ -83,9 +83,9 @@ - static void send_rooms_known(OutStreamP,const Rooms &, - int worldVersion,Boolean *map); - -- static void send_message(OutStreamP,char *msg); -+ static void send_message(OutStreamP,const char *msg); - -- static void send_arena_message(OutStreamP,int timeMS,char *msg); -+ static void send_arena_message(OutStreamP,int timeMS,const char *msg); - - static void send_command(OutStreamP,const IntelId &,ITcommand); - diff --git a/games/xevil/files/patch-cmn__xetp_basic.cpp b/games/xevil/files/patch-cmn__xetp_basic.cpp deleted file mode 100644 index e8f5531bf2be..000000000000 --- a/games/xevil/files/patch-cmn__xetp_basic.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- cmn/xetp_basic.cpp.orig 2012-05-27 06:52:30.000000000 +0900 -+++ cmn/xetp_basic.cpp 2012-05-27 06:53:11.000000000 +0900 -@@ -33,7 +33,7 @@ - #include "xetp_basic.h" - - --char *XETPBasic::versionStr = "XETP1.00"; -+const char *XETPBasic::versionStr = "XETP1.00"; - // 0.10 released with special RedHat version - // 0.12 for 2.0b5 - // 0.15 for 2.0b6 diff --git a/games/xevil/files/patch-cmn__xetp_basic.h b/games/xevil/files/patch-cmn__xetp_basic.h deleted file mode 100644 index cee9cd279af9..000000000000 --- a/games/xevil/files/patch-cmn__xetp_basic.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cmn/xetp_basic.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ cmn/xetp_basic.h 2012-05-27 06:53:11.000000000 +0900 -@@ -52,7 +52,7 @@ - // All values are big-endian - enum {HEADER_LENGTH = 3}; // 8 - enum {VERSION_LENGTH = 8}; // streams.h depends on this value. -- static char *versionStr; -+ static const char *versionStr; - - // The ':' syntax gives the size in bytes of each component. :String means - // use Utils::string_read(), Utils::string_write(), etc. diff --git a/games/xevil/files/patch-config.mk b/games/xevil/files/patch-config.mk deleted file mode 100644 index a786c4ed1900..000000000000 --- a/games/xevil/files/patch-config.mk +++ /dev/null @@ -1,35 +0,0 @@ ---- config.mk.orig Sun Mar 23 00:08:58 2003 -+++ config.mk Fri Nov 24 15:44:19 2006 -@@ -34,7 +34,7 @@ - # You can add -DNDEBUG to speed up a release build by removing the assert() - # calls. But, on a really obscure Linux machine, this caused Xlib to blow up - # internally, so you do so at your own risk. --DEBUG_OPT = -O #-DNDEBUG -+DEBUG_OPT = -DNDEBUG - - LINK_OPT = - -@@ -83,7 +83,9 @@ - #### Attempt to guesss the host architecture using the HOSTYPE and hostype - # variables. Then call self with the architecture name. - default: -- @if [ $${HOSTTYPE-bob} != bob ] ; then \ -+ @if [ $${OPSYS-bob} != bob ]; then \ -+ archit=$$OPSYS ; \ -+ elif [ $${HOSTTYPE-bob} != bob ] ; then \ - archit=$$HOSTTYPE ; \ - elif [ $${hosttype-bob} != bob ] ; then \ - archit=$$hosttype ; \ -@@ -161,9 +163,9 @@ - # The -DMSEC_PER_CLOCK=8 is kind of a hack, take it out if the game speed of - # XEvil is all screwed up. - freebsd: -- @$(MAKE) CC="c++" \ --CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8 -DUNAME_USR_BIN" \ --INCL_DIRS="-I/usr/X11R6/include" LIBS_DIRS="-L/usr/X11R6/lib" \ -+ @$(MAKE) CC="${CXX}" \ -+CFLAGS="-DUSE_RANDOM -DUSE_UINT_NET_LENGTH -DUNAME_USR_BIN ${CXXFLAGS}" \ -+INCL_DIRS="-I$(LOCALBASE)/include" LIBS_DIRS="-L$(LOCALBASE)/lib" \ - OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \ - LIBS="-lXpm -lX11 -lm" $(TARGETS) - diff --git a/games/xevil/files/patch-makefile b/games/xevil/files/patch-makefile deleted file mode 100644 index ee41a1647319..000000000000 --- a/games/xevil/files/patch-makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- makefile.orig 2012-05-27 06:39:04.000000000 +0900 -+++ makefile 2012-05-27 06:42:04.000000000 +0900 -@@ -42,9 +42,9 @@ - $(OBJ_DIR)/ui_cmn.o $(OBJ_DIR)/l_agreement_dlg.o $(OBJ_DIR)/viewport.o - - --xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z -+#xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z - #xevil: $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z --#xevil: $(OBJ_DIR)/xevil -+xevil: $(OBJ_DIR)/xevil - - - # Build the xevil executable. -@@ -59,15 +59,9 @@ - cd $(DEPTH)/cmn; $(MAKE) - cd $(DEPTH)/x11; $(MAKE) - $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/xevil $(ALL_OBJS) $(LIBS) -- $(STRIP) $(OBJ_DIR)/xevil - - # Could also include serverping in the distribution - $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z:: -- cp readme.txt $(OBJ_DIR) -- cp gpl.txt $(OBJ_DIR) -- cp -r instructions $(OBJ_DIR) -- (cd $(OBJ_DIR); tar cf xevil$(VERSION).$(PCKG_NAME).tar xevil readme.txt gpl.txt instructions) -- (cd $(OBJ_DIR); $(COMPRESS) -f xevil$(VERSION).$(PCKG_NAME).tar) - - ## Make a distribution file. - #dist: diff --git a/games/xevil/files/patch-x11__draw.cpp b/games/xevil/files/patch-x11__draw.cpp deleted file mode 100644 index 816c5aabb9cc..000000000000 --- a/games/xevil/files/patch-x11__draw.cpp +++ /dev/null @@ -1,100 +0,0 @@ ---- x11/draw.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ x11/draw.cpp 2012-05-27 06:52:59.000000000 +0900 -@@ -34,6 +34,7 @@ - // in Xvars instead. - #include "viewport.h" - -+using namespace std; - - - // Draw functions for World -@@ -327,7 +328,7 @@ - Boolean val = - xvars.load_pixmap(&xdata.blockPixmaps[dpyNum][n], - mask,dpyNum, -- (char**)blocksBits[n]); -+ (const char**)blocksBits[n]); - if (!val) { - cerr << "Failed to load block " << n << endl; - } -@@ -352,7 +353,7 @@ - Boolean val = - xvars.load_pixmap(&xdata.posterPixmaps[dpyNum][n], - &xdata.posterMasks[dpyNum][n], -- dpyNum,(char**)posters[n].id); -+ dpyNum,(const char**)posters[n].id); - if (!val) { - cerr << "Failed to load poster " << n << endl; - } -@@ -363,7 +364,7 @@ - for (n = 0; n < W_ALL_DOORS_NUM; n++) { - Boolean val = - xvars.load_pixmap(&xdata.doorPixmaps[dpyNum][n],NULL,dpyNum, -- (char**)doorPixmapBits[n]); -+ (const char**)doorPixmapBits[n]); - if (!val) { - cerr << "Failed to load door block " << n << endl; - } -@@ -376,7 +377,7 @@ - xvars.load_pixmap(&xdata.moverSquarePixmaps[dpyNum][n], - &xdata.moverSquareMasks[dpyNum][n], - dpyNum, -- (char**)moverSquarePixmapBits[n]); -+ (const char**)moverSquarePixmapBits[n]); - if (!val) { - cerr << "Failed to mover square " << n << endl; - } -@@ -400,7 +401,7 @@ - xvars.load_pixmap(&xdata.moverPixmaps[dpyNum][n], - &xdata.moverMasks[dpyNum][n], - dpyNum, -- (char**)moverPixmapBits[n]); -+ (const char**)moverPixmapBits[n]); - if (!val) { - cerr << "Failed to load mover " << n << endl; - } -@@ -411,7 +412,7 @@ - for (n = 0; n < W_ALL_BACKGROUNDS_NUM; n++) { - Boolean val = - xvars.load_pixmap(&xdata.backgroundPixmaps[dpyNum][n],NULL,dpyNum, -- (char**)backgrounds[n].id); -+ (const char**)backgrounds[n].id); - if (!val) { - cerr << "Failed to load background " << n << endl; - } -@@ -422,7 +423,7 @@ - for (n = 0; n < W_ALL_OUTSIDES_NUM; n++) { - Boolean val = - xvars.load_pixmap(&xdata.outsidePixmaps[dpyNum][n],NULL,dpyNum, -- (char**)outsides[n].id); -+ (const char**)outsides[n].id); - if (!val) { - cerr << "Failed to load outside " << n << endl; - } -@@ -689,7 +690,7 @@ - assert(tickPixmapBits[tt][hp] != PH_AUTO_GEN); - xvars.load_pixmap(&xdata.tickPixmaps[dpyNum][tt][hp], - &xdata.tickMasks[dpyNum][tt][hp], -- dpyNum,(char**)tickPixmapBits[tt][hp]); -+ dpyNum,(const char**)tickPixmapBits[tt][hp]); - } - } - } -@@ -1020,7 +1021,7 @@ - for (dpyNum = 0; dpyNum < xvars.dpyMax; dpyNum++) { - Boolean val = xvars.load_pixmap(&xdata.pixmap[dpyNum], - &xdata.mask[dpyNum], -- dpyNum,(char**)fireBits); -+ dpyNum,(const char**)fireBits); - if (!val) { - cerr << "Failed to load fire graphics." << endl; - } -@@ -1292,7 +1293,7 @@ - Boolean val = - xvars.load_pixmap(&movingXdata.pixmaps[dpyNum][n][m], - &movingXdata.masks[dpyNum][n][m], -- dpyNum,(char**)mc.pixmapBits[n][m]); -+ dpyNum,(const char**)mc.pixmapBits[n][m]); - if (!val) { - cerr << "load_pixmap() failed for " - << mc.physicalContext.className diff --git a/games/xevil/files/patch-x11__l_agreement_dlg.cpp b/games/xevil/files/patch-x11__l_agreement_dlg.cpp deleted file mode 100644 index be702d9a002b..000000000000 --- a/games/xevil/files/patch-x11__l_agreement_dlg.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- x11/l_agreement_dlg.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ x11/l_agreement_dlg.cpp 2012-05-27 06:52:59.000000000 +0900 -@@ -31,7 +31,6 @@ - #include <X11/Xatom.h> - } - --#include <strstream.h> - - #include "xdata.h" - #include "panel.h" diff --git a/games/xevil/files/patch-x11__main.cpp b/games/xevil/files/patch-x11__main.cpp deleted file mode 100644 index d80655e1b7c1..000000000000 --- a/games/xevil/files/patch-x11__main.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- x11/main.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ x11/main.cpp 2012-05-27 06:52:58.000000000 +0900 -@@ -25,6 +25,7 @@ - #include "utils.h" - - extern "C" { -+#include <stdlib.h> - #include <X11/Xutil.h> - - #ifdef OPENWOUND_XOS_STRLEN_HACK -@@ -33,13 +34,13 @@ - #include <X11/Xos.h> - } - --#include <iostream.h> -+#include <iostream> - - #include "utils.h" - #include "neth.h" - #include "game.h" - -- -+GameP g_game; - - class TurnStarter: public ITurnStarter { - public: -@@ -68,6 +69,7 @@ - Utils::seed_random(); - - GameP game = new Game(&argc,argv); -+ g_game = game; - - // assert (clock() != -1); - diff --git a/games/xevil/files/patch-x11__panel.cpp b/games/xevil/files/patch-x11__panel.cpp deleted file mode 100644 index f75f23f74adb..000000000000 --- a/games/xevil/files/patch-x11__panel.cpp +++ /dev/null @@ -1,52 +0,0 @@ ---- x11/panel.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ x11/panel.cpp 2012-05-27 06:52:58.000000000 +0900 -@@ -31,13 +31,14 @@ - #include <X11/Xutil.h> - #include <X11/keysym.h> - } --#include <iostream.h> --#include <strstream.h> -+#include <iostream> -+#include <sstream> - - #include "utils.h" - #include "xdata.h" - #include "panel.h" - -+using namespace std; - - #define PANEL_BORDER 1 - #define PANEL_MARGAIN 2 -@@ -311,15 +312,14 @@ - - - void WritePanel::update_message() { -- ostrstream tmp; -+ stringstream tmp; - if (active) { -- tmp << prompt << value << "_" << ends; -+ tmp << prompt << value << "_"; - } - else { -- tmp << prompt << value << ends; -+ tmp << prompt << value; - } -- set_message(tmp.str()); -- delete tmp.str(); -+ set_message(tmp.str().c_str()); - } - - -@@ -524,9 +524,8 @@ - return; - } - -- ostrstream tmp; -- tmp << "CHAT <<" << value << "\nEnter to send, Esc to cancel." << ends; -- TextPanel::set_message(tmp.str()); -- delete tmp.str(); -+ stringstream tmp; -+ tmp << "CHAT <<" << value << "\nEnter to send, Esc to cancel."; -+ TextPanel::set_message(tmp.str().c_str()); - } - diff --git a/games/xevil/files/patch-x11__serverping.cpp b/games/xevil/files/patch-x11__serverping.cpp deleted file mode 100644 index b74b7e0f173b..000000000000 --- a/games/xevil/files/patch-x11__serverping.cpp +++ /dev/null @@ -1,113 +0,0 @@ ---- x11/serverping.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ x11/serverping.cpp 2012-05-27 07:12:12.000000000 +0900 -@@ -25,14 +25,15 @@ - // code and should be reasonably easy to compile on Windows. - - --#include <iostream.h> --#include <strstream.h> -+#include <iostream> -+#include <sstream> - #include "utils.h" - #include "streams.h" - #include "xetp_basic.h" - #include "neth.h" - #include "id.h" - -+using namespace std; - - - class ServerPing { -@@ -113,7 +114,7 @@ - - - char* sString = argv[argc - 1]; -- char* port = Utils::strchr(sString,':'); -+ const char* port = Utils::strchr(sString,':'); - // server:port - if (port) { - serverName = new char[port - sString + 1]; -@@ -140,10 +141,9 @@ - error("Error opening client UDP socket."); - } - -- ostrstream str; -- str << "Looking up IP address for server " << serverName << ends; -- message(str.str()); -- delete str.str(); -+ stringstream str; -+ str << "Looking up IP address for server " << serverName; -+ message(str.str().c_str()); - - // Create server address. - memset((void *)&serverAddr,'\0',sizeof(serverAddr)); -@@ -170,11 +170,10 @@ ServerPing::ServerPing(int argc,char** argv) { - client.sin_family = AF_INET; - client.sin_addr.s_addr = htonl(INADDR_ANY); - client.sin_port = htons((u_short)clientPort); -- if (bind(udpSock,(CMN_SOCKADDR *)&client,sizeof(client)) < 0) { -- ostrstream str; -- str << "Could not bind local UDP port " << clientPort << ends; -- error(str.str()); -- delete str.str(); -+ if (::bind(udpSock,(CMN_SOCKADDR *)&client,sizeof(client)) < 0) { -+ stringstream str; -+ str << "Could not bind local UDP port " << clientPort; -+ error(str.str().c_str()); - return; - } - -@@ -197,11 +196,10 @@ - // Send "count" number of SERVER_PINGs. - for (int tries = 0; tries < count; tries++) { - // Send the ping. -- ostrstream msg; -+ stringstream msg; - msg << "Sending XETP::SERVER_PING to " -- << serverName << ':' << serverPort << ends; -- message(msg.str()); -- delete msg.str(); -+ << serverName << ':' << serverPort; -+ message(msg.str().c_str()); - XETPBasic::send_server_ping(udpOut); - // Don't buffer the ping. - udpOut->flush(); -@@ -248,11 +246,10 @@ - } - - // If we get here, we failed to reach the server. -- ostrstream msg; -+ stringstream msg; - msg << "No return from " << serverName << ':' << serverPort << " after " -- << count << " tries." << ends; -- error(msg.str()); -- delete msg.str(); -+ << count << " tries."; -+ error(msg.str().c_str()); - } - - -@@ -271,12 +268,9 @@ - - - void ServerPing::error(const char* msg1,const char* msg2) { -- ostrstream str; -- str << msg1 << msg2 << ends; -- error(str.str()); -- -- // Will never get here, but WTF. -- delete str.str(); -+ stringstream str; -+ str << msg1 << msg2; -+ error(str.str().c_str()); - } - - -@@ -355,6 +349,7 @@ - - - -+int - main(int argc,char** argv) { - ServerPing ping(argc,argv); - ping.go(); diff --git a/games/xevil/files/patch-x11__ui.cpp b/games/xevil/files/patch-x11__ui.cpp deleted file mode 100644 index ab83dec24000..000000000000 --- a/games/xevil/files/patch-x11__ui.cpp +++ /dev/null @@ -1,377 +0,0 @@ ---- x11/ui.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ x11/ui.cpp 2012-05-27 06:52:59.000000000 +0900 -@@ -30,6 +30,7 @@ - #include "utils.h" - extern "C" { - #include <string.h> -+#include <stdlib.h> - #include <X11/Xutil.h> - #ifdef OPENWOUND_XOS_STRLEN_HACK - #define _strings_h -@@ -40,8 +41,8 @@ - #include <X11/Xatom.h> - } - --#include <iostream.h> --#include <strstream.h> -+#include <iostream> -+#include <sstream> - - #include "coord.h" - #include "area.h" -@@ -59,6 +60,7 @@ - #include "panel.h" - #include "viewport.h" - -+using namespace std; - - // Defines - #define DEFAULT_BIG_FONT_NAME "-*-helvetica-*-r-*-*-18-*-*-*-*-*-*-*" -@@ -226,20 +228,6 @@ - for (int d = 0; d < xvars.dpyMax; d++) { - xvars.alloc_named_color(d,"steelblue"); - } -- -- // Run the license agreement. -- // Note: The license agreement will not be run if the user runs -- // "xevil -server -no_ui". -- // Must be after init_x(). -- Boolean reduceDraw = Viewport::get_reduce_draw(); -- Boolean accepted = -- LAgreement::check_accepted(largeViewport,smoothScroll,reduceDraw, -- xvars,0,argc,argv); -- Viewport::set_reduce_draw(reduceDraw); -- if (!accepted) { -- // Should probably let game.cpp call exit. -- exit(1); -- } - - // Ick, this should be in init_x(), but we need to call init_x() before - // running the License Agreement to get this information. -@@ -461,21 +449,27 @@ - } - } - -- if (down) { -- // Restart game if space pressed. -- // This doesn't always work, the otherInput flag might get cleared -- // before it is used. -- if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_space)) { -- otherInput = True; -+ // If function keys are assigned to movement, weapon or item functions, -+ // then this code will not get executed. -+ if (down && !found) { -+ // Pause Game -+ if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F1)) { -+ settingsChanges |= UIpause; -+ settings.pause = True; - } -- -- if (!found) { -- // Undocumented pause key feature. -- // Don't do pause if XK_F1 is used for something else. -- if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F1)) { -- settingsChanges |= UIpause; -- settings.pause = True; -- } -+ // New Game -+ if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F2)) { -+ settingsChanges |= UInewGame; -+ } -+ // Change game style -+ if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F3)) { -+ settingsChanges |= UIstyle; -+ settings.style = (settings.style + 1) % NUM_GAME_STYLES; -+ -+ // Avoid the LEVELS_ONLY option. There was no button before -+ // I got here. Avoiding the ability to set it until I -+ // discover why -+ settings.style += (settings.style == LEVELS_ONLY) ? 1 : 0; - } - } - } -@@ -865,7 +859,7 @@ - char *msg; - if (msg = locator->message_deq()) { - set_message(msg); -- delete msg; -+ delete [] msg; - messageTimer.set(MESSAGE_TIME); - } - } -@@ -930,7 +924,7 @@ - UiP ui = (UiP)closure; - ui->settingsChanges |= UIenemiesRefill; - // SGI compiler says you can't cast void* to Boolean. -- Boolean val = (Boolean)(int)value; -+ Boolean val = (Boolean)(long)value; - ui->settings.enemiesRefill = val; - } - -@@ -939,7 +933,7 @@ - void Ui::menu_controls_CB(void* value,Viewport* vPort,void* closure) { - UiP ui = (UiP)closure; - int dpyNum = vPort->get_dpy_num(); -- Boolean val = (Boolean)(int)value; -+ Boolean val = (Boolean)(long)value; - if (val) { - XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.controls[dpyNum]); - } -@@ -955,13 +949,13 @@ - Viewport* vPort,void* closure) { - UiP ui = (UiP)closure; - int dpyNum = vPort->get_dpy_num(); -- Boolean active = (Boolean)(int)value; -+ Boolean active = (Boolean)(long)value; - - if (active) { - ui->lControls[dpyNum].input = ui->lControls[dpyNum].key = - ui->lControls[dpyNum].which = 0; - -- ostrstream str; -+ stringstream str; - str << "There are 2 sets of controls for the players on the right and" - << "\n" - << "left sides of the keyboard, respectively." << "\n" -@@ -979,10 +973,9 @@ - << " player enter the " - << (ui->lControls[dpyNum].which ? "second" : "first") - << " key for <" << ui->keysNames[ui->lControls[dpyNum].key] -- << ">." << ends; -+ << ">."; - -- ui->learnControls[dpyNum]->set_message(str.str()); -- delete str.str(); -+ ui->learnControls[dpyNum]->set_message(str.str().c_str()); - XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.learnControls[dpyNum]); - } - else { -@@ -994,7 +987,7 @@ - - void Ui::menu_scenarios_CB(void* value,Viewport*,void* closure) { - UiP ui = (UiP)closure; -- Boolean val = (Boolean)(int)value; -+ Boolean val = (Boolean)(long)value; - if (val) { - ui->settingsChanges |= UIstyle; - ui->settings.style = SCENARIOS; -@@ -1005,7 +998,7 @@ - - void Ui::menu_levels_CB(void* value,Viewport*,void* closure) { - UiP ui = (UiP)closure; -- Boolean val = (Boolean)(int)value; -+ Boolean val = (Boolean)(long)value; - if (val) { - ui->settingsChanges |= UIstyle; - ui->settings.style = LEVELS; -@@ -1016,7 +1009,7 @@ - - void Ui::menu_kill_CB(void* value,Viewport*,void* closure) { - UiP ui = (UiP)closure; -- Boolean val = (Boolean)(int)value; -+ Boolean val = (Boolean)(long)value; - if (val) { - ui->settingsChanges |= UIstyle; - ui->settings.style = KILL; -@@ -1027,7 +1020,7 @@ - - void Ui::menu_duel_CB(void* value,Viewport*,void* closure) { - UiP ui = (UiP)closure; -- Boolean val = (Boolean)(int)value; -+ Boolean val = (Boolean)(long)value; - if (val) { - ui->settingsChanges |= UIstyle; - ui->settings.style = DUEL; -@@ -1038,7 +1031,7 @@ - - void Ui::menu_extended_CB(void* value,Viewport*,void* closure) { - UiP ui = (UiP)closure; -- Boolean val = (Boolean)(int)value; -+ Boolean val = (Boolean)(long)value; - if (val) { - ui->settingsChanges |= UIstyle; - ui->settings.style = EXTENDED; -@@ -1049,7 +1042,7 @@ - - void Ui::menu_training_CB(void* value,Viewport*,void* closure) { - UiP ui = (UiP)closure; -- Boolean val = (Boolean)(int)value; -+ Boolean val = (Boolean)(long)value; - if (val) { - ui->settingsChanges |= UIstyle; - ui->settings.style = TRAINING; -@@ -1070,7 +1063,7 @@ - void Ui::menu_cooperative_CB(void* value,Viewport*,void* closure) { - UiP ui = (UiP)closure; - ui->settingsChanges |= UIcooperative; -- Boolean val = (Boolean)(int)value; -+ Boolean val = (Boolean)(long)value; - ui->settings.cooperative = val; - } - -@@ -1079,7 +1072,7 @@ - void Ui::menu_help_CB(void* value,Viewport* vPort,void* closure) { - UiP ui = (UiP)closure; - int dpyNum = vPort->get_dpy_num(); -- Boolean active = (Boolean)(int)value; -+ Boolean active = (Boolean)(long)value; - - if (active) { - XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.help[dpyNum]); -@@ -1094,7 +1087,7 @@ - void Ui::status_weapon_CB(void* value,Viewport* vPort,void*) { - // Some mouse controls. - // UiP ui = (UiP)closure; -- int button = (int)value; -+ long button = (long)value; - - switch (button) { - case Button1: -@@ -1113,7 +1106,7 @@ - - void Ui::status_item_CB(void* value,Viewport* vPort,void*) { - // UiP ui = (UiP)closure; -- int button = (int)value; -+ long button = (long)value; - - switch (button) { - case Button1: -@@ -1167,14 +1160,14 @@ - return; - } - -- ostrstream str; -+ stringstream str; - str << (ui->lControls[dpyNum].input ? "Left" : "Right") - << " player: The " - << (ui->lControls[dpyNum].which ? "second" : "first") << " key for <" - << ui->keysNames[ui->lControls[dpyNum].key] << "> is " - << XKeysymToString(XKeycodeToKeysym(ui->xvars.dpy[dpyNum], - event->xkey.keycode,0)) -- << "." << "\n" << "\n"; -+ << ".\n\n"; - ui->keycodes[dpyNum][ui->lControls[dpyNum].input] - [ui->lControls[dpyNum].key][ui->lControls[dpyNum].which] = - event->xkey.keycode; -@@ -1222,21 +1215,18 @@ - << " player enter the " - << (ui->lControls[dpyNum].which ? "second" : "first") - << " key for <" << keysNames[ui->lControls[dpyNum].key] -- << ">." << ends; -+ << ">."; - - // Add message in front of str.str(). -- ostrstream fullStr; -+ stringstream fullStr; - if (ui->lControls[dpyNum].input == UI_KEYS_LEFT) { - fullStr << "You may dismiss this dialog now if you only want to" << "\n" -- << "set the controls for one player." -- << "\n" << "\n"; -+ << "set the controls for one player.\n\n"; - } -- fullStr << str.str() << ends; -- delete str.str(); -+ fullStr << str.str(); - - -- ui->learnControls[dpyNum]->set_message(fullStr.str()); -- delete fullStr.str(); -+ ui->learnControls[dpyNum]->set_message(fullStr.str().c_str()); - - ui->controls_redraw(dpyNum); - } -@@ -1537,7 +1527,7 @@ - Line::set_text_columns(HELP_COLS); - Page page(NULL,helpMessage); - const PtrList& lines = page.get_lines(); -- ostrstream message; -+ stringstream message; - for (int n = 0; n < lines.length(); n++) { - Line* line = (Line*)lines.get(n); - char* text = line->alloc_text(); -@@ -1545,7 +1535,6 @@ - message << text << '\n'; - delete [] text; - } -- message << ends; - - - for (int dpyNum = 0; dpyNum < xvars.dpyMax; dpyNum++) { -@@ -1564,10 +1553,8 @@ - new TextPanel(dpyNum,xvars,xdata.help[dpyNum],pos,size); - assert(help[dpyNum]); - -- help[dpyNum]->set_message(message.str()); -+ help[dpyNum]->set_message(message.str().c_str()); - } // dpyNum -- -- delete message.str(); - } - - -@@ -1621,7 +1608,7 @@ - // Loop through all keys. - for (int n = 0; n < UI_KEYS_MAX; n++) { - // String for right side. -- strstream str0; -+ stringstream str0; - str0 << keysNames[n] << ": " << XKeysymToString(keymaps[0][n][0][0]); - if (keymaps[0][n][0][1] && strlen(XKeysymToString(keymaps[0][n][0][1]))) - str0 << ", " << XKeysymToString(keymaps[0][n][0][1]); -@@ -1631,10 +1618,9 @@ - && strlen(XKeysymToString(keymaps[0][n][1][1]))) - str0 << ", " << XKeysymToString(keymaps[0][n][1][1]); - } -- str0 << ends; - - // String for left side. -- strstream str1; -+ stringstream str1; - str1 << keysNames[n] << ": " << XKeysymToString(keymaps[1][n][0][0]); - if (keymaps[1][n][0][1] && strlen(XKeysymToString(keymaps[1][n][0][1]))) { - str1 << ", " << XKeysymToString(keymaps[1][n][0][1]); -@@ -1645,7 +1631,6 @@ - && strlen(XKeysymToString(keymaps[1][n][1][1]))) - str1 << ", " << XKeysymToString(keymaps[1][n][1][1]); - } -- str1 << ends; - - // Draw key on left side. - if (n != IT_CHAT) { // Chat meaningless for left player. -@@ -1653,16 +1638,14 @@ - xvars.fontSize[dpyNum].width, - xvars.font[dpyNum]->max_bounds.ascent - + p * xvars.fontSize[dpyNum].height, -- str1.str(),strlen(str1.str())); -+ str1.str().c_str(),str1.str().length()); - } - // Draw on right side. - XDrawString(xvars.dpy[dpyNum],xdata.controls[dpyNum],xvars.gc[dpyNum], - xvars.fontSize[dpyNum].width * (CONTROLS_COLS / 2 + 1), - xvars.font[dpyNum]->max_bounds.ascent - + (p++) * xvars.fontSize[dpyNum].height, -- str0.str(),strlen(str0.str())); -- delete str0.str(); -- delete str1.str(); -+ str0.str().c_str(),str0.str().length()); - } - p++; - -@@ -1693,7 +1676,7 @@ - - - --char *Ui::keysNames[UI_KEYS_MAX] = { -+const char *Ui::keysNames[UI_KEYS_MAX] = { - "center", - "right", - "down_right", -@@ -1752,7 +1735,7 @@ - - - --char* Ui::helpMessage = -+const char* Ui::helpMessage = - "For full instructions, including NETWORK PLAY, see " - "http://www.xevil.com/docs/instructions.html\n" - "\n" diff --git a/games/xevil/files/patch-x11__ui.h b/games/xevil/files/patch-x11__ui.h deleted file mode 100644 index 3e170cf8a198..000000000000 --- a/games/xevil/files/patch-x11__ui.h +++ /dev/null @@ -1,20 +0,0 @@ ---- x11/ui.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ x11/ui.h 2012-05-27 06:52:59.000000000 +0900 -@@ -338,7 +338,7 @@ - - - // Variables. -- static char *keysNames[UI_KEYS_MAX]; -+ static const char *keysNames[UI_KEYS_MAX]; - - char **argv; // Warning: Exposing the rep. - int argc; -@@ -402,7 +402,7 @@ - // The callbacks to export to the Viewport. - static ViewportCallback viewportCallbacks[VIEWPORT_CB_NUM]; - -- static char* helpMessage; -+ static const char* helpMessage; - }; - - #endif diff --git a/games/xevil/files/patch-x11__viewport.cpp b/games/xevil/files/patch-x11__viewport.cpp deleted file mode 100644 index 774b267e3e00..000000000000 --- a/games/xevil/files/patch-x11__viewport.cpp +++ /dev/null @@ -1,294 +0,0 @@ ---- x11/viewport.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ x11/viewport.cpp 2012-05-27 06:52:59.000000000 +0900 -@@ -44,8 +44,9 @@ - #include <X11/Xos.h> - #include <X11/keysym.h> - } --#include <strstream.h> -+#include <sstream> - -+using namespace std; - - #define TICK_BORDER_WIDTH 5 // border width big enough for a tick mark. - #define TICK_WIDTH 3 -@@ -60,14 +61,14 @@ - #define COL_SHIFT 4 - - // Number of characters across for each menu button. --#define QUIT_LINE_LENGTH 5 --#define NEW_GAME_LINE_LENGTH 9 -+#define QUIT_LINE_LENGTH 4 -+#define NEW_GAME_LINE_LENGTH 13 - #define HUMANS_NUM_LINE_LENGTH 9 - #define ENEMIES_NUM_LINE_LENGTH 11 - #define ENEMIES_REFILL_LINE_LENGTH 13 - #define CONTROLS_LINE_LENGTH 13 - #define LEARN_CONTROLS_LINE_LENGTH 12 --#define STYLE_LINE_LENGTH 11 -+#define STYLE_LINE_LENGTH 16 - #define SCENARIOS_LINE_LENGTH 9 - #define LEVELS_LINE_LENGTH 6 - #define KILL_LINE_LENGTH 16 -@@ -1056,20 +1057,18 @@ - - void Viewport::set_menu_humans_num(int val) { - assert(menusNum > menuHumansNum); -- ostrstream str; -- str << val << ends; -- ((WritePanel *)menus[menuHumansNum])->set_value(str.str()); -- delete str.str(); -+ stringstream str; -+ str << val; -+ ((WritePanel *)menus[menuHumansNum])->set_value(str.str().c_str()); - } - - - - void Viewport::set_menu_enemies_num(int val) { - assert(menusNum > menuEnemiesNum); -- ostrstream str; -- str << val << ends; -- ((WritePanel *)menus[menuEnemiesNum])->set_value(str.str()); -- delete str.str(); -+ stringstream str; -+ str << val; -+ ((WritePanel *)menus[menuEnemiesNum])->set_value(str.str().c_str()); - } - - -@@ -1128,10 +1127,9 @@ - - void Viewport::set_quanta(Quanta quanta) { - assert(menusNum > menuQuanta); -- ostrstream str; -- str << quanta << ends; -- ((WritePanel *)menus[menuQuanta])->set_value(str.str()); -- delete str.str(); -+ stringstream str; -+ str << quanta; -+ ((WritePanel *)menus[menuQuanta])->set_value(str.str().c_str()); - } - - -@@ -1144,33 +1142,27 @@ - - - void Viewport::set_humans_playing(int val) { -- ostrstream msg; -+ stringstream msg; - if (val == 1) { -- msg << "1 Human" << ends; -+ msg << "1 Human"; - } - else { -- msg << val << " Humans" << ends; -+ msg << val << " Humans"; - } -- char *msg_str = msg.str(); -- -- humansPlaying->set_message(msg_str); -- delete msg_str; -+ humansPlaying->set_message(msg.str().c_str()); - } - - - - void Viewport::set_enemies_playing(int val) { -- ostrstream msg; -+ stringstream msg; - if (val == 1) { -- msg << "1 Enemy" << ends; -+ msg << "1 Enemy"; - } - else { -- msg << val << " Enemies" << ends; -+ msg << val << " Enemies"; - } -- char *msg_str = msg.str(); -- -- enemiesPlaying->set_message(msg_str); -- delete msg_str; -+ enemiesPlaying->set_message(msg.str().c_str()); - } - - -@@ -1632,7 +1624,7 @@ - // Would be much better to put the radio-button logic in the Panel classes. - if (pClosure->radio) { - // SGI compiler says you can't cast void* to Boolean. -- Boolean bValue = (Boolean)(int)value; -+ Boolean bValue = (Boolean)(long)value; - if (!bValue) { - ((TogglePanel*)panel)->set_value(True); - } -@@ -1701,7 +1693,7 @@ - pos.y += xvars.fontSize[dpyNum].height; - - for (int n = 0; n < DIFFICULTY_LEVELS_NUM; n++) { -- ostrstream str; -+ stringstream str; - str << "[" << n; - if (n == DIFF_NORMAL) { - str << ",space] "; -@@ -1709,10 +1701,9 @@ - else { - str << "] "; - } -- str << difficultyLevels[n].name << ends; -+ str << difficultyLevels[n].name; - pos.y += xvars.fontSize[dpyNum].height; -- draw_string(pos,str.str()); -- delete str.str(); -+ draw_string(pos,str.str().c_str()); - } - - XSetForeground(xvars.dpy[dpyNum],xvars.gc[dpyNum], -@@ -1733,7 +1724,7 @@ - - - --void Viewport::draw_string(const Pos &pos,char *msg) { -+void Viewport::draw_string(const Pos &pos,const char *msg) { - XDrawString(xvars.dpy[dpyNum],arena, - xvars.gc[dpyNum], - pos.x,pos.y + xvars.font[dpyNum]->max_bounds.ascent, -@@ -1930,7 +1921,7 @@ - new ButtonPanel(dpyNum,xvars,toplevel, - pos,newGameUnit, - Viewport::panel_callback,panelClosures.get(menuNewGame), -- "New Game"); -+ "New Game (F2)"); - assert(p); - p->set_background(menuBg,False); - pos.x += newGameUnit.width; -@@ -2016,7 +2007,7 @@ - new TextPanel(dpyNum,xvars,toplevel, - pos,styleUnit, - NULL,NULL, -- "Game style:"); -+ "Game style: (F3)"); - assert(p); - // p->set_background(menuBg,False); - pos.x += styleUnit.width; -@@ -2194,33 +2185,24 @@ - } - - const IntelStatus *status = intel->get_intel_status(); -+ statuses[statusName]->set_message(status->name); -+ -+ statuses[statusClassName]->set_message(status->className); - -- ostrstream name; -- name << status->name << ends; -- statuses[statusName]->set_message(name.str()); -- delete name.str(); -- -- ostrstream className; -- className << status->className << ends; -- statuses[statusClassName]->set_message(className.str()); -- delete className.str(); -- -- ostrstream health; -+ stringstream health; - if (status->health == -1) { -- health << "Dead" << ends; -+ health << "Dead"; - } - else { -- health << status->health << " Health" << ends; -+ health << status->health << " Health"; - } -- statuses[statusHealth]->set_message(health.str()); -- delete health.str(); -+ statuses[statusHealth]->set_message(health.str().c_str()); - -- ostrstream mass; -- mass << status->mass << " Mass" << ends; -- statuses[statusMass]->set_message(mass.str()); -- delete mass.str(); -+ stringstream mass; -+ mass << status->mass << " Mass"; -+ statuses[statusMass]->set_message(mass.str().c_str()); - -- ostrstream weapon; -+ stringstream weapon; - if (status->weaponClassId == A_None) { - weapon << "No Weapon"; - } -@@ -2230,62 +2212,56 @@ - if (status->ammo != PH_AMMO_UNLIMITED) { - weapon << " (" << status->ammo << ")"; - } -- weapon << ends; - statuses[statusWeapon]-> - set_foreground(status->weaponReady ? - xvars.green[dpyNum] : xvars.red[dpyNum],False); -- statuses[statusWeapon]->set_message(weapon.str()); -- delete weapon.str(); -+ statuses[statusWeapon]->set_message(weapon.str().c_str()); - -- ostrstream item; -+ stringstream item; - if (status->itemClassId == A_None) { - item << "No Item"; - } - else { - item << status->item << " (" << status->itemCount << ")"; - } -- item << ends; -- statuses[statusItem]->set_message(item.str()); -- delete item.str(); -+ statuses[statusItem]->set_message(item.str().c_str()); - -- ostrstream livesHKills; -+ stringstream livesHKills; - if (styleInfo->get_game_style_type() == EXTENDED) { - // Takes soups into account. - livesHKills << (status->humanKills - status->soups) -- << " Human Kills" << ends; -+ << " Human Kills"; - } - else { - if (status->lives == IT_INFINITE_LIVES) { - // Does this case ever happen? I don't think so. -- livesHKills << "Unlimited Lives" << ends; -+ livesHKills << "Unlimited Lives"; - } - else { - if (status->lives == 1) { -- livesHKills << "1 Life" << ends; -+ livesHKills << "1 Life"; - } - else { -- livesHKills << status->lives << " Lives" << ends; -+ livesHKills << status->lives << " Lives"; - } - } - } -- statuses[statusLivesHKills]->set_message(livesHKills.str()); -- delete livesHKills.str(); -+ statuses[statusLivesHKills]->set_message(livesHKills.str().c_str()); - -- ostrstream killsMKills; -+ stringstream killsMKills; - if (styleInfo->get_game_style_type() == EXTENDED) { -- killsMKills << status->enemyKills << " Machine Kills" << ends; -+ killsMKills << status->enemyKills << " Machine Kills"; - } - else { - int kills = status->humanKills + status->enemyKills; - if (kills == 1) { -- killsMKills << "1 Kill" << ends; -+ killsMKills << "1 Kill"; - } - else { -- killsMKills << kills << " Kills" << ends; -+ killsMKills << kills << " Kills"; - } - } -- statuses[statusKillsMKills]->set_message(killsMKills.str()); -- delete killsMKills.str(); -+ statuses[statusKillsMKills]->set_message(killsMKills.str().c_str()); - } - - diff --git a/games/xevil/files/patch-x11__viewport.h b/games/xevil/files/patch-x11__viewport.h deleted file mode 100644 index e918e8394a1e..000000000000 --- a/games/xevil/files/patch-x11__viewport.h +++ /dev/null @@ -1,11 +0,0 @@ ---- x11/viewport.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ x11/viewport.h 2012-05-27 06:52:59.000000000 +0900 -@@ -348,7 +348,7 @@ - /* NOTE: Will draw everything if redrawArena is true, else just what has - changed. */ - -- void draw_string(const Pos &pos,char *msg); -+ void draw_string(const Pos &pos,const char *msg); - /* EFFECTS: Draw string msg using current GC on arena with upper left of - character at position pos. */ - diff --git a/games/xevil/files/patch-x11__xdata.cpp b/games/xevil/files/patch-x11__xdata.cpp deleted file mode 100644 index fd1052042688..000000000000 --- a/games/xevil/files/patch-x11__xdata.cpp +++ /dev/null @@ -1,101 +0,0 @@ ---- x11/xdata.cpp.orig 2012-05-27 06:52:29.000000000 +0900 -+++ x11/xdata.cpp 2012-05-27 06:52:59.000000000 +0900 -@@ -1,4 +1,5 @@ - /* -+ * WK - note to self - search for xpmcreate - * XEvil(TM) Copyright (C) 1994,2000 Steve Hardt and Michael Judge - * http://www.xevil.com - * satan@xevil.com -@@ -30,11 +31,12 @@ - #include "xdata.h" - #include "area.h" - --#include <iostream.h> -+#include <iostream> - #include <X11/Xutil.h> - #include <X11/xpm.h> - #include <X11/Xatom.h> - -+using namespace std; - - - // Means always allocate some color, even if it's really, really bad. -@@ -47,9 +49,16 @@ - int dpyNum,const Size& size, - const char* title, - long eventMask) { -+ -+ // Get Size of screen, so we can center Window -+ XWindowAttributes root_window_attributes; -+ XGetWindowAttributes(dpy[dpyNum],root[dpyNum], &root_window_attributes); -+ int left = (root_window_attributes.width - size.width) / 2; -+ int top = (root_window_attributes.height - size.height) / 3; -+ - // Creates with 0 border width. - Window toplevel = -- XCreateSimpleWindow(dpy[dpyNum],root[dpyNum],0,0, -+ XCreateSimpleWindow(dpy[dpyNum],root[dpyNum],left,top, - size.width,size.height, - 0,windowBorder[dpyNum], - windowBg[dpyNum]); -@@ -90,7 +99,9 @@ - - XClassHint class_hints; - class_hints.res_name = argv[0]; -- class_hints.res_class = "XEvil"; -+ -+ static char res_class[] = "XEvil"; -+ class_hints.res_class = res_class; - - XSetWMProperties(dpy[dpyNum],toplevel, - &windowName,&iconName,argv,argc, -@@ -185,14 +196,14 @@ - - - Boolean Xvars::load_pixmap(Drawable* pixmap,Drawable* mask, -- int dpyNum,char** xpmBits) { -+ int dpyNum, const char** xpmBits) { - return load_pixmap(pixmap,mask,dpyNum,xpmBits,is_stretched()); - } - - - - Boolean Xvars::load_pixmap(Drawable* pixmap,Drawable* mask, -- int dpyNum,char** xpmBits,Boolean fullSize) { -+ int dpyNum, const char** xpmBits,Boolean fullSize) { - // Just load XPM as is. - if (fullSize) { - XpmAttributes attr; -@@ -200,9 +211,9 @@ - attr.closeness = XPM_CLOSENESS; - attr.alloc_close_colors = True; - -- int val = -+ int val = - XpmCreatePixmapFromData(dpy[dpyNum],root[dpyNum], -- xpmBits, -+ const_cast<char **> (xpmBits), - pixmap,mask, - &attr); - XpmFreeAttributes(&attr); -@@ -212,7 +223,7 @@ - ret = False; - } - -- return ret; -+ return ret; - } - - -@@ -231,9 +242,8 @@ - - // Perhaps should use XpmReturnAllocPixels, neither gives the transparent - // value. -- int val = -- XpmCreateImageFromData(dpy[dpyNum], -- xpmBits, -+ int val = XpmCreateImageFromData(dpy[dpyNum], -+ const_cast<char **> (xpmBits), - &srcImage,(mask ? &srcMask : (XImage**)NULL), - &attr); - srcSize.width = attr.width; diff --git a/games/xevil/files/patch-x11__xdata.h b/games/xevil/files/patch-x11__xdata.h deleted file mode 100644 index 4b4e40557f1e..000000000000 --- a/games/xevil/files/patch-x11__xdata.h +++ /dev/null @@ -1,28 +0,0 @@ ---- x11/xdata.h.orig 2012-05-27 06:52:31.000000000 +0900 -+++ x11/xdata.h 2012-05-27 06:52:58.000000000 +0900 -@@ -74,7 +74,7 @@ - - typedef XEvent *CMN_EVENTDATA; - --typedef char *CMN_COLOR; -+typedef const char *CMN_COLOR; - - - -@@ -132,14 +132,14 @@ - transformations. Use scratch for all scratch calculations. */ - - Boolean load_pixmap(Drawable* pixmap,Drawable* mask, -- int dpyNum,char** xpmBits); -+ int dpyNum, const char** xpmBits); - /* MODIFIES: pixmap, mask */ - /* EFFECTS: Load an XPM pixmap and mask from xpmBits. Only load mask if - non-NULL. Reduce pixmap size by a factor of 2 if - !xvars.is_stretched(). */ - - Boolean load_pixmap(Drawable* pixmap,Drawable* mask, -- int dpyNum,char** xpmBits,Boolean fullSize); -+ int dpyNum, const char** xpmBits,Boolean fullSize); - /* EFFECTS: Same as above load_pixmap() except caller explicitly - specifies whether pixmap is fullSize or reduced by a factor of 2. */ - /* NOTE: This method can be called before Xvars::stretch is set. */ diff --git a/games/xevil/pkg-descr b/games/xevil/pkg-descr deleted file mode 100644 index b7c7dfce94c1..000000000000 --- a/games/xevil/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -XEvil is a side-view, single or network-multiplayer, fast-action, -kill-everything, game for Windows and UNIX. - -You have sinned in life. Now, you die and go to Hell. XEvil is the -contest that determines your fate in Hell for all eternity. At the -end of a game, you receive one of many possible rankings. A poor -player, for example, may spend the rest of time as "Satan's Earwax -Remover", while a good one might achieve a prestigious title such as -"VP of Hell Marketing" or even "Lead Software Engineer of Hell". - -WWW: http://www.xevil.com/ diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile deleted file mode 100644 index 89a8fd246631..000000000000 --- a/games/xminesweep/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Created by: janek -# $FreeBSD$ - -PORTNAME= xminesweep -PORTVERSION= 3.0 -PORTREVISION= 2 -CATEGORIES= games -MASTER_SITES= http://web.warwick.ac.uk/ftp/pub/x11/ \ - ftp://ftp.netlab.is.tsukuba.ac.jp/pub/X/our_collections/games/ \ - ftp://ftp.uni-halle.de/pub/X11/contrib/games/ \ - ftp://ftp.eunet.ch/software/X/games/ -DISTNAME= ${PORTNAME}${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= X11 minesweeper game - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -USES= imake tar:Z xorg -USE_XORG= x11 xext xmu xaw xt xpm sm ice -PLIST_FILES= bin/xminesweep man/man1/xminesweep.1.gz - -.include <bsd.port.mk> diff --git a/games/xminesweep/distinfo b/games/xminesweep/distinfo deleted file mode 100644 index 3f38ded3051d..000000000000 --- a/games/xminesweep/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xminesweep3.0.tar.Z) = aee3af685e938c26fba7edfceb5aad7ae7c5199e29ae2ba89f40f59df59054fd -SIZE (xminesweep3.0.tar.Z) = 24898 diff --git a/games/xminesweep/pkg-descr b/games/xminesweep/pkg-descr deleted file mode 100644 index 58d6a46a8c55..000000000000 --- a/games/xminesweep/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Xminesweep like Windoze minesweeper game diff --git a/graphics/Makefile b/graphics/Makefile index 94e2b25d627f..f83ce27c8557 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -64,7 +64,6 @@ SUBDIR += aview SUBDIR += avir SUBDIR += azpainter - SUBDIR += backfract SUBDIR += barbecue SUBDIR += barcode SUBDIR += batik diff --git a/graphics/backfract/Makefile b/graphics/backfract/Makefile deleted file mode 100644 index 570b00b03b27..000000000000 --- a/graphics/backfract/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# Created by: Patrick Gardella <patrick@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= backfract -PORTVERSION= 1.1.2 -PORTREVISION= 2 -CATEGORIES= graphics -MASTER_SITES= http://www.igoweb.org/~wms/comp/backfract/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Fractal image animated wallpaper program - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LICENSE= GPLv2+ - -USES= xorg -USE_XORG= x11 -GNU_CONFIGURE= yes -ALL_TARGET= # none -MAKE_JOBS_UNSAFE= yes - -PLIST_FILES= bin/backfract - -post-patch: - @${REINPLACE_CMD} -e \ - "/'-O3'/s|^|#| ; \ - /'-O'/s|^|#| ; \ - s|linux/soundcard.h|sys/soundcard.h|" ${WRKSRC}/configure - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/backfract ${STAGEDIR}${PREFIX}/bin - -.include <bsd.port.mk> diff --git a/graphics/backfract/distinfo b/graphics/backfract/distinfo deleted file mode 100644 index 4af8ebaffcbc..000000000000 --- a/graphics/backfract/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (backfract-1.1.2.tar.gz) = c415be1b9e694c73532de497d7d8a07abb46accfc8b70e51cfdd1072ba8b08f2 -SIZE (backfract-1.1.2.tar.gz) = 53757 diff --git a/graphics/backfract/pkg-descr b/graphics/backfract/pkg-descr deleted file mode 100644 index c95517f69702..000000000000 --- a/graphics/backfract/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Backfract is an animated wallpaper program for Unix with X windows. -It fills your background window with a fractal image, then every -15 minutes it will update the image by zooming in or out. As it -zooms in, it uses a simple heuristic to try to stay with -"interesting" scenes. - -WWW: http://www.igoweb.org/~wms/comp/backfract/ diff --git a/japanese/Makefile b/japanese/Makefile index ed938ddf84ee..9e3d5a3886df 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -130,7 +130,6 @@ SUBDIR += jls SUBDIR += jvim3 SUBDIR += kakasi - SUBDIR += kanjipad SUBDIR += kasumi SUBDIR += kbanner SUBDIR += kcc @@ -278,7 +277,6 @@ SUBDIR += wordnet-fpw SUBDIR += wordpress SUBDIR += wwasw-fpw - SUBDIR += xdtp SUBDIR += xpdf SUBDIR += xshodou SUBDIR += xtr diff --git a/japanese/kanjipad/Makefile b/japanese/kanjipad/Makefile deleted file mode 100644 index f2a1e17df075..000000000000 --- a/japanese/kanjipad/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# Created by: Christophe Juniet <cjuniet@entreview.com> -# $FreeBSD$ - -PORTNAME= kanjipad -PORTVERSION= 2.0.0 -PORTREVISION= 8 -CATEGORIES= japanese x11 -MASTER_SITES= http://fishsoup.net/software/kanjipad/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Japanese Handwriting recognition - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -USES= gmake gnome perl5 pkgconfig -USE_GNOME= gtk20 -MAKE_ARGS= OPTIMIZE="${CFLAGS}" PREFIX="${PREFIX}" \ - GTKINC="`pkg-config --cflags gtk+-2.0`" -LDFLAGS+= -lm - -PORTDOCS= README -PLIST_FILES= bin/kanjipad bin/kpengine %%DATADIR%%/jdata.dat - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/kanjipad ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/kpengine ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/jdata.dat ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/japanese/kanjipad/distinfo b/japanese/kanjipad/distinfo deleted file mode 100644 index 23b352414267..000000000000 --- a/japanese/kanjipad/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (kanjipad-2.0.0.tar.gz) = 28272f61ec09c607a3578e3626e9e4fd43d1d9d1e21cb64328745766d00ee9e1 -SIZE (kanjipad-2.0.0.tar.gz) = 75930 diff --git a/japanese/kanjipad/pkg-descr b/japanese/kanjipad/pkg-descr deleted file mode 100644 index 9b9b0d39c795..000000000000 --- a/japanese/kanjipad/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -KanjiPad - Japanese Handwriting recognition - -KanjiPad is a very simple program for handwriting recognition - -The user draws a character into the box, then requests translation. -The best candidates are displayed along the right hand side of -the window and can be selected for pasting into other programs. - -WWW: http://fishsoup.net/software/kanjipad/ diff --git a/japanese/xdtp/Makefile b/japanese/xdtp/Makefile deleted file mode 100644 index d04f971204f6..000000000000 --- a/japanese/xdtp/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -# Created by: Masanori OZAWA <ozawa@ongs.co.jp> -# $FreeBSD$ - -PORTNAME= xdtp -PORTVERSION= 1.5.0 -PORTREVISION= 9 -CATEGORIES= japanese -MASTER_SITES= http://www.ongs.co.jp/software/xdtp/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= XML document transfer program - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES= compiler:c++11-lang gnome pkgconfig tar:tgz -USE_CXXSTD= c++11 -USE_GNOME= glibmm libxml2 libxslt -HAS_CONFIGURE= yes -USE_LDCONFIG= yes - -CFLAGS+= -fPIC - -OPTIONS_DEFINE= DEBUG DOCS GDK INCLUDE -OPTIONS_DEFAULT= GDK INCLUDE -OPTIONS_SUB= yes - -DEBUG_MAKE_ARGS= DEBUG="yes" -GDK_DESC= Build with Gdk-Pixbuf -GDK_USE= gnome=gdkpixbuf2 -GDK_CONFIGURE_ENV_OFF= WITHOUT_GDK="yes" -GDK_MAKE_ARGS_OFF= WITHOUT_GDK="yes" -INCLUDE_DESC= Install with XDTP include files -INCLUDE_MAKE_ARGS_OFF= WITHOUT_INCLUDE="yes" - -post-patch: - @${REINPLACE_CMD} -e \ - 's|-o .* \(-m\)|\1| ; \ - s|\([[:blank:]]\)\($${XDTPDOCUMENT}\)|\1$${DESTDIR}\2|' \ - ${WRKSRC}/banbun/Makefile - @${REINPLACE_CMD} -e \ - 's|-o .* \(-m\)|\1| ; \ - s|\([[:blank:]]\)\($${PREFIX}\)|\1$${DESTDIR}\2|' \ - ${WRKSRC}/bin/Makefile - @${REINPLACE_CMD} -e \ - 's|-o .* \(-m\)|\1| ; \ - s|\([[:blank:]]\)\($${XDTPSHARE}\)|\1$${DESTDIR}\2|' \ - ${WRKSRC}/misc/emacs/Makefile - @${REINPLACE_CMD} -e \ - 's|-o .* \(-m\)|\1| ; \ - s|\([[:blank:]]\)\($${PKGCONFDIR}\)|\1$${DESTDIR}\2|' \ - ${WRKSRC}/pkgconfig/Makefile - @${REINPLACE_CMD} -e \ - 's|-o .* \(-m\)|\1| ; \ - s|\([[:blank:]]\)\($${PREFIX}\)|\1$${DESTDIR}\2| ; \ - s|\([[:blank:]]\)\($${XDTPINCLUDE}\)|\1$${DESTDIR}\2| ; \ - s|\([[:blank:]]\)\($${XDTPSHARE}\)|\1$${DESTDIR}\2| ; \ - /$${LN}/s|^|#|' \ - ${WRKSRC}/src/Makefile - @${REINPLACE_CMD} -e \ - 's|-o .* \(-m\)|\1| ; \ - s|\([[:blank:]]\)\($${PREFIX}\)|\1$${DESTDIR}\2| ; \ - s|\([[:blank:]]\)\($${XDTPSHARE}\)|\1$${DESTDIR}\2|' \ - ${WRKSRC}/xsl/Makefile -# Unbreak parallel builds (-jX) by calling make(1) correctly - @${REINPLACE_CMD} -E 's/cd(.+)(;| &&) (\$$\{MAKE})/\3 -C\1/' \ - ${WRKSRC}/Makefile ${WRKSRC}/bin/Makefile \ - ${WRKSRC}/java/Makefile ${WRKSRC}/misc/Makefile - -post-install: - @${LN} -sf libxdtp.so.5 ${STAGEDIR}${PREFIX}/lib/libxdtp.so - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxdtp.so.5 - -.include <bsd.port.mk> diff --git a/japanese/xdtp/distinfo b/japanese/xdtp/distinfo deleted file mode 100644 index 50ff2d7c6c28..000000000000 --- a/japanese/xdtp/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xdtp-1.5.0.tgz) = 8136feebaef12cf97c56a78310f2f999d9929629900d895e7765595972941140 -SIZE (xdtp-1.5.0.tgz) = 87633 diff --git a/japanese/xdtp/files/patch-src_include_xdtp.h b/japanese/xdtp/files/patch-src_include_xdtp.h deleted file mode 100644 index 274108b70423..000000000000 --- a/japanese/xdtp/files/patch-src_include_xdtp.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/include/xdtp.h.orig 2013-10-06 03:58:31.000000000 +0900 -+++ src/include/xdtp.h 2013-10-06 03:58:44.000000000 +0900 -@@ -40,6 +40,7 @@ - #include <string.h> - #include <locale.h> - #include <errno.h> -+#include <unistd.h> - - #include "xdtptypes.h" - diff --git a/japanese/xdtp/files/patch-src_main.cpp b/japanese/xdtp/files/patch-src_main.cpp deleted file mode 100644 index ecfab84de4be..000000000000 --- a/japanese/xdtp/files/patch-src_main.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main.cpp.orig 2013-10-06 03:56:39.000000000 +0900 -+++ src/main.cpp 2013-10-06 03:56:58.000000000 +0900 -@@ -36,6 +36,8 @@ - #include "xdtp.h" - #include "XDTPTransform.h" - -+#include <getopt.h> -+ - using namespace XDTP; - - static void initialize_locale(); diff --git a/japanese/xdtp/files/patch-src_util_Utilities.cpp b/japanese/xdtp/files/patch-src_util_Utilities.cpp deleted file mode 100644 index 3020cbfb1ad9..000000000000 --- a/japanese/xdtp/files/patch-src_util_Utilities.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/util/Utilities.cpp.orig 2013-10-06 03:57:39.000000000 +0900 -+++ src/util/Utilities.cpp 2013-10-06 03:57:55.000000000 +0900 -@@ -37,7 +37,9 @@ - - #include <stdio.h> - #include <fcntl.h> -+#include <unistd.h> - #include <sys/errno.h> -+#include <sys/types.h> - - #ifdef __linux__ - #include <sys/file.h> diff --git a/japanese/xdtp/pkg-descr b/japanese/xdtp/pkg-descr deleted file mode 100644 index 3b86cc77e111..000000000000 --- a/japanese/xdtp/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -XDTP (XML Document Transform Program) is an application that offers -arbitrarily XML document transformation suited for writing of books, -web articles, magazine articles, or something like that. - -WWW: http://www.ongs.co.jp/software/xdtp/ diff --git a/japanese/xdtp/pkg-plist b/japanese/xdtp/pkg-plist deleted file mode 100644 index e0ae7c4e497f..000000000000 --- a/japanese/xdtp/pkg-plist +++ /dev/null @@ -1,61 +0,0 @@ -bin/banbun2html -bin/banbun2text -bin/banbun2xhtml -bin/glsd-doc2html -bin/glsd-doc2text -bin/xdtp -%%INCLUDE%%include/xdtp/CSVAnalyzer.h -%%INCLUDE%%include/xdtp/Exception.h -%%INCLUDE%%include/xdtp/RefPtr.h -%%INCLUDE%%include/xdtp/URI.h -%%INCLUDE%%include/xdtp/URLTool.h -%%INCLUDE%%include/xdtp/Utilities.h -%%INCLUDE%%include/xdtp/XDTPObjectWrapper.h -%%INCLUDE%%include/xdtp/XDTPTransform.h -%%INCLUDE%%include/xdtp/XMLTool.h -%%INCLUDE%%include/xdtp/modules/GLSDBanBunModule.h -%%INCLUDE%%include/xdtp/modules/GLSDBanBunModuleChecker.h -%%INCLUDE%%include/xdtp/modules/GLSDDocumentModule.h -%%INCLUDE%%include/xdtp/modules/GLSDDocumentModuleChecker.h -%%INCLUDE%%include/xdtp/modules/GLSDModule.h -%%INCLUDE%%include/xdtp/modules/GLSDModuleChecker.h -%%INCLUDE%%include/xdtp/modules/XDTPChecker.h -%%INCLUDE%%include/xdtp/modules/XDTPModule.h -%%INCLUDE%%include/xdtp/modules/XDTPModuleAdapter.h -%%INCLUDE%%include/xdtp/modules/XDTPModuleLoader.h -%%INCLUDE%%include/xdtp/modules/imports/GLSDImportModule.h -%%INCLUDE%%include/xdtp/modules/imports/GLSDImportModuleAdapter.h -%%INCLUDE%%include/xdtp/modules/imports/ImportImage.h -%%INCLUDE%%include/xdtp/modules/imports/ImportTextCSV.h -%%INCLUDE%%include/xdtp/modules/imports/ImportTextCommandPrompt.h -%%INCLUDE%%include/xdtp/modules/imports/ImportTextGLSD.h -%%INCLUDE%%include/xdtp/modules/imports/ImportTextPlain.h -%%INCLUDE%%include/xdtp/modules/imports/ImportTextSourcecode.h -%%INCLUDE%%include/xdtp/modules/imports/ImportTextXML.h -%%INCLUDE%%include/xdtp/xdtptypes.h -%%INCLUDE%%include/xdtp/xmlloader.h -%%INCLUDE%%include/xdtp/xmlsaver.h -lib/libxdtp.a -lib/libxdtp.so -lib/libxdtp.so.5 -libdata/pkgconfig/libxdtp.pc -%%PORTDOCS%%%%DOCSDIR%%/banbun-0001.html -%%PORTDOCS%%%%DOCSDIR%%/banbun-0002.html -%%PORTDOCS%%%%DOCSDIR%%/banbun-0003.html -%%PORTDOCS%%%%DOCSDIR%%/banbun-0004.html -%%DATADIR%%/emacs/hanbun.el -%%DATADIR%%/toHTML/BanBun.xsl -%%DATADIR%%/toHTML/BanBunModule.xsl -%%DATADIR%%/toHTML/DocumentModule.xsl -%%DATADIR%%/toHTML/GLSD.xsl -%%DATADIR%%/toHTML/GLSDocumentModule.xsl -%%DATADIR%%/toTEXT/BanBun.xsl -%%DATADIR%%/toTEXT/BanBunModule.xsl -%%DATADIR%%/toTEXT/DocumentModule.xsl -%%DATADIR%%/toTEXT/GLSD.xsl -%%DATADIR%%/toTEXT/GLSDocumentModule.xsl -%%DATADIR%%/toXHTML/BanBun.xsl -%%DATADIR%%/toXHTML/BanBunModule.xsl -%%DATADIR%%/toXHTML/DocumentModule.xsl -%%DATADIR%%/toXHTML/GLSD.xsl -%%DATADIR%%/toXHTML/GLSDocumentModule.xsl diff --git a/korean/Makefile b/korean/Makefile index 448ccc79eb0b..8c5f9cc79728 100644 --- a/korean/Makefile +++ b/korean/Makefile @@ -15,7 +15,6 @@ SUBDIR += hanyangfonts SUBDIR += hcode SUBDIR += hmconv - SUBDIR += hpscat SUBDIR += hunspell SUBDIR += ibus-hangul SUBDIR += imhangul-gtk2 diff --git a/korean/hpscat/Makefile b/korean/hpscat/Makefile deleted file mode 100644 index b7ac41974617..000000000000 --- a/korean/hpscat/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Created by: Junho CHOI <junho.choi@gmail.com> -# $FreeBSD$ - -PORTNAME= hpscat -PORTVERSION= 1.3.1 -PORTEPOCH= 2 -CATEGORIES= korean print -MASTER_SITES= http://ftp.kaist.ac.kr/hangul/print/hpscat/ \ - ftp://ftp.kaist.ac.kr/hangul/print/hpscat/ \ - http://ftp.kaist.ac.kr/hangul/editor/ked/:ked \ - ftp://ftp.kaist.ac.kr/hangul/editor/ked/:ked \ - ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ -PKGNAMESUFFIX= -jshin -DISTNAME= ${PORTNAME}${PKGNAMESUFFIX} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ked.tar.gz:ked - -MAINTAINER= ports@FreeBSD.org -COMMENT= Hangul Text Printing Utility - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -RUN_DEPENDS= hcode:korean/hcode - -FONTDIR= ${PREFIX}/${FONTDIR_REL} -FONTDIR_REL= share/fonts/ked-${PORTNAME} -FONTFILES= Gotic Header Munjo MunjoBold PCMunjo -README_FILES= README README.jshin README.jshin.ks -PLIST_FILES= bin/hpscat bin/hpscat.bin -.for i in ${FONTFILES} ${README_FILES} -PLIST_FILES+= ${FONTDIR_REL}/${i} -.endfor -SUB_FILES= hpscat.sh pkg-message -SUB_LIST= FONTDIR=${FONTDIR} -USES= perl5 - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/hpscat ${STAGEDIR}${PREFIX}/bin/hpscat.bin - @${INSTALL_SCRIPT} ${WRKDIR}/hpscat.sh ${STAGEDIR}${PREFIX}/bin/hpscat - @cd ${WRKSRC} && ${COPYTREE_SHARE} "${README_FILES}" ${STAGEDIR}${FONTDIR} - @cd ${WRKDIR}/ked && ${COPYTREE_SHARE} "${FONTFILES}" ${STAGEDIR}${FONTDIR} - -.include <bsd.port.mk> diff --git a/korean/hpscat/distinfo b/korean/hpscat/distinfo deleted file mode 100644 index a8d82faf84fd..000000000000 --- a/korean/hpscat/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (hpscat-jshin.tar.gz) = 621403a0d49779cdf7936b91ae7a2200f9ac94ec75fbc0ca9488196cef5c6f25 -SIZE (hpscat-jshin.tar.gz) = 26075 -SHA256 (ked.tar.gz) = fa3b9674609b10b5fe4d96ca2a801fb5d50d8281d0f52120319013fd6e3c6c21 -SIZE (ked.tar.gz) = 305769 diff --git a/korean/hpscat/files/hpscat.sh.in b/korean/hpscat/files/hpscat.sh.in deleted file mode 100644 index 592fb5a13c38..000000000000 --- a/korean/hpscat/files/hpscat.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# hpscat fontend for FreeBSD ports -# -# 4 Apr 1997, Choi Jun Ho <junker@jazz.snu.ac.kr> -# -# It enables hpscat to print file without loading font in gs -# - -HFONTPATH=%%FONTDIR%% - -options=$* -fileoutput=0 - -# check if -f option is specified -for i in $* -do - case $i in - -f) fileoutput=1; shift;; - esac -done - -if [ $fileoutput != 1 ]; then -# print font header - cat $HFONTPATH/Header - for hfont in Munjo Gotic MunjoBold PCMunjo - do - cat $HFONTPATH/$hfont - done -fi - -exec hpscat.bin $options diff --git a/korean/hpscat/files/patch-Makefile b/korean/hpscat/files/patch-Makefile deleted file mode 100644 index a20c03072edd..000000000000 --- a/korean/hpscat/files/patch-Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.orig Wed Nov 22 07:42:41 1995 -+++ Makefile Sat Mar 30 19:22:22 2002 -@@ -11,10 +11,12 @@ - DADVHF = -DADV_HFONT - #DADVHF = - # define if you want to make the default paper size US letter instead of A4 --DUS = -DUS_VERSION --#DUS = --CFLAGS = -O $(DHPS) $(DADVHF) $(DUS) -+#DUS = -DUS_VERSION -+DUS = -+CFLAGS += $(DHPS) $(DADVHF) $(DUS) - LDFLAGS = -s -+ -+all: $(PRG) - - $(PRG): $(OBJ) - $(CC) $(LDFLAGS) -o $@ $(OBJ) diff --git a/korean/hpscat/files/patch-hpscat.c b/korean/hpscat/files/patch-hpscat.c deleted file mode 100644 index 74ff08df97e4..000000000000 --- a/korean/hpscat/files/patch-hpscat.c +++ /dev/null @@ -1,11 +0,0 @@ ---- hpscat.c.orig 2019-08-03 11:25:44 UTC -+++ hpscat.c -@@ -62,7 +62,7 @@ open_outfile(s) /* returns -1 if can - if(ofp=fopen(buf,"r")) { /* file exists */ - fclose(ofp); - fprintf(stderr,"output file %s exists...overwrite? ", buf); -- gets(ans); -+ fgets(buf,256,ans); - if(ans[0]=='y') - unlink(buf); - else diff --git a/korean/hpscat/files/patch-hpscat.h b/korean/hpscat/files/patch-hpscat.h deleted file mode 100644 index 0ce84cff1334..000000000000 --- a/korean/hpscat/files/patch-hpscat.h +++ /dev/null @@ -1,28 +0,0 @@ ---- hpscat.h.orig 1995-11-23 05:16:11.000000000 -0500 -+++ hpscat.h 2013-06-12 18:37:53.000000000 -0400 -@@ -49,9 +49,11 @@ - \*------------------------------*/ - - #include <stdio.h> --#include <malloc.h> -+#include <stdlib.h> - #include <string.h> -+#include <unistd.h> - #include <sys/time.h> -+#include <sys/wait.h> - - #ifdef __GNUC__ - # define PROT(x) x -@@ -186,4 +188,12 @@ - extern FILE *fp; /* file pointer to input file */ - extern FILE *ofp; /* file pointer to output file */ - -+void endfile(void); -+void fatal(char *); -+int fillpagebuf(void); -+int find_f(int, int, int); -+int find_l(int, int, int); -+int find_m(int, int, int); -+int find_set(int); -+ - /*** EOF ***/ diff --git a/korean/hpscat/files/patch-init.c b/korean/hpscat/files/patch-init.c deleted file mode 100644 index 66f90455914a..000000000000 --- a/korean/hpscat/files/patch-init.c +++ /dev/null @@ -1,11 +0,0 @@ ---- init.c.orig 1995-11-23 17:18:58.000000000 -0500 -+++ init.c 2013-06-12 17:34:31.000000000 -0400 -@@ -211,7 +211,7 @@ - Time = localtime(&T.tv_sec); - sprintf(nalza, "%02d:%02d, %d/%d/%d", - Time->tm_hour, Time->tm_min, -- Time->tm_mon+1, Time->tm_mday, Time->tm_year ); -+ Time->tm_mon+1, Time->tm_mday, Time->tm_year + 1900); - } - - /*** EOF ***/ diff --git a/korean/hpscat/files/patch-misc.c b/korean/hpscat/files/patch-misc.c deleted file mode 100644 index 2ead275084fc..000000000000 --- a/korean/hpscat/files/patch-misc.c +++ /dev/null @@ -1,21 +0,0 @@ ---- misc.c.orig 1995-11-23 15:40:07.000000000 -0500 -+++ misc.c 2013-06-12 18:43:01.000000000 -0400 -@@ -2,8 +2,8 @@ - #include "hpscat.h" - #include "paper.h" - --extern totalpages; --static converted; -+extern int totalpages; -+static int converted; - char *tmpfn; - - void -@@ -36,6 +36,7 @@ - #endif - case Nbyte: strcpy(args[1], fromN); break; - case ISO: strcpy(args[1], fromI); break; -+ default: /* NOTREACHED */ return; - } - execute(args); - fclose(fp); diff --git a/korean/hpscat/files/patch-paper.h b/korean/hpscat/files/patch-paper.h deleted file mode 100644 index ae5dd5537d8b..000000000000 --- a/korean/hpscat/files/patch-paper.h +++ /dev/null @@ -1,22 +0,0 @@ ---- paper.h.orig 1995-11-23 02:56:27.000000000 -0500 -+++ paper.h 2013-06-12 16:57:50.000000000 -0400 -@@ -5,7 +5,7 @@ - add other paper types like b4 and b5 before the last entry 'user' here - and their dimensions to the array 'papersize' in paper.c */ - typedef enum {a3,a4,a5,b4,b5,letter,t10x14,legal,executive, -- folio,quarto,statement,ledger,tabloid,user} PAPER; -+ folio,quarto,statement,ledger,tabloid,c5,user} PAPER; - - /* mnemonics for length unit - add other unit such as pica and conversion factor to standard -@@ -54,8 +54,8 @@ - #define ABS_MIN_LM 18 /* depends on printer */ - - --extern s_width; --extern s_width_nl; -+extern int s_width; -+extern int s_width_nl; - extern int l_width,l_height,l_lm1,l_lm2,l_bm,l_tm; - extern int l3_width,l3_height,l3_lm1,l3_lm2,l3_lm3,l3_bm,l3_tm; - extern int p_width,p_height,p_lm,p_bm,p_tm; diff --git a/korean/hpscat/files/patch-showbuf.c b/korean/hpscat/files/patch-showbuf.c deleted file mode 100644 index 3e4f46cc2284..000000000000 --- a/korean/hpscat/files/patch-showbuf.c +++ /dev/null @@ -1,19 +0,0 @@ ---- showbuf.c.orig 1995-11-23 07:01:36.000000000 -0500 -+++ showbuf.c 2013-06-12 17:15:47.000000000 -0400 -@@ -210,7 +210,7 @@ - fprintf(ofp,"90 rotate 0 %d translate ", - papersize[paper].width); - fprintf(ofp," %f 1 scale\n",HOR_SCALE_FAC); - -- if(nobox == False) -+ if(nobox == False) { - if(layout==Sero) { - box(p_lm, p_bm, p_width, p_height); - fillbox(p_lm, p_bm, s_width, p_height); -@@ -236,6 +236,7 @@ - fillbox(l3_lm2, l3_bm, s_width, l3_height); - fillbox(l3_lm3, l3_bm, s_width, l3_height); - } -+ } - if(noheader == False) { - x = (layout==Sero||layout==Sero2) ? p_lm : l_lm1; - y = (layout==Sero||layout==Sero2) ? p_tm : l_tm; diff --git a/korean/hpscat/files/patch-user.c b/korean/hpscat/files/patch-user.c deleted file mode 100644 index 242f44720807..000000000000 --- a/korean/hpscat/files/patch-user.c +++ /dev/null @@ -1,10 +0,0 @@ ---- user.c.orig 1995-11-23 05:17:16.000000000 -0500 -+++ user.c 2013-06-12 17:24:33.000000000 -0400 -@@ -37,7 +37,6 @@ - char buf[BUFSIZ]; - char *home; - FILE *fp; -- extern char *getenv PROT((char *)); - home = getenv("HOME"); - if(strlen(home)==0) - return; diff --git a/korean/hpscat/files/pkg-message.in b/korean/hpscat/files/pkg-message.in deleted file mode 100644 index d3d0d1516ddc..000000000000 --- a/korean/hpscat/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: <<EOM -To use hpscat with font loading in gs, use hpscat.sh instead. -Otherwise, you must setup ghostscript to load font first. -Read %%FONTDIR%%/README.jshin(.ks) -EOM -} -] diff --git a/korean/hpscat/pkg-descr b/korean/hpscat/pkg-descr deleted file mode 100644 index 05f423dcdec3..000000000000 --- a/korean/hpscat/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -hpscat-1.3jshin -------------------- - -hpscat is a small printing utility that print Hangul characters in -any PostScript printer(including ghostscript). It use the hangul PS -font in ked, so you must load the font before printing the document -processed by hpscat. - -This version is revised by Jungshik Shin <jshin@minerva.cis.yale.edu>. diff --git a/math/Makefile b/math/Makefile index 1e0708daca6b..3707c153b364 100644 --- a/math/Makefile +++ b/math/Makefile @@ -150,7 +150,6 @@ SUBDIR += aspcud SUBDIR += asymptote SUBDIR += atlas - SUBDIR += barvinok SUBDIR += bcal SUBDIR += bitwise SUBDIR += blacs @@ -524,7 +523,6 @@ SUBDIR += openblas SUBDIR += openfst SUBDIR += openlibm - SUBDIR += openmesh SUBDIR += opensolaris-libm SUBDIR += openturns SUBDIR += optpp @@ -865,7 +863,6 @@ SUBDIR += reduce SUBDIR += reduce-psl SUBDIR += reed-solomon - SUBDIR += rehearse SUBDIR += rexx-regmath SUBDIR += rkward-kde SUBDIR += rngstreams diff --git a/math/barvinok/Makefile b/math/barvinok/Makefile deleted file mode 100644 index b7c07216e058..000000000000 --- a/math/barvinok/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $FreeBSD$ - -PORTNAME= barvinok -DISTVERSION= 0.41.3 -CATEGORIES= math -MASTER_SITES= http://barvinok.gforge.inria.fr/ - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Library for counting the number of integer points in polytopes - -LICENSE= GPLv2 - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LIB_DEPENDS= libglpk.so:math/glpk \ - libgmp.so:math/gmp \ - libisl.so:devel/isl \ - libntl.so:math/ntl \ - libpolylibgmp.so:math/polylib - -USES= compiler:c11 gmake libtool localbase:ldflags pkgconfig -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-static --enable-shared --enable-shared-barvinok \ - --with-gmp=system --with-polylib=system --with-isl=system -USE_LDCONFIG= yes - -.include <bsd.port.mk> diff --git a/math/barvinok/distinfo b/math/barvinok/distinfo deleted file mode 100644 index 3e3ae60310e8..000000000000 --- a/math/barvinok/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1573885577 -SHA256 (barvinok-0.41.3.tar.gz) = 595c704e366488207de01434428658071f9e8a26ddb524a15106860140808b43 -SIZE (barvinok-0.41.3.tar.gz) = 5623799 diff --git a/math/barvinok/pkg-descr b/math/barvinok/pkg-descr deleted file mode 100644 index 6c85b3be84a4..000000000000 --- a/math/barvinok/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -barvinok is a library for counting the number of integer points in parametric -and non-parametric polytopes based on polylib. For a parametric polytope, the -number of points is represented by either a piecewise quasi-polynomial or an -Ehrhart series. - -WWW: http://freshmeat.sourceforge.net/projects/barvinok diff --git a/math/barvinok/pkg-plist b/math/barvinok/pkg-plist deleted file mode 100644 index 964cafe8d66e..000000000000 --- a/math/barvinok/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/barvinok_count -bin/barvinok_ehrhart -bin/barvinok_enumerate -bin/barvinok_enumerate_e -bin/iscc -bin/polytope_scan -include/barvinok/NTL.h -include/barvinok/NTL_QQ.h -include/barvinok/barvinok.h -include/barvinok/basis_reduction.h -include/barvinok/evalue.h -include/barvinok/genfun.h -include/barvinok/isl.h -include/barvinok/options.h -include/barvinok/polylib.h -include/barvinok/sample.h -include/barvinok/set.h -include/barvinok/util.h -lib/libbarvinok.so -lib/libbarvinok.so.23 -lib/libbarvinok.so.23.0.9 -libdata/pkgconfig/barvinok.pc diff --git a/math/openmesh/Makefile b/math/openmesh/Makefile deleted file mode 100644 index 11981449bb8e..000000000000 --- a/math/openmesh/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $FreeBSD$ - -PORTNAME= openmesh -DISTVERSION= 8.0 -CATEGORIES= math -MASTER_SITES= http://www.openmesh.org/media/Releases/${DISTVERSION}/ -DISTNAME= OpenMesh-${DISTVERSION} - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Generic data structure for manipulating polygonal meshes - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN= Fails to build with cmake-3.16.0 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -USES= cmake compiler:c++11-lang dos2unix gl qt:5 xorg -DOS2UNIX_FILES= src/OpenMesh/Tools/CMakeLists.txt -USE_QT= core concurrent gui help network opengl printsupport script scripttools sql svg x11extras xml xmlpatterns webkit widgets \ - buildtools_build qmake_build uitools_build -USE_GL= gl glu glut -USE_XORG= xi xmu -USE_LDCONFIG= yes - -post-install: - @${RMDIR} ${STAGEDIR}${PREFIX}/include/OpenMesh/Tools/VDPM/xpm - -.include <bsd.port.mk> diff --git a/math/openmesh/distinfo b/math/openmesh/distinfo deleted file mode 100644 index cdf5fc3e2649..000000000000 --- a/math/openmesh/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1564278933 -SHA256 (OpenMesh-8.0.tar.gz) = 8974d44026cacaa37b171945b5c96a284bfd32c9df9d671d62931050d057ec82 -SIZE (OpenMesh-8.0.tar.gz) = 26373362 diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc deleted file mode 100644 index b3b792da4206..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimater.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/OpenMesh/Apps/Decimating/decimater.cc.orig 2018-10-21 23:36:03 UTC -+++ src/OpenMesh/Apps/Decimating/decimater.cc -@@ -58,6 +58,9 @@ - #include <string> - #include <memory> - #include <map> -+#if defined(__FreeBSD__) -+#include <unistd.h> -+#endif - //-------------------- - #include <OpenMesh/Core/IO/MeshIO.hh> - //-------------------- diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc deleted file mode 100644 index 0dffab8c0e5d..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Apps_Decimating_decimaterviewer.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/OpenMesh/Apps/Decimating/decimaterviewer.cc.orig 2018-10-21 23:51:30 UTC -+++ src/OpenMesh/Apps/Decimating/decimaterviewer.cc -@@ -63,6 +63,9 @@ - #else - #include <GL/glut.h> - #endif -+#if defined(__FreeBSD__) -+#include <unistd.h> -+#endif - - void usage_and_exit(int xcode); - diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc deleted file mode 100644 index 9966d866c5d1..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Apps_QtViewer_meshviewer.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/OpenMesh/Apps/QtViewer/meshviewer.cc.orig 2018-10-21 23:50:54 UTC -+++ src/OpenMesh/Apps/QtViewer/meshviewer.cc -@@ -63,6 +63,9 @@ - #else - #include <GL/glut.h> - #endif -+#if defined(__FreeBSD__) -+#include <unistd.h> -+#endif - - #include "MeshViewerWidget.hh" - diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc deleted file mode 100644 index b0c37cad7eb9..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Apps_Smoothing_smooth.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/OpenMesh/Apps/Smoothing/smooth.cc.orig 2018-10-21 23:39:56 UTC -+++ src/OpenMesh/Apps/Smoothing/smooth.cc -@@ -53,6 +53,9 @@ - #include <OpenMesh/Tools/Utils/Timer.hh> - #include <OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh> - #include <OpenMesh/Tools/Utils/getopt.h> -+#if defined(__FreeBSD__) -+#include <unistd.h> -+#endif - - - using namespace OpenMesh; diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc deleted file mode 100644 index 3185865f8633..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_adaptive__subdivider.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc.orig 2018-10-21 23:38:04 UTC -+++ src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc -@@ -67,6 +67,9 @@ - # include <cmath> - using std::pow; - #endif -+#if defined(__FreeBSD__) -+#include <unistd.h> -+#endif - - - using OpenMesh::Subdivider::Adaptive::CompositeTraits; diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc deleted file mode 100644 index 74cab1bff5b6..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Apps_Subdivider_subdivider.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/OpenMesh/Apps/Subdivider/subdivider.cc.orig 2018-10-21 23:37:26 UTC -+++ src/OpenMesh/Apps/Subdivider/subdivider.cc -@@ -48,6 +48,9 @@ - - #include <iostream> - #include <sstream> -+#if defined(__FreeBSD__) -+#include <unistd.h> -+#endif - // ---------------------------------------- OpenMesh Stuff - #include <OpenMesh/Core/IO/MeshIO.hh> - #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh> diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc deleted file mode 100644 index 30c6c98c49b9..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_Analyzer_vdpmanalyzer.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc.orig 2018-10-21 23:40:29 UTC -+++ src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc -@@ -56,6 +56,9 @@ - #include <limits> - #include <exception> - #include <cmath> -+#if defined(__FreeBSD__) -+#include <unistd.h> -+#endif - // -------------------- OpenMesh - #include <OpenMesh/Core/IO/MeshIO.hh> - #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh> diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc deleted file mode 100644 index 209d5dbc3bf6..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Apps_VDProgMesh_mkbalancedpm_mkbalancedpm.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc.orig 2018-10-21 23:38:43 UTC -+++ src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc -@@ -50,6 +50,9 @@ - #include <iostream> - #include <sstream> - #include <cmath> -+#if defined(__FreeBSD__) -+#include <unistd.h> -+#endif - // -------------------- OpenMesh - #include <OpenMesh/Core/IO/MeshIO.hh> - #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh> diff --git a/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc b/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc deleted file mode 100644 index a50635faf650..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Apps_mconvert_mconvert.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/OpenMesh/Apps/mconvert/mconvert.cc.orig 2018-10-21 23:39:10 UTC -+++ src/OpenMesh/Apps/mconvert/mconvert.cc -@@ -50,6 +50,9 @@ - #include <iterator> - #include <fstream> - #include <string> -+#if defined(__FreeBSD__) -+#include <unistd.h> -+#endif - // - #include <OpenMesh/Core/IO/MeshIO.hh> - #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh> diff --git a/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt b/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt deleted file mode 100644 index 28c56e9f1459..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Core_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenMesh/Core/CMakeLists.txt.orig 2018-10-22 04:57:49 UTC -+++ src/OpenMesh/Core/CMakeLists.txt -@@ -45,7 +45,7 @@ if (WIN32) - endif() - - else () -- acg_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers}) -+ acg_add_library (OpenMeshCore SHARED ${sources} ${headers}) - set_target_properties (OpenMeshCore PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} - SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} ) - diff --git a/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt b/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt deleted file mode 100644 index b62da8286538..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Tools_CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ ---- src/OpenMesh/Tools/CMakeLists.txt.orig 2017-01-08 22:09:58 UTC -+++ src/OpenMesh/Tools/CMakeLists.txt -@@ -46,7 +46,7 @@ if (WIN32) - endif() - - else () -- acg_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers}) -+ acg_add_library (OpenMeshTools SHARED ${sources} ${headers}) - set_target_properties (OpenMeshTools PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} - SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} ) - endif () -@@ -54,7 +54,7 @@ endif () - target_link_libraries (OpenMeshTools OpenMeshCore) - - IF( NOT WIN32 ) -- target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic) -+ #target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic) - ENDIF(NOT WIN32) - - if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS ) -@@ -70,7 +70,7 @@ if ( (${PROJECT_NAME} MATCHES "OpenMesh" - if (APPLE) - # let bundle generation depend on target - add_dependencies (fixbundle OpenMeshTools) -- add_dependencies (fixbundle OpenMeshToolsStatic) -+ #add_dependencies (fixbundle OpenMeshToolsStatic) - endif() - - endif() diff --git a/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc b/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc deleted file mode 100644 index 43c04d823316..000000000000 --- a/math/openmesh/files/patch-src_OpenMesh_Tools_Utils_Timer.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/OpenMesh/Tools/Utils/Timer.cc.orig 2018-10-21 23:42:34 UTC -+++ src/OpenMesh/Tools/Utils/Timer.cc -@@ -46,6 +46,8 @@ - * * - \*===========================================================================*/ - -+#include <sys/time.h> -+ - #ifndef DOXY_IGNORE_THIS - // ---------------------------------------------------------------------------- - #include <OpenMesh/Core/System/config.h> -@@ -188,7 +190,7 @@ protected: - }; - - // ----------------------------------------------------------- gettimeofday ---- --#elif (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__) -+#elif 0 && (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__) - - # include <sys/time.h> - # include <sys/resource.h> -@@ -276,7 +278,7 @@ Timer::Timer(void) : - # else - impl_ = new TimerImplPosix<CLOCK_REALTIME>; - # endif --#elif (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32)) ) && !defined(__MINGW32__) -+#elif 0 && (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32)) ) && !defined(__MINGW32__) - impl_ = new TimerImplGToD; - #else - impl_ = new TimerImplStd; diff --git a/math/openmesh/pkg-descr b/math/openmesh/pkg-descr deleted file mode 100644 index 4d63aa02b64b..000000000000 --- a/math/openmesh/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -OpenMesh is a generic and efficient data structure for representing and -manipulating polygonal meshes. - -The main features of the underlying data structure are: -* No restriction to triangles meshes, handle general polygonal meshes. -* Explicit representation of vertices, halfedges, edges, and faces. -* Efficient access to the one-ring neighborhood of a vertex. -* Ability to handle non-manifold vertices (like two faces meeting in only one - vertex). - -WWW: https://www.openmesh.org/ diff --git a/math/openmesh/pkg-plist b/math/openmesh/pkg-plist deleted file mode 100644 index 51564ab2011c..000000000000 --- a/math/openmesh/pkg-plist +++ /dev/null @@ -1,197 +0,0 @@ -bin/Analyzer -bin/DecimaterGui -bin/Dualizer -bin/ProgViewer -bin/QtViewer -bin/Smoothing -bin/SubdividerGui -bin/Synthesizer -bin/commandlineAdaptiveSubdivider -bin/commandlineDecimater -bin/commandlineSubdivider -bin/mconvert -bin/mkbalancedpm -include/OpenMesh/Core/Geometry/Config.hh -include/OpenMesh/Core/Geometry/EigenVectorT.hh -include/OpenMesh/Core/Geometry/LoopSchemeMaskT.hh -include/OpenMesh/Core/Geometry/MathDefs.hh -include/OpenMesh/Core/Geometry/NormalConeT.hh -include/OpenMesh/Core/Geometry/NormalConeT_impl.hh -include/OpenMesh/Core/Geometry/Plane3d.hh -include/OpenMesh/Core/Geometry/QuadricT.hh -include/OpenMesh/Core/Geometry/Vector11T.hh -include/OpenMesh/Core/Geometry/VectorT.hh -include/OpenMesh/Core/Geometry/VectorT_inc.hh -include/OpenMesh/Core/IO/BinaryHelper.hh -include/OpenMesh/Core/IO/IOInstances.hh -include/OpenMesh/Core/IO/IOManager.hh -include/OpenMesh/Core/IO/MeshIO.hh -include/OpenMesh/Core/IO/OFFFormat.hh -include/OpenMesh/Core/IO/OMFormat.hh -include/OpenMesh/Core/IO/OMFormatT_impl.hh -include/OpenMesh/Core/IO/Options.hh -include/OpenMesh/Core/IO/SR_binary.hh -include/OpenMesh/Core/IO/SR_binary_spec.hh -include/OpenMesh/Core/IO/SR_binary_vector_of_bool.inl -include/OpenMesh/Core/IO/SR_binary_vector_of_fundamentals.inl -include/OpenMesh/Core/IO/SR_binary_vector_of_string.inl -include/OpenMesh/Core/IO/SR_rbo.hh -include/OpenMesh/Core/IO/SR_store.hh -include/OpenMesh/Core/IO/SR_types.hh -include/OpenMesh/Core/IO/StoreRestore.hh -include/OpenMesh/Core/IO/exporter/BaseExporter.hh -include/OpenMesh/Core/IO/exporter/ExporterT.hh -include/OpenMesh/Core/IO/importer/BaseImporter.hh -include/OpenMesh/Core/IO/importer/ImporterT.hh -include/OpenMesh/Core/IO/reader/BaseReader.hh -include/OpenMesh/Core/IO/reader/OBJReader.hh -include/OpenMesh/Core/IO/reader/OFFReader.hh -include/OpenMesh/Core/IO/reader/OMReader.hh -include/OpenMesh/Core/IO/reader/PLYReader.hh -include/OpenMesh/Core/IO/reader/STLReader.hh -include/OpenMesh/Core/IO/writer/BaseWriter.hh -include/OpenMesh/Core/IO/writer/OBJWriter.hh -include/OpenMesh/Core/IO/writer/OFFWriter.hh -include/OpenMesh/Core/IO/writer/OMWriter.hh -include/OpenMesh/Core/IO/writer/PLYWriter.hh -include/OpenMesh/Core/IO/writer/STLWriter.hh -include/OpenMesh/Core/IO/writer/VTKWriter.hh -include/OpenMesh/Core/Mesh/ArrayItems.hh -include/OpenMesh/Core/Mesh/ArrayKernel.hh -include/OpenMesh/Core/Mesh/ArrayKernelT_impl.hh -include/OpenMesh/Core/Mesh/AttribKernelT.hh -include/OpenMesh/Core/Mesh/Attributes.hh -include/OpenMesh/Core/Mesh/BaseKernel.hh -include/OpenMesh/Core/Mesh/BaseMesh.hh -include/OpenMesh/Core/Mesh/Casts.hh -include/OpenMesh/Core/Mesh/CirculatorsT.hh -include/OpenMesh/Core/Mesh/FinalMeshItemsT.hh -include/OpenMesh/Core/Mesh/Handles.hh -include/OpenMesh/Core/Mesh/IteratorsT.hh -include/OpenMesh/Core/Mesh/PolyConnectivity.hh -include/OpenMesh/Core/Mesh/PolyMeshT.hh -include/OpenMesh/Core/Mesh/PolyMeshT_impl.hh -include/OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh -include/OpenMesh/Core/Mesh/Status.hh -include/OpenMesh/Core/Mesh/Tags.hh -include/OpenMesh/Core/Mesh/Traits.hh -include/OpenMesh/Core/Mesh/TriConnectivity.hh -include/OpenMesh/Core/Mesh/TriMeshT.hh -include/OpenMesh/Core/Mesh/TriMeshT_impl.hh -include/OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh -include/OpenMesh/Core/Mesh/gen/circulators_header.hh -include/OpenMesh/Core/Mesh/gen/circulators_template.hh -include/OpenMesh/Core/Mesh/gen/footer.hh -include/OpenMesh/Core/Mesh/gen/iterators_header.hh -include/OpenMesh/Core/Mesh/gen/iterators_template.hh -include/OpenMesh/Core/System/OpenMeshDLLMacros.hh -include/OpenMesh/Core/System/compiler.hh -include/OpenMesh/Core/System/config.h -include/OpenMesh/Core/System/config.hh -include/OpenMesh/Core/System/mostream.hh -include/OpenMesh/Core/System/omstream.hh -include/OpenMesh/Core/Utils/AutoPropertyHandleT.hh -include/OpenMesh/Core/Utils/BaseProperty.hh -include/OpenMesh/Core/Utils/Endian.hh -include/OpenMesh/Core/Utils/GenProg.hh -include/OpenMesh/Core/Utils/HandleToPropHandle.hh -include/OpenMesh/Core/Utils/Noncopyable.hh -include/OpenMesh/Core/Utils/Property.hh -include/OpenMesh/Core/Utils/PropertyContainer.hh -include/OpenMesh/Core/Utils/PropertyManager.hh -include/OpenMesh/Core/Utils/RandomNumberGenerator.hh -include/OpenMesh/Core/Utils/SingletonT.hh -include/OpenMesh/Core/Utils/SingletonT_impl.hh -include/OpenMesh/Core/Utils/color_cast.hh -include/OpenMesh/Core/Utils/vector_cast.hh -include/OpenMesh/Core/Utils/vector_traits.hh -include/OpenMesh/Tools/Decimater/BaseDecimaterT.hh -include/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh -include/OpenMesh/Tools/Decimater/CollapseInfoT.hh -include/OpenMesh/Tools/Decimater/DecimaterT.hh -include/OpenMesh/Tools/Decimater/DecimaterT_impl.hh -include/OpenMesh/Tools/Decimater/McDecimaterT.hh -include/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh -include/OpenMesh/Tools/Decimater/MixedDecimaterT.hh -include/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh -include/OpenMesh/Tools/Decimater/ModAspectRatioT.hh -include/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh -include/OpenMesh/Tools/Decimater/ModBaseT.hh -include/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh -include/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh -include/OpenMesh/Tools/Decimater/ModHausdorffT.hh -include/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh -include/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh -include/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh -include/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh -include/OpenMesh/Tools/Decimater/ModProgMeshT.hh -include/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh -include/OpenMesh/Tools/Decimater/ModQuadricT.hh -include/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh -include/OpenMesh/Tools/Decimater/ModRoundnessT.hh -include/OpenMesh/Tools/Decimater/Observer.hh -include/OpenMesh/Tools/Dualizer/meshDualT.hh -include/OpenMesh/Tools/Kernel_OSG/ArrayKernelT.hh -include/OpenMesh/Tools/Kernel_OSG/AttribKernelT.hh -include/OpenMesh/Tools/Kernel_OSG/PropertyKernel.hh -include/OpenMesh/Tools/Kernel_OSG/PropertyT.hh -include/OpenMesh/Tools/Kernel_OSG/Traits.hh -include/OpenMesh/Tools/Kernel_OSG/TriMesh_OSGArrayKernelT.hh -include/OpenMesh/Tools/Kernel_OSG/VectorAdapter.hh -include/OpenMesh/Tools/Kernel_OSG/bindT.hh -include/OpenMesh/Tools/Kernel_OSG/color_cast.hh -include/OpenMesh/Tools/SmartTagger/SmartTaggerT.hh -include/OpenMesh/Tools/SmartTagger/SmartTaggerT_impl.hh -include/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh -include/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh -include/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh -include/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh -include/OpenMesh/Tools/Smoother/SmootherT.hh -include/OpenMesh/Tools/Smoother/SmootherT_impl.hh -include/OpenMesh/Tools/Smoother/smooth_mesh.hh -include/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh -include/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh -include/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeTraits.hh -include/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh -include/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh -include/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh -include/OpenMesh/Tools/Subdivider/Adaptive/Composite/Traits.hh -include/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh -include/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh -include/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh -include/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh -include/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh -include/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh -include/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh -include/OpenMesh/Tools/Subdivider/Uniform/LongestEdgeT.hh -include/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh -include/OpenMesh/Tools/Subdivider/Uniform/MidpointT.hh -include/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh -include/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh -include/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh -include/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh -include/OpenMesh/Tools/Utils/Config.hh -include/OpenMesh/Tools/Utils/GLConstAsString.hh -include/OpenMesh/Tools/Utils/Gnuplot.hh -include/OpenMesh/Tools/Utils/HeapT.hh -include/OpenMesh/Tools/Utils/MeshCheckerT.hh -include/OpenMesh/Tools/Utils/MeshCheckerT_impl.hh -include/OpenMesh/Tools/Utils/NumLimitsT.hh -include/OpenMesh/Tools/Utils/StripifierT.hh -include/OpenMesh/Tools/Utils/StripifierT_impl.hh -include/OpenMesh/Tools/Utils/TestingFramework.hh -include/OpenMesh/Tools/Utils/Timer.hh -include/OpenMesh/Tools/Utils/conio.hh -include/OpenMesh/Tools/Utils/getopt.h -include/OpenMesh/Tools/VDPM/MeshTraits.hh -include/OpenMesh/Tools/VDPM/StreamingDef.hh -include/OpenMesh/Tools/VDPM/VFront.hh -include/OpenMesh/Tools/VDPM/VHierarchy.hh -include/OpenMesh/Tools/VDPM/VHierarchyNode.hh -include/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh -include/OpenMesh/Tools/VDPM/VHierarchyWindow.hh -include/OpenMesh/Tools/VDPM/ViewingParameters.hh -lib/libOpenMeshCore.so -lib/libOpenMeshCore.so.8.0 -lib/libOpenMeshTools.so -lib/libOpenMeshTools.so.8.0 diff --git a/math/rehearse/Makefile b/math/rehearse/Makefile deleted file mode 100644 index fb4ece2b8a99..000000000000 --- a/math/rehearse/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $FreeBSD$ - -PORTNAME= rehearse -DISTVERSION= g20190305 -CATEGORIES= math -PKGNAMEPREFIX= coin-or- - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Algebraic modeling library in C++ for linear optimization solvers - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN= depends on conflicting ports -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LIB_DEPENDS= libClp.so:math/clp \ - libOsi.so:math/osi - -USES= compiler:c++11-lang gmake libtool pkgconfig -USE_GITHUB= yes -GH_ACCOUNT= coin-or -GH_PROJECT= Rehearse -GH_TAGNAME= 31d12f8 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes - -post-stage: - @${RM} -r ${STAGEDIR}${LOCALBASE}/share/coin - -.include <bsd.port.mk> diff --git a/math/rehearse/distinfo b/math/rehearse/distinfo deleted file mode 100644 index d076f2357ae4..000000000000 --- a/math/rehearse/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1576969222 -SHA256 (coin-or-Rehearse-g20190305-31d12f8_GH0.tar.gz) = c8dcedb6304b42e864ece26052bdbdd4eb85143e975c720dc378915024c32bbc -SIZE (coin-or-Rehearse-g20190305-31d12f8_GH0.tar.gz) = 704657 diff --git a/math/rehearse/pkg-descr b/math/rehearse/pkg-descr deleted file mode 100644 index abef74513fd3..000000000000 --- a/math/rehearse/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Rehearse is a C++ library designed to describe linear optimization problems -programmatically. - -You can describe linear objectives and constraints using native C++ algebraic -expressions, in a similar way you write a mathematical model on a paper. - -WWW: https://projects.coin-or.org/Rehearse diff --git a/math/rehearse/pkg-plist b/math/rehearse/pkg-plist deleted file mode 100644 index a324e364f66f..000000000000 --- a/math/rehearse/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -include/coin/CelBoolVar.h -include/coin/CelBoolVarArray.h -include/coin/CelCoefficients.fwd.h -include/coin/CelExpression.h -include/coin/CelIntVar.h -include/coin/CelModel.h -include/coin/CelNumVar.h -include/coin/CelNumVarArray.h -include/coin/CelVariable.h -include/coin/CelVariableArray.h -include/coin/RehearseConfig.h -lib/librehearse.so -lib/librehearse.so.0 -lib/librehearse.so.0.0.0 -libdata/pkgconfig/rehearse.pc diff --git a/net/Makefile b/net/Makefile index 91b28b6403c7..70763bc9ce88 100644 --- a/net/Makefile +++ b/net/Makefile @@ -237,7 +237,6 @@ SUBDIR += haproxy21 SUBDIR += hblock SUBDIR += hexinject - SUBDIR += hinfo SUBDIR += hlmaster SUBDIR += honeyd SUBDIR += hostapd diff --git a/net/hinfo/Makefile b/net/hinfo/Makefile deleted file mode 100644 index ce3459d29c58..000000000000 --- a/net/hinfo/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Created by: Mark Linimon <linimon@lonesome.com> -# $FreeBSD$ - -PORTNAME= hinfo -PORTVERSION= 1.0 -PORTREVISION= 4 -CATEGORIES= net perl5 -# note: the "true" MASTER_SITE is http://www.blars.org, but -# due to policies on that site, it is not reachable from the -# FreeBSD build machines. -MASTER_SITES= http://www.lonesome.com/FreeBSD/distfiles/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Utility primarily designed to find the owner of an IP block - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \ - wget:ftp/wget - -USES= perl5 shebangfix -USE_PERL5= run -SHEBANG_FILES= ${HINFO_SCRIPTS} - -DATADIR?= ${PREFIX}/lib/${PORTNAME} - -HINFO_DBFILES= dnsbl.ins.pl whois.ins.pl -# By default, we don't install myhostinfo.cgi. Install it if you wish; it'll -# already be patched for you. -HINFO_SCRIPTS= hinfo hinfo-update myhostinfo.cgi - -NO_BUILD= yes - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/hinfo ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/hinfo-update ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/hinfo.conf ${STAGEDIR}${PREFIX}/etc/hinfo.conf.sample - ${INSTALL_MAN} ${WRKSRC}/hinfo.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/hinfo.conf.5 ${STAGEDIR}${PREFIX}/man/man5/ - @${MKDIR} ${STAGEDIR}${DATADIR} -.for filename in ${HINFO_DBFILES} - ${INSTALL_DATA} ${WRKSRC}/${filename} ${STAGEDIR}${DATADIR} -.endfor - -.include <bsd.port.mk> diff --git a/net/hinfo/distinfo b/net/hinfo/distinfo deleted file mode 100644 index fb36676204cf..000000000000 --- a/net/hinfo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (hinfo-1.0.tar.gz) = 040a2f27cf45142836a8d7118f860ef96eebd445223353431f3015b48755dde8 -SIZE (hinfo-1.0.tar.gz) = 23281 diff --git a/net/hinfo/pkg-descr b/net/hinfo/pkg-descr deleted file mode 100644 index 3d1349f23eb3..000000000000 --- a/net/hinfo/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -hinfo is a utility that will display information about a host. It is -primarily designed to find the owner of an IP block in order to direct -spam complaints to where they may do some good. - -(maintainer's note: the DATAFILES are updated without the port version -necessarily being updated. Expect drift on distinfo. See hinfo-update.) - -Although the home page of the software is at www.blars.org/hinfo.html, -that page is not reachable from the FreeBSD.org domain. diff --git a/net/hinfo/pkg-plist b/net/hinfo/pkg-plist deleted file mode 100644 index 06dd5c09141b..000000000000 --- a/net/hinfo/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/hinfo -@sample etc/hinfo.conf.sample -%%DATADIR%%/dnsbl.ins.pl -%%DATADIR%%/whois.ins.pl -man/man1/hinfo.1.gz -man/man5/hinfo.conf.5.gz -sbin/hinfo-update diff --git a/science/Makefile b/science/Makefile index bd3ea9bf6524..0ed2d3ad1db1 100644 --- a/science/Makefile +++ b/science/Makefile @@ -79,7 +79,6 @@ SUBDIR += fasthenry SUBDIR += fastjet SUBDIR += fisicalab - SUBDIR += fleur SUBDIR += fsom SUBDIR += fvcom SUBDIR += fvcom-mpi @@ -139,7 +138,6 @@ SUBDIR += libvdwxc SUBDIR += libxc SUBDIR += liggghts - SUBDIR += lm SUBDIR += luscus SUBDIR += madness SUBDIR += maeparser diff --git a/science/fleur/Makefile b/science/fleur/Makefile deleted file mode 100644 index 15eb9d06fcd5..000000000000 --- a/science/fleur/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# $FreeBSD$ - -PORTNAME= fleur -DISTVERSION= 0.27-3 # Release 3 of Version 0.27 -PORTREVISION= 9 -CATEGORIES= science -MASTER_SITES= http://www.flapw.de/pm/uploads/FLEUR/ -DISTNAME= fleurMaXR${DISTVERSION:C/.*-//} - -MAINTAINER= yuri@FreeBSD.org -COMMENT= FLAPW code for atomic computations in quantum chemistry and physics - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN= Fails to build with cmake-3.16.0 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LIB_DEPENDS= libopenblas.so:math/openblas - -USES= cmake:noninja fortran gnome localbase:ldflags tar:tgz -USE_GNOME= libxml2 - -FFLAGS= -I${LOCALBASE}/include - -WRKSRC= ${WRKDIR}/${PORTNAME} - -OPTIONS_DEFINE= HDF5 MPI SCALAPACK ELPA WANNIER -OPTIONS_DEFAULT= MPI SCALAPACK ELPA WANNIER - -HDF5_CONFIGURE_ENV= FLEUR_USE_HDF5=1 HDF5_ROOT=${LOCALBASE}/lib -HDF5_CONFIGURE_ENV_OFF= FLEUR_USE_HDF5=0 -HDF5_CMAKE_ON= -DHDF5_INCLUDE_DIRS=${LOCALBASE}/include -HDF5_LDFLAGS= -lhdf5 -HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 -HDF5_BROKEN= Missing hdf5.mod in hdf5 - -MPI_CONFIGURE_ENV= FLEUR_USE_MPI=1 -MPI_CONFIGURE_ENV_OFF= FLEUR_USE_MPI=0 -MPI_LDFLAGS= -lmpich -lmpifort -MPI_LIB_DEPENDS= libmpich.so:net/mpich -MPI_PLIST_FILES= bin/fleur_MPI - -SCALAPACK_DESC= Use the ScaLAPACK Scalable LAPACK library -SCALAPACK_CMAKE_BOOL= FREEBSD_USE_SCALAPACK -SCALAPACK_LDFLAGS= -lscalapack -SCALAPACK_LIB_DEPENDS= libscalapack.so:math/scalapack -SCALAPACK_IMPLIES= MPI - -ELPA_DESC= Use libelpa, Eigenvalue SoLver for Petaflop Applications -ELPA_CMAKE_BOOL= FREEBSD_USE_ELPA -ELPA_VARS= FFLAGS+=-I${LOCALBASE}/include/elpa-2018.05.001/modules -ELPA_LDFLAGS= -lelpa -ELPA_LIB_DEPENDS= libelpa.so:math/elpa -ELPA_IMPLIES= MPI - -WANNIER_DESC= Use Wannier library -WANNIER_CONFIGURE_ENV= FLEUR_USE_WANNIER=1 -WANNIER_CONFIGURE_ENV_OFF= FLEUR_USE_WANNIER=0 -WANNIER_LDFLAGS= -lwannier -WANNIER_LIB_DEPENDS= libwannier.so:science/wannier90 - -PLIST_FILES= bin/fleur \ - bin/inpgen - -.include <bsd.port.mk> diff --git a/science/fleur/distinfo b/science/fleur/distinfo deleted file mode 100644 index 52a5a93da79f..000000000000 --- a/science/fleur/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1535917154 -SHA256 (fleurMaXR3.tgz) = 71dd93165ab9148cdab507084297becb6ad419e4c10be871c647e6e45caa185c -SIZE (fleurMaXR3.tgz) = 10118106 diff --git a/science/fleur/files/patch-cmake_tests_test__ELPA.cmake b/science/fleur/files/patch-cmake_tests_test__ELPA.cmake deleted file mode 100644 index 27ba6c8a2b3b..000000000000 --- a/science/fleur/files/patch-cmake_tests_test__ELPA.cmake +++ /dev/null @@ -1,18 +0,0 @@ ---- cmake/tests/test_ELPA.cmake.orig 2018-07-03 14:37:33 UTC -+++ cmake/tests/test_ELPA.cmake -@@ -1,6 +1,6 @@ - #First check if we can compile with ELPA - try_compile(FLEUR_USE_ELPA ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_ELPA.f90 --LINK_LIBRARIES ${FLEUR_LIBRARIES}) -+LINK_LIBRARIES ${FLEUR_LIBRARIES} -lelpa) - - if (NOT FLEUR_USE_ELPA) - set(STORE_FLAGS "${CMAKE_Fortran_FLAGS}") -@@ -63,3 +63,7 @@ LINK_LIBRARIES ${FLEUR_LIBRARIES}) - set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_ELPA" "CPP_ELPA2" "CPP_ELPA_201705003") - endif() - endif() -+ -+if (FLEUR_USE_ELPA AND NOT ${FREEBSD_USE_ELPA}) -+ set(FLEUR_USE_ELPA OFF) -+endif() diff --git a/science/fleur/files/patch-cmake_tests_test__HDF5.cmake b/science/fleur/files/patch-cmake_tests_test__HDF5.cmake deleted file mode 100644 index ee1bc05c896f..000000000000 --- a/science/fleur/files/patch-cmake_tests_test__HDF5.cmake +++ /dev/null @@ -1,45 +0,0 @@ ---- cmake/tests/test_HDF5.cmake.orig 2018-07-03 14:37:33 UTC -+++ cmake/tests/test_HDF5.cmake -@@ -1,6 +1,6 @@ - #first try if hdf already works - try_compile(FLEUR_USE_HDF5 ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_HDF5.f90 -- LINK_LIBRARIES ${FLEUR_LIBRARIES} -+ LINK_LIBRARIES ${FLEUR_LIBRARIES} -lhdf5 - ) - #now try to find the library using HDF5_ROOT variable - if (NOT FLEUR_USE_HDF5) -@@ -15,7 +15,7 @@ if (NOT FLEUR_USE_HDF5) - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -I${HDF5_INCLUDE}") - endif() - try_compile(FLEUR_USE_HDF5 ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_HDF5.f90 -- LINK_LIBRARIES ${TEST_LIBRARIES} -+ LINK_LIBRARIES ${TEST_LIBRARIES} -lhdf5 - ) - if (NOT FLEUR_USE_HDF5) - set(CMAKE_Fortran_FLAGS ${STORE_FLAGS}) -@@ -35,7 +35,7 @@ if (NOT FLEUR_USE_HDF5) - set(CMAKE_Fortran_FLAGS "-I${HDF5_INCLUDE_LIBRARIES}" ${CMAKE_Fortran_FLAGS}) - - try_compile(FLEUR_USE_HDF5 ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_HDF5.f90 -- LINK_LIBRARIES ${TEST_LIBRARIES} -+ LINK_LIBRARIES ${TEST_LIBRARIES} -lhdf5 - ) - if (${FLEUR_USE_HDF5}) - set(FLEUR_LIBRARIES ${HDF5_Fortran_LIBRARIES} ${FLEUR_LIBRARIES}) -@@ -49,14 +49,14 @@ endif() - #check if HDF is parallel - if ( FLEUR_USE_HDF5) - try_compile(FLEUR_USE_HDF5MPI ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_HDF5MPI.f90 -- LINK_LIBRARIES ${FLEUR_LIBRARIES} -+ LINK_LIBRARIES ${FLEUR_LIBRARIES} -lhdf5 - ) - endif() - - message("HDF5 Library found:${FLEUR_USE_HDF5}") - - if (DEFINED ENV{FLEUR_USE_HDF5}) -- if (ENV{FLEUR_USE_HDF5}) -+ if ($ENV{FLEUR_USE_HDF5}) - if (NOT FLEUR_USE_HDF5) - message(FATAL_ERROR "You asked for HDF5 but cmake couldn't find it. Please set HDF5_ROOT and or give additional compiler/linker flags") - endif() diff --git a/science/fleur/files/patch-cmake_tests_test__MPI.cmake b/science/fleur/files/patch-cmake_tests_test__MPI.cmake deleted file mode 100644 index 655ee6e0d2c5..000000000000 --- a/science/fleur/files/patch-cmake_tests_test__MPI.cmake +++ /dev/null @@ -1,17 +0,0 @@ ---- cmake/tests/test_MPI.cmake.orig 2018-07-03 14:37:33 UTC -+++ cmake/tests/test_MPI.cmake -@@ -1,12 +1,12 @@ - #Check if we can compile with MPI - try_compile(FLEUR_USE_MPI ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_MPI.f90 --LINK_LIBRARIES ${FLEUR_LIBRARIES} -+LINK_LIBRARIES ${FLEUR_LIBRARIES} -lmpich -lmpifort - ) - - message("MPI Library found:${FLEUR_USE_MPI}") - - if (DEFINED ENV{FLEUR_USE_MPI}) -- if (ENV{FLEUR_USE_MPI}) -+ if ($ENV{FLEUR_USE_MPI}) - if (NOT FLEUR_USE_MPI) - message(FATAL_ERROR "You asked for MPI but cmake couldn't find it. Please check your Fortran compiler settings") - endif() diff --git a/science/fleur/files/patch-cmake_tests_test__SCALAPACK.cmake b/science/fleur/files/patch-cmake_tests_test__SCALAPACK.cmake deleted file mode 100644 index 908c3e69a947..000000000000 --- a/science/fleur/files/patch-cmake_tests_test__SCALAPACK.cmake +++ /dev/null @@ -1,19 +0,0 @@ ---- cmake/tests/test_SCALAPACK.cmake.orig 2018-07-03 14:37:33 UTC -+++ cmake/tests/test_SCALAPACK.cmake -@@ -1,9 +1,13 @@ - #First check if we can compile with LAPACK - try_compile(FLEUR_USE_SCALAPACK ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_SCALAPACK.f90 --LINK_LIBRARIES ${FLEUR_LIBRARIES} -+LINK_LIBRARIES ${FLEUR_LIBRARIES} -lscalapack - ) - - message("SCALAPACK Library found:${FLEUR_USE_SCALAPACK}") - if (FLEUR_USE_SCALAPACK) - set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_SCALAPACK") --endif() -\ No newline at end of file -+endif() -+ -+if (FLEUR_USE_SCALAPACK AND NOT ${FREEBSD_USE_SCALAPACK}) -+ set(FLEUR_USE_SCALAPACK OFF) -+endif() diff --git a/science/fleur/files/patch-cmake_tests_test__Wannier90.cmake b/science/fleur/files/patch-cmake_tests_test__Wannier90.cmake deleted file mode 100644 index fd9818c9e133..000000000000 --- a/science/fleur/files/patch-cmake_tests_test__Wannier90.cmake +++ /dev/null @@ -1,17 +0,0 @@ ---- cmake/tests/test_Wannier90.cmake.orig 2018-07-03 14:37:33 UTC -+++ cmake/tests/test_Wannier90.cmake -@@ -1,12 +1,12 @@ - #first try if Wannier90 already works - try_compile(FLEUR_USE_WANN ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_Wannier90.f90 -- LINK_LIBRARIES ${FLEUR_LIBRARIES} -+ LINK_LIBRARIES ${FLEUR_LIBRARIES} -lwannier - ) - - message("Wannier90 1.2 Library found:${FLEUR_USE_WANN}") - - if (DEFINED ENV{FLEUR_USE_WANNIER}) -- if (ENV{FLEUR_USE_WANNIER}) -+ if ($ENV{FLEUR_USE_WANNIER}) - if (NOT FLEUR_USE_WANN) - message(FATAL_ERROR "You asked for Wannier90 but cmake couldn't find it. Please check your Fortran compiler settings") - endif() diff --git a/science/fleur/pkg-descr b/science/fleur/pkg-descr deleted file mode 100644 index 0717b276e387..000000000000 --- a/science/fleur/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The FLAPW-Method (Full Potential Linearized Augmented Plane Wave Method) is an -all-electron method which within density functional theory is universally -applicable to all atoms of the periodic table and to systems with compact -as well as open structures. It is widely considered to be the most precise -electronic structure method in solid state physics. - -WWW: http://www.flapw.de/pm/index.php diff --git a/science/lm/Makefile b/science/lm/Makefile deleted file mode 100644 index 2030bc5faaf3..000000000000 --- a/science/lm/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# $FreeBSD$ - -PORTNAME= lm -DISTVERSION= 2.3.0 -DISTVERSIONSUFFIX= -src -PORTREVISION= 11 -CATEGORIES= science -MASTER_SITES= http://scs.illinois.edu/schulten/${PORTNAME}/download/${PORTNAME}${DISTVERSION:R:S/.//}/ -PKGNAMESUFFIX= -uiuc - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Software for sampling trajectories of the reaction-diffusion equations - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LICENSE= UIUC_OPEN_SOURCE_LICENSE -LICENSE_NAME= University of Illinois Open Source License -LICENSE_FILE= ${WRKSRC}/LICENSE -LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell - -BUILD_DEPENDS= swig:devel/swig -LIB_DEPENDS= libhdf5.so:science/hdf5 \ - libprotobuf.so:devel/protobuf \ - libsz.so:science/szip - -USES= compiler:c++11-lang gettext-runtime gmake - -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -CXXFLAGS+= -DLINUX -MAKE_ENV= BUILD_DIR=${WRKSRC} PROTOBUF_DIR=${LOCALBASE} -USE_CXXSTD= c++11 - -OPTIONS_DEFINE= MPI PYTHON VMD -OPTIONS_DEFAULT= MPI PYTHON # VMD can't be default because VMD requires manual tarball fetch -OPTIONS_SUB= yes - -MPI_USES= fortran -MPI_VARS= XUSE_MPI=1 -MPI_VARS_OFF= XUSE_MPI=0 -MPI_LIB_DEPENDS= libmpich.so:net/mpich - -PYTHON_USES= python -PYTHON_VARS= XUSE_PYTHON=1 -PYTHON_VARS_OFF= XUSE_PYTHON=0 -PYTHON_CXXFLAGS= -I${PYTHON_SITELIBDIR}/numpy/core/include -PYTHON_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy/core/include/numpy/arrayobject.h:math/py-numpy@${PY_FLAVOR} - -VMD_DESC= Build the VMD plugin -VMD_VARS_OFF= XUSE_VMD=0 -VMD_VARS= XUSE_VMD=1 VMD_ARCH=${ARCH:S/amd64/FREEBSDAMD64/:S/${ARCH}/FREEBSD/} -VMD_BUILD_DEPENDS= ${LOCALBASE}/vmd/plugins/${VMD_ARCH}/molfile/libmolfile_plugin.h:science/vmd -VMD_PLIST_SUB= VMD_ARCH=${VMD_ARCH} - -post-patch: - @${CP} ${WRKSRC}/docs/config/local.mk.linux ${WRKSRC}/local.mk - @${REINPLACE_CMD} -i '' ' \ - s|USE_MPI := 0|USE_MPI := ${XUSE_MPI}|; \ - s|USE_PYTHON := 1|USE_PYTHON := ${XUSE_PYTHON}|; \ - s|USE_VMD := 1|USE_VMD := ${XUSE_VMD}|; \ - s|USE_CUDA := 1|USE_CUDA := 0|; \ - s|/usr/local|${LOCALBASE}|; \ - s|INSTALL_PREFIX := /opt/lm|INSTALL_PREFIX := ${STAGEDIR}${PREFIX}|; \ - s|BUILD_DIR := Build-linux|BUILD_DIR := Build-freebsd|; \ - s|CCFLAGS := -m64 -O2|CCFLAGS := $$(CXXFLAGS)|; \ - s|gcc|${CC}|; \ - s|g++|${CXX}|; \ - s| -lrt||' \ - ${WRKSRC}/local.mk - -post-patch-MPI-on: - @${REINPLACE_CMD} -i '' ' \ - s|MPI_COMPILE_FLAGS = .*|MPI_COMPILE_FLAGS =|; \ - s|MPI_LINK_FLAGS = .*|MPI_LINK_FLAGS = -lmpich ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so|' \ - ${WRKSRC}/local.mk - -post-patch-PYTHON-on: - @${REINPLACE_CMD} -i '' 's|python-config|${PYTHON_CMD}-config|' ${WRKSRC}/local.mk - -post-patch-VMD-on: - @${REINPLACE_CMD} -i '' 's|LINUXAMD64|${VMD_ARCH}|' ${WRKSRC}/local.mk - -.include <bsd.port.mk> diff --git a/science/lm/distinfo b/science/lm/distinfo deleted file mode 100644 index 8ce75f7be4ea..000000000000 --- a/science/lm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1536517852 -SHA256 (lm-2.3.0-src.tar.gz) = c1a7908997e46c6590e179a4a269cbaddaab8533c7b9b3c9ff2297f5fd6dbe0c -SIZE (lm-2.3.0-src.tar.gz) = 7657245 diff --git a/science/lm/files/patch-Makefile b/science/lm/files/patch-Makefile deleted file mode 100644 index 337fe89d34b4..000000000000 --- a/science/lm/files/patch-Makefile +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.orig 2016-12-06 05:23:11 UTC -+++ Makefile -@@ -282,21 +282,23 @@ installlm: - install -d $(INSTALL_PREFIX)/bin - install -m 0755 $(MAIN) $(UTIL_BINS) $(INSTALL_PREFIX)/bin - @echo 'Installing LM libraries' -+ifeq ($(USE_PYTHON),1) - install -d $(INSTALL_PREFIX)/lib/lm - install -m 0644 $(INSTALL_LIBS) $(INSTALL_PREFIX)/lib/lm - install -d $(INSTALL_PREFIX)/lib/python/pySTDLM - install -d $(INSTALL_PREFIX)/lib/python/pyLM - install -m 0644 ./src/python/pyLM/* $(INSTALL_PREFIX)/lib/python/pyLM - install -m 0644 ./src/python/pySTDLM/* $(INSTALL_PREFIX)/lib/python/pySTDLM -+endif - ifeq ($(USE_MPI),1) -- install -m 0755 lm-mpmpd $(INSTALL_PREFIX)/bin -+ install -m 0755 ./$(BUILD_DIR)/lm-mpmpd $(INSTALL_PREFIX)/bin - endif - - - installvmd: - @echo 'Installing VMD plugin' -- install -d $(VMD_INSTALL_DIR) -- install -m 0644 $(VMD_PLUGIN) $(VMD_INSTALL_DIR) -+ install -d $(DESTDIR)$(VMD_INSTALL_DIR) -+ install -m 0644 $(VMD_PLUGIN) $(DESTDIR)$(VMD_INSTALL_DIR) - - # Build a distribution package. - dist: diff --git a/science/lm/files/patch-src_c_lm_main_Main.cpp b/science/lm/files/patch-src_c_lm_main_Main.cpp deleted file mode 100644 index 912ba029e793..000000000000 --- a/science/lm/files/patch-src_c_lm_main_Main.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- src/c/lm/main/Main.cpp.orig 2018-09-09 19:24:07 UTC -+++ src/c/lm/main/Main.cpp -@@ -49,6 +49,9 @@ - #include <sys/stat.h> - #if defined(MACOSX) - #include <sys/sysctl.h> -+#elif defined(__FreeBSD__) -+#include <sys/types.h> -+#include <sys/sysctl.h> - #elif defined(LINUX) - #include <sys/sysinfo.h> - #endif -@@ -110,6 +113,11 @@ int getPhysicalCpuCores() - size_t physicalCpuCoresSize=sizeof(physicalCpuCores); - sysctlbyname("hw.activecpu",&physicalCpuCores,&physicalCpuCoresSize,NULL,0); - return physicalCpuCores; -+ #elif defined(__FreeBSD__) -+ int np = 0; -+ size_t len = sizeof(np); -+ sysctlbyname("hw.ncpu",&np,&len,NULL,0); -+ return np; - #elif defined(LINUX) - #ifdef ARM - return get_nprocs_conf(); diff --git a/science/lm/files/patch-src_c_lm_main_runSimulation.cpp b/science/lm/files/patch-src_c_lm_main_runSimulation.cpp deleted file mode 100644 index 0774fcaac549..000000000000 --- a/science/lm/files/patch-src_c_lm_main_runSimulation.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- src/c/lm/main/runSimulation.cpp.orig 2018-09-09 19:31:22 UTC -+++ src/c/lm/main/runSimulation.cpp -@@ -45,6 +45,9 @@ - */ - #if defined(MACOSX) - #include <sys/sysctl.h> -+#elif defined(__FreeBSD__) -+#include <sys/types.h> -+#include <sys/sysctl.h> - #elif defined(LINUX) - #include <sys/sysinfo.h> - #endif -@@ -149,6 +152,9 @@ void runSolver(char *simulationFilename, - size_t physicalCpuCoresSize=sizeof(physicalCpuCores); - sysctlbyname("hw.activecpu",&physicalCpuCores,&physicalCpuCoresSize,NULL,0); - numberCpuCores = physicalCpuCores; -+#elif defined(__FreeBSD__) -+ size_t len = sizeof(numberCpuCores); -+ sysctlbyname("hw.ncpu",&numberCpuCores,&len,NULL,0); - #elif defined(LINUX) - #ifdef ARM - numberCpuCores = get_nprocs_conf(); diff --git a/science/lm/files/patch-src_c_lm_rng_XORShift.cpp b/science/lm/files/patch-src_c_lm_rng_XORShift.cpp deleted file mode 100644 index fd468235ae52..000000000000 --- a/science/lm/files/patch-src_c_lm_rng_XORShift.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/c/lm/rng/XORShift.cpp.orig 2018-09-09 20:03:05 UTC -+++ src/c/lm/rng/XORShift.cpp -@@ -42,6 +42,11 @@ - #include "lm/rng/RandomGenerator.h" - #include "lm/rng/XORShift.h" - -+// sincos doesn't exist on all current (2018-08) FreeBSD versions -+#if defined(__FreeBSD__) -+# define sincos(x,s,c) *s = sin(x); *c = cos(x); -+#endif -+ - namespace lm { - namespace rng { - diff --git a/science/lm/files/patch-src_c_lm_thread_Thread.cpp b/science/lm/files/patch-src_c_lm_thread_Thread.cpp deleted file mode 100644 index edcbfccaa110..000000000000 --- a/science/lm/files/patch-src_c_lm_thread_Thread.cpp +++ /dev/null @@ -1,36 +0,0 @@ ---- src/c/lm/thread/Thread.cpp.orig 2018-09-09 19:28:35 UTC -+++ src/c/lm/thread/Thread.cpp -@@ -40,6 +40,7 @@ - #include <pthread.h> - #include "lm/Print.h" - #include "lm/thread/Thread.h" -+#include <pthread_np.h> - - namespace lm { - namespace thread { -@@ -72,10 +73,10 @@ void Thread::setAffinity(int cpuNumber) - if (running) - { - #if defined(LINUX) && !defined(ARM) -- cpu_set_t cpuset; -+ cpuset_t cpuset; - CPU_ZERO(&cpuset); - CPU_SET(cpuNumber, &cpuset); -- if (pthread_setaffinity_np(threadId, sizeof(cpu_set_t), &cpuset) != 0) -+ if (pthread_setaffinity_np(threadId, sizeof(cpuset_t), &cpuset) != 0) - Print::printf(Print::WARNING, "Could not bind thread %u to CPU core %d", threadId, cpuNumber); - #endif - } -@@ -100,10 +101,10 @@ void Thread::start() throw(PthreadExcept - if (cpuNumber >= 0) - { - #if defined(LINUX) && !defined(ARM) -- cpu_set_t cpuset; -+ cpuset_t cpuset; - CPU_ZERO(&cpuset); - CPU_SET(cpuNumber, &cpuset); -- if (pthread_setaffinity_np(threadId, sizeof(cpu_set_t), &cpuset) != 0) -+ if (pthread_setaffinity_np(threadId, sizeof(cpuset_t), &cpuset) != 0) - Print::printf(Print::WARNING, "Could not bind thread %u to CPU core %d", threadId, cpuNumber); - #endif - } diff --git a/science/lm/files/patch-src_swig_lm.i b/science/lm/files/patch-src_swig_lm.i deleted file mode 100644 index 61ef40d8dae0..000000000000 --- a/science/lm/files/patch-src_swig_lm.i +++ /dev/null @@ -1,11 +0,0 @@ ---- src/swig/lm.i.orig 2018-09-09 20:47:46 UTC -+++ src/swig/lm.i -@@ -66,7 +66,7 @@ using lm::rdme::InvalidParticleException - %} - - %inline %{ --typedef long time_t; -+//typedef long time_t; - typedef unsigned char uchar; - typedef unsigned int uint; - typedef unsigned long ulong; diff --git a/science/lm/pkg-descr b/science/lm/pkg-descr deleted file mode 100644 index 775688ad57b8..000000000000 --- a/science/lm/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Lattice Microbes is a software package for efficiently sampling trajectories -from the chemical and reaction-diffusion master equations (CME/RDME) on high -performance computing (HPC) infrastructure using both exact and approximate -methods. pyLM is a problem solving environment written in Python that leverages -the high-performance nature of the Lattice Microbes package while providing ease -of use for common stochastic simulations and high customizability for complex -biological applications. - -WWW: http://www.scs.illinois.edu/schulten/lm/ diff --git a/science/lm/pkg-plist b/science/lm/pkg-plist deleted file mode 100644 index b1a2790f2c63..000000000000 --- a/science/lm/pkg-plist +++ /dev/null @@ -1,26 +0,0 @@ -bin/lm -%%MPI%%bin/lm-mpmpd -%%PYTHON%%bin/lm_python -bin/lm_setdm -bin/lm_setp -bin/lm_setrm -%%PYTHON%%lib/lm/_lm.so -%%PYTHON%%lib/lm/lm.py -%%PYTHON%%lib/python/pyLM/CME.py -%%PYTHON%%lib/python/pyLM/LMLogger.py -%%PYTHON%%lib/python/pyLM/RDME.py -%%PYTHON%%lib/python/pyLM/__init__.py -%%PYTHON%%lib/python/pyLM/ipyInterface.py -%%PYTHON%%lib/python/pyLM/units.py -%%PYTHON%%lib/python/pySTDLM/CellArranger.py -%%PYTHON%%lib/python/pySTDLM/Cells.py -%%PYTHON%%lib/python/pySTDLM/Distributions.py -%%PYTHON%%lib/python/pySTDLM/NetworkVisualization.py -%%PYTHON%%lib/python/pySTDLM/OnTheFly.py -%%PYTHON%%lib/python/pySTDLM/PostProcessing.py -%%PYTHON%%lib/python/pySTDLM/SBMLReader.py -%%PYTHON%%lib/python/pySTDLM/StandardCells.py -%%PYTHON%%lib/python/pySTDLM/StandardReactionSystems.py -%%PYTHON%%lib/python/pySTDLM/StandardReactions.py -%%PYTHON%%lib/python/pySTDLM/__init__.py -%%VMD%%lib/vmd/plugins/%%VMD_ARCH%%/molfile/lmplugin.so diff --git a/security/Makefile b/security/Makefile index 89867a7f1f28..3101e6f3d09a 100644 --- a/security/Makefile +++ b/security/Makefile @@ -118,7 +118,6 @@ SUBDIR += cyrus-sasl2-srp SUBDIR += d0_blind_id SUBDIR += dcetest - SUBDIR += ddos_scan SUBDIR += dehydrated SUBDIR += denyhosts SUBDIR += destroy @@ -169,7 +168,6 @@ SUBDIR += fwbuilder SUBDIR += fwknop SUBDIR += fwlogwatch - SUBDIR += gag SUBDIR += gcr SUBDIR += gef SUBDIR += git-crypt @@ -907,7 +905,6 @@ SUBDIR += py-kerberos SUBDIR += py-keyring SUBDIR += py-keyrings.alt - SUBDIR += py-keystone SUBDIR += py-libnacl SUBDIR += py-m2crypto SUBDIR += py-maec diff --git a/security/ddos_scan/Makefile b/security/ddos_scan/Makefile deleted file mode 100644 index 9c469c7ea0cf..000000000000 --- a/security/ddos_scan/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Created by: David O'Brien (obrien@NUXI.com) -# $FreeBSD$ - -PORTNAME= ddos_scan -PORTVERSION= 1.6 -PORTREVISION= 1 -CATEGORIES= security -MASTER_SITES= http://staff.washington.edu/dittrich/misc/ -DISTNAME= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Scans for a limited set of distributed denial of service agents - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -USES= tar -ALL_TARGET= dds - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/dds ${STAGEDIR}${PREFIX}/sbin - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/security/ddos_scan/distinfo b/security/ddos_scan/distinfo deleted file mode 100644 index 2de91c0a6b08..000000000000 --- a/security/ddos_scan/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (ddos_scan.tar) = 7592d88edef9c9d6af9e53706c84bb534c156f10fa6bda91891ab0e00c0e7b11 -SIZE (ddos_scan.tar) = 30720 diff --git a/security/ddos_scan/files/patch-Makefile b/security/ddos_scan/files/patch-Makefile deleted file mode 100644 index ce513749e862..000000000000 --- a/security/ddos_scan/files/patch-Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.orig Mon Jan 10 13:14:31 2000 -+++ Makefile Sun May 11 18:46:35 2003 -@@ -1,10 +1,10 @@ - # Makefile for ddos_scan (dds). - # $Revision: 1.1 $ - --CFLAGS= -+#CFLAGS= - - # For Solaris 2.5.1 and above, uncomment the following line. --LIBS=-lresolv -lsocket -lnsl -+#LIBS=-lresolv -lsocket -lnsl - - default: - @clear -@@ -14,7 +14,7 @@ - @echo "to suit your operating system, then use 'make dds'" - - dds: dds.o -- $(CC) -o dds dds.c $(LIBS) -+ $(CC) -o dds dds.o $(LIBS) - - # This assumes the source is in a directory named "ddos_scan". - tar: ddos_scan.tar diff --git a/security/ddos_scan/files/patch-dds.c b/security/ddos_scan/files/patch-dds.c deleted file mode 100644 index 867ec8295594..000000000000 --- a/security/ddos_scan/files/patch-dds.c +++ /dev/null @@ -1,22 +0,0 @@ ---- dds.c.orig Sun May 11 18:44:07 2003 -+++ dds.c Sun May 11 18:48:34 2003 -@@ -12,8 +12,7 @@ - * David Brumley <dbrumley@rtfm.stanford.edu> - */ - --#if YOU_HAVE_NOT_READ_THIS_YET -- -+/* - This software should only be used in compliance with all applicable laws and - the policies and preferences of the owners of any networks, systems, or hosts - scanned with the software -@@ -30,8 +29,7 @@ - DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING - OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- --#endif -+*/ - - #define VERSION "$Revision: 1.6 $" - diff --git a/security/ddos_scan/pkg-descr b/security/ddos_scan/pkg-descr deleted file mode 100644 index de99805f3fc4..000000000000 --- a/security/ddos_scan/pkg-descr +++ /dev/null @@ -1,21 +0,0 @@ -"dds" is a program to scan for a limited set of distributed denial of -service (ddos) agents. - -At present, it scans for active instances of "trinoo", "Tribe Flood -Network" ("TFN") and "stacheldraht" agents, which were compiled -using the default values in known source distributions, such as those -found at: - - http://packetstorm.securify.com/distributed/ - -It will *not* detect TFN2K agents. - -For analyses of the three distributed denial of service attack -tools it scans for, and the methods being used by dds to identify -them, see: - - http://staff.washington.edu/dittrich/misc/trinoo.analysis - http://staff.washington.edu/dittrich/misc/tfn.analysis - http://staff.washington.edu/dittrich/misc/stacheldraht.analysis - -WWW: http://staff.washington.edu/dittrich/misc/ddos/ diff --git a/security/ddos_scan/pkg-plist b/security/ddos_scan/pkg-plist deleted file mode 100644 index d9b2885b545d..000000000000 --- a/security/ddos_scan/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -sbin/dds -%%PORTDOCS%%%%DOCSDIR%%/README diff --git a/security/gag/Makefile b/security/gag/Makefile deleted file mode 100644 index de3a43ddb61c..000000000000 --- a/security/gag/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: David O'Brien (obrien@NUXI.com) -# $FreeBSD$ - -PORTNAME= gag -PORTVERSION= 2.9 -CATEGORIES= security -MASTER_SITES= http://staff.washington.edu/dittrich/misc/ -DISTNAME= sickenscan -EXTRACT_SUFX= .tar - -MAINTAINER= ports@FreeBSD.org -COMMENT= Stacheldraht (DOS attack) agent detector - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -ALL_TARGET= gag - -PORTDOCS= README -PLIST_FILES= sbin/gag - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gag ${STAGEDIR}${PREFIX}/sbin - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/security/gag/distinfo b/security/gag/distinfo deleted file mode 100644 index 581ff68b06b5..000000000000 --- a/security/gag/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (sickenscan.tar) = b0f740f0a2c4c292899e491aab2e76e05ff0b58eb4d34c4230be4291e2288b97 -SIZE (sickenscan.tar) = 30720 diff --git a/security/gag/files/patch-Makefile b/security/gag/files/patch-Makefile deleted file mode 100644 index ef1fe1912134..000000000000 --- a/security/gag/files/patch-Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.orig 2000-01-10 21:13:12 UTC -+++ Makefile -@@ -1,7 +1,7 @@ --CFLAGS= -+#CFLAGS= - - # For Solaris 2.5.1 and above, uncomment the following line. --LIBS=-lresolv -lsocket -lnsl -+#LIBS=-lresolv -lsocket -lnsl - - default: - @clear -@@ -11,7 +11,7 @@ default: - @echo "to suit your operating system, then use 'make gag'" - - gag: gag.o -- $(CC) -o gag gag.c $(LIBS) -+ $(CC) -o gag gag.o $(LIBS) - - # This assumes the source is in a directory named "sickenscan". - tar: sickenscan.tar diff --git a/security/gag/files/patch-gag.c b/security/gag/files/patch-gag.c deleted file mode 100644 index 1ef4a13487b9..000000000000 --- a/security/gag/files/patch-gag.c +++ /dev/null @@ -1,22 +0,0 @@ ---- gag.c.orig 2000-01-10 21:03:15 UTC -+++ gag.c -@@ -16,8 +16,7 @@ - * - */ - --#if YOU_HAVE_NOT_READ_THIS_YET -- -+/* - This software should only be used in compliance with all applicable laws and - the policies and preferences of the owners of any networks, systems, or hosts - scanned with the software -@@ -34,8 +33,7 @@ WASHINGTON BE LIABLE FOR ANY SPECIAL, IN - DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING - OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- --#endif -+*/ - - #define GAG "gesundheit!" - #define VERSION "$Revision: 2.9 $" diff --git a/security/gag/pkg-descr b/security/gag/pkg-descr deleted file mode 100644 index 54749887232d..000000000000 --- a/security/gag/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -"gag" is a program to scan for "stacheldraht" agents, which are part -of an active "stacheldraht" network. It will not detect trinoo, -the original Tribe Flood Network (TFN), or TFN2K agents. For methods -of detecting trinoo and Tribe Flood Network, see: - - http://staff.washington.edu/dittrich/misc/trinoo.analysis - http://staff.washington.edu/dittrich/misc/tfn.analysis - -(Why "gag"? Its supposed to be a running joke I started in the trinoo -analysis. trinoo/trinot, "tribe"/civilize, gag/sicken&gesundheit!. -Read the ddos trilogy to find out!) diff --git a/security/py-keystone/Makefile b/security/py-keystone/Makefile deleted file mode 100644 index a42e32beea52..000000000000 --- a/security/py-keystone/Makefile +++ /dev/null @@ -1,141 +0,0 @@ -# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com> -# $FreeBSD$ - -PORTNAME= keystone -PORTVERSION= 13.0.0 -PORTREVISION= 1 -CATEGORIES= security python -MASTER_SITES= https://tarballs.openstack.org/keystone/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= OpenStack Identity - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Paste>=2.0.2:www/py-paste@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}routes>=2.3.1:www/py-routes@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.9:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.0.10:databases/py-sqlalchemy12@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.11.0:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}passlib>=1.7.0:security/py-passlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=4.17.0:devel/py-keystonemiddleware@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.3:security/py-bcrypt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}scrypt>=0.8.0:security/py-scrypt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.26.0:devel/py-oslo.cache@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.29.0:devel/py-oslo.messaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.db>=4.27.0:devel/py-oslo.db@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.31.0:devel/py-oslo.middleware@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.30.0:devel/py-oslo.policy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6.0:security/py-oauthlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.6.0:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pycadf>=1.1.0:devel/py-pycadf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${PY_FLAVOR} - -USES= python:3.6+ -USE_PYTHON= autoplist distutils -NO_ARCH= yes - -USERS= keystone -GROUPS= keystone - -PORTDOCS= * -PORTEXAMPLES= examples/* httpd/* playbooks/* - -SUB_FILES= pkg-message -SUB_LIST= EXAMPLESDIR=${EXAMPLESDIR} PREFIX=${PREFIX} - -CONFLICTS_INSTALL= py??-keystone-* - -PORTSCOUT= limit:^[0-9][0-9]\. - -OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_GROUP= MISC -OPTIONS_GROUP_MISC= LDAP MEMCACHED MONGODB -OPTIONS_RADIO= DB -OPTIONS_RADIO_DB= MYSQL PGSQL - -LDAP_DESC= LDAP support -MEMCACHED_DESC= memcached support -MONGODB_DESC= MongoDB support (used for messaging services) -MYSQL_DESC= MySQL/MariaDB support -PGSQL_DESC= PostgreSQL support - -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ - ${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=1.18.1:textproc/py-openstackdocstheme@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}reno>=2.5.0:textproc/py-reno@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.20:net/py-ldap@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}testtools>=2.2.0:devel/py-testtools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}os-api-ref>=1.4.0:textproc/py-os-api-ref@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}WebTest>=2.0.27:www/py-WebTest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.6:devel/py-freezegun@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}flake8-docstrings>=0.2.1:devel/py-flake8-docstrings@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslotest>=3.2.0:devel/py-oslotest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.db>=4.27.0:devel/py-oslo.db@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ldappool>=2.0.0:net/py-ldappool@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}osprofiler>=0:devel/py-osprofiler@${PY_FLAVOR} \ - ${RUN_DEPENDS} -DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" -LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.20:net/py-ldap@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ldappool>=2.0.0:net/py-ldappool@${PY_FLAVOR} -MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.56:databases/py-python-memcached@${PY_FLAVOR} -MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0.2:databases/pymongo@${PY_FLAVOR} -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_FLAVOR} -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR} - -post-patch: - @${REINPLACE_CMD} -Ee 's|(pysaml2)<4.0.3,|\1|' ${WRKSRC}/requirements.txt - @${GREP} -Rl -e '/etc/keystone/' --null \ - ${WRKSRC}/etc ${WRKSRC}/doc ${WRKSRC}/keystone | \ - ${XARGS} -0 ${REINPLACE_CMD} -i '' -Ee \ - "s|/etc/keystone/|${ETCDIR}/|g" - - @${GREP} -Rl -e '/var/log/apache2/' --null \ - ${WRKSRC}/doc ${WRKSRC}/httpd | \ - ${XARGS} -0 ${REINPLACE_CMD} -i '' -Ee \ - "s|(/var/log)/apache2|\1|g" - -post-install: - @${MKDIR} ${STAGEDIR}${ETCDIR} - (cd ${WRKSRC}/etc && for f in *; do \ - ${INSTALL_DATA} $${f} ${STAGEDIR}${ETCDIR}; done) - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc/build/html && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ - "! -name .buildinfo -and ! -name objects.inv") - -post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.for dir in ${PORTEXAMPLES:C/\/\*//} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${dir} - (cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/${dir}) -.endfor - -.include <bsd.port.mk> diff --git a/security/py-keystone/distinfo b/security/py-keystone/distinfo deleted file mode 100644 index 57b06c5d0610..000000000000 --- a/security/py-keystone/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1527285271 -SHA256 (keystone-13.0.0.tar.gz) = 34f8839c4ebd49c350ccd595eb52cd3bf711e3d51c64c3c91eb465cb650a4b56 -SIZE (keystone-13.0.0.tar.gz) = 1462543 diff --git a/security/py-keystone/files/pkg-message.in b/security/py-keystone/files/pkg-message.in deleted file mode 100644 index 36d16daf0137..000000000000 --- a/security/py-keystone/files/pkg-message.in +++ /dev/null @@ -1,128 +0,0 @@ -[ -{ type: install - message: <<EOM -================== - 1. Prerequisites -================== - -On the system where Keystone will run: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- a httpd service, e.g. apache, in conjunction with mod_wsgi or - mod_proxy_uswgi is required to make Keystone available. -- Please have a look in %%EXAMPLESDIR%%/httpd - for some example configurations. - -On the system that will be used to manage the Keystone service: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- create an normal user -- install the OpenStack client (net/py-python-openstackclient) - -=================================== - 2. Configure the Keystone service -=================================== - -Edit %%PREFIX%%/etc/keystone/keystone.conf . - -Database access: -~~~~~~~~~~~~~~~~ - -In the [database] section, set the location for the database. Please make sure, -that you use an absolute path otherwise Keystone won't work properly. - -[database] -# ... -connection = sqlite:////var/lib/keystone/keystone.db - -Token provider: -~~~~~~~~~~~~~~~ - -In the [token] section, configure the Fernet token provider: - -[token] -# ... -provider = fernet - -=========================================== - 3. Populate the Identity service database -=========================================== - -# su -m keystone -c "keystone-manage db_sync" - -======================================= - 4. Initialize Fernet key repositories -======================================= - -The key repositories will be placed by default in: - -- %%PREFIX%%/etc/keystone/credential-keys/ -- %%PREFIX%%/etc/keystone/fernet-keys/ - -# keystone-manage fernet_setup --keystone-user keystone \ - --keystone-group keystone - -# keystone-manage credential_setup --keystone-user keystone \ - --keystone-group keystone - -=================================== - 5. Bootstrap the Identity service -=================================== - -# keystone-manage bootstrap --bootstrap-password ADMIN_PASS \ - --bootstrap-admin-url http://HOSTNAME:35357/v3/ \ - --bootstrap-internal-url http://HOSTNAME:5000/v3/ \ - --bootstrap-public-url http://HOSTNAME:5000/v3/ \ - --bootstrap-region-id RegionOne - -============================= - 6. Configure the web server -============================= - -Refer to the example configuration files in -%%EXAMPLESDIR%%/httpd - -============================= - 7. Configure the admin user -============================= - -Login with the user that should be used for the administrative tasks and set the -environment variables as listed below: - -$ export OS_USERNAME=admin -$ export OS_PASSWORD=ADMIN_PASS -$ export OS_PROJECT_NAME=admin -$ export OS_USER_DOMAIN_NAME=Default -$ export OS_PROJECT_DOMAIN_NAME=Default -$ export OS_AUTH_URL=http://HOSTNAME:35357/v3 -$ export OS_IDENTITY_API_VERSION=3 - -=============================================== - 8. Create a domain, projects, users and roles -=============================================== - -$ openstack domain create --description "An Example Domain" example - -$ openstack project create --domain default \ - --description "Service project" service - -$ openstack project create --domain default \ - --description "Demo Project" demo - -$ openstack user create --domain default \ - --password-prompt demo - -===================== - 9. Verify operation -===================== - -$ unset OS_AUTH_URL OS_PASSWORD - -$ openstack --os-auth-url http://HOSTNAME:35357/v3 \ - --os-project-domain-name Default --os-user-domain-name Default \ - --os-project-name admin --os-username admin token issue - -$ openstack --os-auth-url http://HOSTNAME:5000/v3 \ - --os-project-domain-name Default --os-user-domain-name Default \ - --os-project-name demo --os-username demo token issue -EOM -} -] diff --git a/security/py-keystone/pkg-descr b/security/py-keystone/pkg-descr deleted file mode 100644 index d090d055149a..000000000000 --- a/security/py-keystone/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Keystone provides authentication, authorization and service discovery -mechanisms via HTTP primarily for use by projects in the OpenStack family. - -It is most commonly deployed as an HTTP interface to existing identity systems, -such as LDAP. - -WWW: https://docs.openstack.org/keystone/ diff --git a/security/py-keystone/pkg-plist b/security/py-keystone/pkg-plist deleted file mode 100644 index 64bdb4c791fb..000000000000 --- a/security/py-keystone/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -@owner keystone -@dir %%ETCDIR%% -@sample %%ETCDIR%%/keystone.conf.sample -@sample %%ETCDIR%%/logging.conf.sample -%%ETCDIR%%/default_catalog.templates -%%ETCDIR%%/policy.v3cloudsample.json diff --git a/sysutils/Makefile b/sysutils/Makefile index e65a0ab59d58..323b8fbd3805 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -687,7 +687,6 @@ SUBDIR += monit SUBDIR += monitord SUBDIR += monitorix - SUBDIR += mono-kmod SUBDIR += moosefs2-cgi SUBDIR += moosefs2-cgiserv SUBDIR += moosefs2-chunkserver diff --git a/sysutils/mono-kmod/Makefile b/sysutils/mono-kmod/Makefile deleted file mode 100644 index f5e8480a1ab6..000000000000 --- a/sysutils/mono-kmod/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# Created by: bkoenig@cs.tu-berlin.de -# $FreeBSD$ - -PORTNAME= mono-kmod -PORTVERSION= 20070416 -CATEGORIES= sysutils -MASTER_SITES= http://www.alpha-tierchen.de/pub/FreeBSD/ports/distfiles/ - -MAINTAINER= bkoenig@alpha-tierchen.de -COMMENT= Execute .NET applications from command line - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -ONLY_FOR_ARCHS= amd64 arm i386 - -DEPRECATED= mastersite disappeared, unfetchable - -SUB_FILES= pkg-message - -USES= kmod uidfix tar:bzip2 - -PLIST_FILES= ${KMODDIR}/mono.ko - -.include <bsd.port.mk> diff --git a/sysutils/mono-kmod/distinfo b/sysutils/mono-kmod/distinfo deleted file mode 100644 index a289fc987e14..000000000000 --- a/sysutils/mono-kmod/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mono-kmod-20070416.tar.bz2) = 60184982ae9e977330356e54a0c51867bc75c257c1089d198e38eccc18dda326 -SIZE (mono-kmod-20070416.tar.bz2) = 2171 diff --git a/sysutils/mono-kmod/files/pkg-message.in b/sysutils/mono-kmod/files/pkg-message.in deleted file mode 100644 index fc370e642bd3..000000000000 --- a/sysutils/mono-kmod/files/pkg-message.in +++ /dev/null @@ -1,13 +0,0 @@ -[ -{ type: install - message: <<EOM -Add mono_load="YES" to /boot/loader.conf to load the kernel module -automatically. - -The default path of Mono is %%LOCALBASE%%/bin/mono. You can specify an -alternate path by adding a line to /etc/sysctl.conf: - - kern.mono.path=/path/to/mono -EOM -} -] diff --git a/sysutils/mono-kmod/pkg-descr b/sysutils/mono-kmod/pkg-descr deleted file mode 100644 index 35ed95bc415b..000000000000 --- a/sysutils/mono-kmod/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -mono-kmod is a FreeBSD kernel module enables you to execute ECMA and -.NET applications without preceding the native code generator in the -command line. That means you can call a binary with "./hello.exe" -instead of "mono hello.exe". diff --git a/x11-themes/Makefile b/x11-themes/Makefile index a457805d56d2..ed6629e745c4 100644 --- a/x11-themes/Makefile +++ b/x11-themes/Makefile @@ -64,7 +64,6 @@ SUBDIR += gtk-aluminumalloy-volcanic-theme SUBDIR += gtk-aquaextremesunken-theme SUBDIR += gtk-arc-themes - SUBDIR += gtk-cleanice-engine SUBDIR += gtk-digital-cream-theme SUBDIR += gtk-digital-harmony-theme SUBDIR += gtk-engines2 diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile deleted file mode 100644 index 0afc9ad9534a..000000000000 --- a/x11-themes/gtk-cleanice-engine/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# Created by: Philip Paeps <philip@paeps.cx> -# $FreeBSD$ - -PORTNAME= gtk-cleanice-engine -PORTVERSION= 2.4.1 -PORTREVISION= 7 -CATEGORIES= x11-themes gnome -MASTER_SITES= SF/elysium-project/gtk-engines-cleanice/${PORTVERSION} \ - SF/elysium-project/gtk-engines-cleanice/1.2.7:theme -DISTNAME= gtk-engines-cleanice-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${THEME}${EXTRACT_SUFX}:theme - -MAINTAINER= ports@FreeBSD.org -COMMENT= Simplistic GTK+ 2.x theme engine - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -USES= gnome libtool pathfix pkgconfig -GNU_CONFIGURE= yes -USE_GNOME= gtk20 -INSTALL_TARGET= install-strip - -THEME= cleanice-theme-1.2.7 -THEMEDIR= ${WRKDIR}/${THEME}/Theme - -post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/CleanIce - ${INSTALL_DATA} ${THEMEDIR}/cleanice/index.theme \ - ${STAGEDIR}${PREFIX}/share/themes/CleanIce - @${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/CleanIce/gtk-2.0 - ${INSTALL_DATA} ${THEMEDIR}/cleanice/gtkrc \ - ${STAGEDIR}${PREFIX}/share/themes/CleanIce/gtk-2.0 - @${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/CleanIce/metacity-1 - ${INSTALL_DATA} ${THEMEDIR}/cleanice/metacity-theme-1.xml \ - ${STAGEDIR}${PREFIX}/share/themes/CleanIce/metacity-1 - @${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/CleanIce-Dark/gtk-2.0 - ${INSTALL_DATA} ${THEMEDIR}/cleanice-dark/gtkrc \ - ${STAGEDIR}${PREFIX}/share/themes/CleanIce-Dark/gtk-2.0 - -.include <bsd.port.mk> diff --git a/x11-themes/gtk-cleanice-engine/distinfo b/x11-themes/gtk-cleanice-engine/distinfo deleted file mode 100644 index 2f33ab29e9f2..000000000000 --- a/x11-themes/gtk-cleanice-engine/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (gtk-engines-cleanice-2.4.1.tar.gz) = f927f7b06b979ced52cc11e3febecffc3f1aaca07a78c9d0aada31f25c48fb0d -SIZE (gtk-engines-cleanice-2.4.1.tar.gz) = 329188 -SHA256 (cleanice-theme-1.2.7.tar.gz) = 0be0da024d53acbc3ad0a5a7276e049b27432e75ba527cc17576a2f77685509e -SIZE (cleanice-theme-1.2.7.tar.gz) = 237813 diff --git a/x11-themes/gtk-cleanice-engine/pkg-descr b/x11-themes/gtk-cleanice-engine/pkg-descr deleted file mode 100644 index a880f1de24e7..000000000000 --- a/x11-themes/gtk-cleanice-engine/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -CleanIce is a simplistic, semi-flat theme engine for GTK+ 2.x, based on the -ThinIce and Clean engines of old. The GTK+ 2.x engine has many benefits over -the original theme. The arrows are more consistent, the colors are slightly -revised to be more usable, etc. diff --git a/x11-themes/gtk-cleanice-engine/pkg-plist b/x11-themes/gtk-cleanice-engine/pkg-plist deleted file mode 100644 index ee33d4e1956d..000000000000 --- a/x11-themes/gtk-cleanice-engine/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcleanice.so -share/themes/CleanIce/index.theme -share/themes/CleanIce/gtk-2.0/gtkrc -share/themes/CleanIce/metacity-1/metacity-theme-1.xml -share/themes/CleanIce-Dark/gtk-2.0/gtkrc diff --git a/x11-wm/Makefile b/x11-wm/Makefile index 1ba506df7c89..df4a696cfc43 100644 --- a/x11-wm/Makefile +++ b/x11-wm/Makefile @@ -3,7 +3,6 @@ COMMENT = X11 window managers - SUBDIR += aewm SUBDIR += afterstep SUBDIR += afterstep-stable SUBDIR += amiwm diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile deleted file mode 100644 index e9fed56efff1..000000000000 --- a/x11-wm/aewm/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# Created by: trevor -# $FreeBSD$ - -PORTNAME= aewm -PORTVERSION= 1.2.7 -PORTREVISION= 5 -CATEGORIES= x11-wm -MASTER_SITES= https://www.red-bean.com/decklin/aewm/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= ICCCM-compliant window manager based on 9wm - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -OPTIONS_DEFINE= DOCS GTK2 XFT - -USES= gmake xorg -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${LOCALBASE}" -USE_XORG= x11 xext xt xaw - -# XXX should use LICENSE instead of installing it as part of documentation, -# but our license framework does not support XFree86 license at this moment -PORTDOCS= DESIGN LICENSE NEWS README TODO - -GTKCLIENTS= aemenu-gtk aepanel-gtk -XAWCLIENTS= aemenu-xaw aepanel-xaw aesession set-gnome-pda - -GTK2_USES= gnome -GTK2_USE= GNOME=gtk20 -GTK2_PLIST_FILES= bin/aemenu-gtk bin/aepanel-gtk - -XFT_USE= XORG=xft -XFT_MAKE_ENV+= DEFINES="-DXFT" \ - EXTRA_INC="`pkg-config --cflags xft`" \ - EXTRA_LIBS="`pkg-config --libs xft`" - -post-patch: - @${REINPLACE_CMD} -e '/^SUBDIR/s| clients||' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|/etc/X11|${PREFIX}/etc|' \ - ${WRKSRC}/clients/lib/aeclients.h ${WRKSRC}/src/aewm.h - -post-build: - cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \ - ${XAWCLIENTS} - -post-build-GTK2-on: - cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \ - ${GTKCLIENTS} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/aewm ${STAGEDIR}${PREFIX}/bin -.for i in ${XAWCLIENTS} - ${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${STAGEDIR}${PREFIX}/bin -.endfor - ${INSTALL_MAN} ${WRKSRC}/src/aewm.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/aewm.1 - ${INSTALL_MAN} ${WRKSRC}/clients/aeclients.1x \ - ${STAGEDIR}${MAN1PREFIX}/man/man1/aeclients.1 - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/aewm - ${INSTALL_DATA} ${WRKSRC}/src/aewmrc.sample ${STAGEDIR}${PREFIX}/etc/aewm - ${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample ${STAGEDIR}${PREFIX}/etc/aewm - -do-install-GTK2-on: -.for i in ${GTKCLIENTS} - ${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${STAGEDIR}${PREFIX}/bin -.endfor - ${LN} -sf aemenu-gtk ${STAGEDIR}${PREFIX}/bin/aemenu - ${LN} -sf aepanel-gtk ${STAGEDIR}${PREFIX}/bin/aepanel - -do-install-GTK2-off: - ${LN} -sf aemenu-xaw ${STAGEDIR}${PREFIX}/bin/aemenu - ${LN} -sf aepanel-xaw ${STAGEDIR}${PREFIX}/bin/aepanel - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/x11-wm/aewm/distinfo b/x11-wm/aewm/distinfo deleted file mode 100644 index cd99d2c41b15..000000000000 --- a/x11-wm/aewm/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (aewm-1.2.7.tar.gz) = d18c329228dd7f4d2b3cea5696c56c995dd1d0108d56e749426a9f27b8773373 -SIZE (aewm-1.2.7.tar.gz) = 41728 diff --git a/x11-wm/aewm/pkg-descr b/x11-wm/aewm/pkg-descr deleted file mode 100644 index 90b90e413030..000000000000 --- a/x11-wm/aewm/pkg-descr +++ /dev/null @@ -1,23 +0,0 @@ -Aewm is a modern, minimal window manager for X11. It is controlled entirely -with the mouse, but contains no visible UI apart from window frames. It -builds complex operations by chaining together primitives aewm does not try -to do everything; there are plenty of better clients for defining hotkeys, -menus, setting your background image, etc. - -Aewm makes it easy for you to keep the edges of the root window unobscured, -so that you have essentially infinite space to click without having to aim -(this principle is based on Fitts's Law). There is intentionally no panel -or dock to get in the way. - -Aewm does not make decisions about where your windows should go. It can be -used as an ordinary overlapping window manager, but is powerful enough to -let you "tile" windows ad hoc if you prefer; maximizing space usage and -removing overlaps are basic commands. You can also optionally take control -of window mapping and change where windows will appear (including stacking -and tiling) before they are actually shown. - -This port installs not only the window manager, but also the aemenu and -aepanel applets. These provide a list of windows by title (vertically for -aemenu, horizontally for aepanel) and a menu from which programs may be run. - -WWW: https://www.red-bean.com/decklin/aewm/ diff --git a/x11-wm/aewm/pkg-plist b/x11-wm/aewm/pkg-plist deleted file mode 100644 index a821343f823d..000000000000 --- a/x11-wm/aewm/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -bin/aemenu -bin/aemenu-xaw -bin/aepanel -bin/aepanel-xaw -bin/aesession -bin/aewm -bin/set-gnome-pda -@sample etc/aewm/aewmrc.sample -@sample etc/aewm/clientsrc.sample -man/man1/aeclients.1.gz -man/man1/aewm.1.gz |