Date: Fri, 12 Jul 2013 15:01:46 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322840 - in head: astro/mkgmap astro/mkgmap-splitter astro/osmium/files audio/audiere audio/dumb audio/ximp3 converters/osm2mp converters/osm2pgsql converters/p5-Encode-Locale converte... Message-ID: <201307121501.r6CF1k5Y041838@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Jul 12 15:01:45 2013 New Revision: 322840 URL: http://svnweb.freebsd.org/changeset/ports/322840 Log: - Trim Makefile headers - Drop ABI versions from LIB_DEPENDS - OptionsNG - Pet portlint - Switch to dynamic plist where useful - Canonicalize patch names - Fix DOS line endings in patch files Added: head/astro/osmium/files/patch-test-run__tests.sh - copied unchanged from r322839, head/astro/osmium/files/patch-test-run_tests.sh head/devel/bennugd-modules/files/patch-mod__map-file__png.c - copied, changed from r321502, head/devel/bennugd-modules/files/patch-mod_map-file_png.c head/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c - copied, changed from r321502, head/devel/bennugd-modules/files/patch-mod_mem-mod_mem.c head/devel/love5/files/patch-src-system-love__system.cpp - copied, changed from r321502, head/devel/love5/files/patch-src-system-love_system.cpp head/editors/chexedit/files/patch-docs-hexedit.1 - copied unchanged from r321502, head/editors/chexedit/files/patch-docs_hexedit.c head/editors/chexedit/files/patch-src-file.c - copied unchanged from r321502, head/editors/chexedit/files/patch-src_file.c head/editors/chexedit/files/patch-src-init.c - copied unchanged from r321502, head/editors/chexedit/files/patch-src_init.c head/games/allacrost/files/patch-src-engine-video-image__base.cpp - copied unchanged from r321502, head/games/allacrost/files/patch-src-engine-video-image_base.cpp head/games/bloodfrontier/files/patch-src-Makefile - copied unchanged from r321502, head/games/bloodfrontier/files/patch-src_Makefile head/games/crrcsim/files/patch-src-mod__inputdev-inputdev__parallel-inputdev__parallel.cpp - copied unchanged from r321502, head/games/crrcsim/files/patch-src-mod_inputdev-inputdev_parallel-inputdev_parallel.cpp head/games/crrcsim/files/patch-src-mod__inputdev-inputdev__serial-inputdev__serial.cpp - copied unchanged from r321502, head/games/crrcsim/files/patch-src-mod_inputdev-inputdev_serial-inputdev_serial.cpp head/games/enigma/files/patch-lib-src-Makefile.in - copied unchanged from r321502, head/games/enigma/files/patch-lib-src::Makefile.in head/games/enigma/files/patch-src-Makefile.in - copied unchanged from r321502, head/games/enigma/files/patch-src::Makefile.in head/games/enigma/files/patch-src-client.cc - copied unchanged from r321502, head/games/enigma/files/patch-src_client.cc head/games/enigma/files/patch-src-enigma-core-IMG__SavePNG.c - copied unchanged from r321502, head/games/enigma/files/patch-src_enigma-core_IMG_SavePNG.c head/games/enigma/files/patch-src-netgame.cc - copied unchanged from r321502, head/games/enigma/files/patch-src_netgame.cc head/games/hangman/files/patch-src-dict.c - copied unchanged from r321502, head/games/hangman/files/patch-src__dict.c head/games/hangman/files/patch-src-sound.c - copied unchanged from r321502, head/games/hangman/files/patch-src__sound.c head/games/moonlander/files/patch-moon__lander.c - copied unchanged from r321502, head/games/moonlander/files/patch-moon_lander_c head/games/openlierox/files/patch-src-common-Debug__DumpCallstack.cpp - copied unchanged from r321502, head/games/openlierox/files/patch-src-common-Debug_DumpCallstack.cpp head/games/openlierox/files/patch-src-gusanos-objects__list.h - copied unchanged from r321502, head/games/openlierox/files/patch-src-gusanos-objects_list.h head/games/openmortal/files/patch-src-gfx.cpp - copied unchanged from r321502, head/games/openmortal/files/patch-src_gfx.cpp head/games/openmortal/files/patch-src-sge__tt__text.cpp - copied unchanged from r321502, head/games/openmortal/files/patch-src_sge_tt_text.cpp head/games/plutocracy/files/patch-src-render-r__surface.c - copied unchanged from r321502, head/games/plutocracy/files/patch-r_surface.c head/games/scramble/files/patch-src-perm.c - copied unchanged from r321502, head/games/scramble/files/patch-src__perm.c head/games/scramble/files/patch-src-scramble.c - copied unchanged from r321502, head/games/scramble/files/patch-src__scramble.c head/games/scramble/files/patch-src-sound.c - copied unchanged from r321502, head/games/scramble/files/patch-src__sound.c head/games/springlobby/files/patch-tools-regen__config__header.sh - copied unchanged from r321502, head/games/springlobby/files/patch-tools-regen_config_header.sh head/games/steelstorm/files/patch-engine__source-makefile.inc - copied unchanged from r322813, head/games/steelstorm/files/patch-engine_source-makefile.inc head/games/tecnoballz/files/patch-include-surface__sdl.h - copied unchanged from r321502, head/games/tecnoballz/files/patch-include-surface_sdl.h head/games/toycars/files/patch-toycars__track__editor-src-TrackView.cxx - copied unchanged from r321502, head/games/toycars/files/patch-toycars_track_editor-src_TrackView.cxx head/games/valyriatear/files/patch-src-modes-shop-shop__sell.cpp - copied unchanged from r321502, head/games/valyriatear/files/patch-src-modes-shop-shop_sell.cpp head/games/warzone2100/files/patch-build__tools-autorevision - copied unchanged from r321502, head/games/warzone2100/files/patch-build_tools-autorevision head/games/windstille/files/patch-src-script__manager.cpp - copied unchanged from r321502, head/games/windstille/files/patch-src-script_manager.cpp head/graphics/devil/files/patch-src-IL-src-il__icon.c - copied unchanged from r321502, head/graphics/devil/files/patch-src-IL-src-il_icon.c head/graphics/devil/files/patch-src-IL-src-il__nvidia.cpp - copied unchanged from r321502, head/graphics/devil/files/patch-src-IL-src-il_nvidia.cpp head/graphics/devil/files/patch-src-IL-src-il__png.c - copied unchanged from r321502, head/graphics/devil/files/patch-src-IL-src-il_png.c head/graphics/devil/files/patch-src-ILUT-src-ilut__opengl.c - copied unchanged from r321502, head/graphics/devil/files/patch-src-ILUT__src__ilut_opengl.c head/graphics/lprof-devel/files/patch-src-argyll-spectro-usbio.c - copied unchanged from r321502, head/graphics/lprof-devel/files/patch-src_argyll_spectro_usbio.c head/graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c - copied unchanged from r321502, head/graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c head/graphics/osg/files/patch-src-osgPlugins-xine-video__out__rgb.c - copied unchanged from r321502, head/graphics/osg/files/patch-src-osgPlugins-xine-video_out_rgb.c head/graphics/wings-devel/files/patch-plugins__src-accel-perlin__noise__drv.c - copied unchanged from r321502, head/graphics/wings-devel/files/patch-plugins__src_accel_perlin__noise__drv.c head/graphics/wings-devel/files/patch-plugins__src-accel-wings__pick__drv.c - copied unchanged from r321502, head/graphics/wings-devel/files/patch-plugins__src_accel_wings__pick__drv.c head/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c - copied unchanged from r321502, head/graphics/wings/files/patch-plugins__src_accel_perlin__noise__drv.c head/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c - copied unchanged from r321502, head/graphics/wings/files/patch-plugins__src_accel_wings__pick__drv.c head/math/drgeo/files/patch-drgeo__adaptDialog.cc - copied unchanged from r321502, head/math/drgeo/files/patch-drgeo_adaptDialog.cc head/multimedia/openmovieeditor/files/patch-src-Fl__Split.cpp - copied, changed from r321502, head/multimedia/openmovieeditor/files/patch-src-Fl_Split.cpp head/security/bruteblock/files/patch-etc-ssh.conf - copied unchanged from r321502, head/security/bruteblock/files/patch-etc_ssh.conf head/sysutils/tkdvd/files/patch-src-other__procedures.tcl - copied unchanged from r321502, head/sysutils/tkdvd/files/patch-src-other_procedures.tcl head/sysutils/tkdvd/files/patch-src-proc__refresh__cmd__line.tcl - copied unchanged from r321502, head/sysutils/tkdvd/files/patch-src-proc_refresh_cmd_line.tcl head/x11/eaglemode/files/patch-makers-unicc-plugins-unicc__gnu.pm - copied unchanged from r321502, head/x11/eaglemode/files/patch-makers-unicc-plugins-unicc_gnu.pm Deleted: head/astro/osmium/files/patch-test-run_tests.sh head/audio/ximp3/pkg-plist head/devel/bennugd-modules/files/patch-mod_map-file_png.c head/devel/bennugd-modules/files/patch-mod_mem-mod_mem.c head/devel/love5/files/patch-src-system-love_system.cpp head/editors/chexedit/files/patch-docs_hexedit.c head/editors/chexedit/files/patch-src_file.c head/editors/chexedit/files/patch-src_init.c head/games/allacrost/files/patch-src-engine-video-image_base.cpp head/games/bloodfrontier/files/patch-src_Makefile head/games/crrcsim/files/patch-src-mod_inputdev-inputdev_parallel-inputdev_parallel.cpp head/games/crrcsim/files/patch-src-mod_inputdev-inputdev_serial-inputdev_serial.cpp head/games/enigma/files/patch-lib-src::Makefile.in head/games/enigma/files/patch-src::Makefile.in head/games/enigma/files/patch-src_client.cc head/games/enigma/files/patch-src_enigma-core_IMG_SavePNG.c head/games/enigma/files/patch-src_netgame.cc head/games/hangman/files/patch-src__dict.c head/games/hangman/files/patch-src__sound.c head/games/intensityengine/pkg-plist head/games/irrlamb/pkg-plist head/games/moonlander/files/patch-moon_lander_c head/games/openlierox/files/patch-src-common-Debug_DumpCallstack.cpp head/games/openlierox/files/patch-src-gusanos-objects_list.h head/games/openmortal/files/patch-src_gfx.cpp head/games/openmortal/files/patch-src_sge_tt_text.cpp head/games/plutocracy/files/patch-r_surface.c head/games/scramble/files/patch-src__perm.c head/games/scramble/files/patch-src__scramble.c head/games/scramble/files/patch-src__sound.c head/games/springlobby/files/patch-tools-regen_config_header.sh head/games/steelstorm/files/patch-engine_source-makefile.inc head/games/tecnoballz/files/patch-include-surface_sdl.h head/games/toycars/files/patch-toycars_track_editor-src_TrackView.cxx head/games/valyriatear/files/patch-src-modes-shop-shop_sell.cpp head/games/warzone2100/files/patch-build_tools-autorevision head/games/windstille/files/patch-src-script_manager.cpp head/graphics/devil/files/patch-src-IL-src-il_icon.c head/graphics/devil/files/patch-src-IL-src-il_nvidia.cpp head/graphics/devil/files/patch-src-IL-src-il_png.c head/graphics/devil/files/patch-src-ILUT__src__ilut_opengl.c head/graphics/lprof-devel/files/patch-src_argyll_spectro_usbio.c head/graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c head/graphics/osg/files/patch-src-osgPlugins-xine-video_out_rgb.c head/graphics/wings-devel/files/patch-plugins__src_accel_perlin__noise__drv.c head/graphics/wings-devel/files/patch-plugins__src_accel_wings__pick__drv.c head/graphics/wings/files/patch-plugins__src_accel_perlin__noise__drv.c head/graphics/wings/files/patch-plugins__src_accel_wings__pick__drv.c head/math/drgeo/files/patch-drgeo_adaptDialog.cc head/multimedia/openmovieeditor/files/patch-src-Fl_Split.cpp head/security/bruteblock/files/patch-etc_ssh.conf head/sysutils/tkdvd/files/patch-src-other_procedures.tcl head/sysutils/tkdvd/files/patch-src-proc_refresh_cmd_line.tcl head/x11/eaglemode/files/patch-makers-unicc-plugins-unicc_gnu.pm Modified: head/astro/mkgmap-splitter/pkg-descr head/astro/mkgmap/pkg-descr head/audio/audiere/Makefile head/audio/dumb/Makefile head/audio/ximp3/Makefile head/converters/osm2mp/pkg-descr head/converters/osm2pgsql/Makefile head/converters/osm2pgsql/pkg-descr head/converters/p5-Encode-Locale/pkg-descr head/converters/p5-PerlIO-via-Unidecode/pkg-descr head/devel/bennugd-core/Makefile head/devel/bennugd-core/files/patch-bgdrtm-src-dirs.c head/devel/bennugd-core/files/patch-include-crypt.h head/devel/bennugd-modules/Makefile head/devel/hgview/Makefile head/devel/love/Makefile head/devel/love/files/patch-src-modules-graphics-opengl-GLee.h head/devel/love07/Makefile head/devel/love07/files/patch-src-modules-graphics-opengl-GLee.h head/devel/love5/Makefile head/devel/ois/Makefile head/devel/pire/pkg-descr head/games/apricots/Makefile head/games/apricots/files/patch-apricots-sampleio.cpp head/games/arx-libertatis/pkg-descr head/games/biniax2/Makefile head/games/biniax2/files/patch-biniax.c head/games/blackshadeselite/Makefile head/games/blinkensisters/Makefile head/games/blinkensisters/pkg-descr head/games/bloodfrontier/pkg-descr head/games/brainworkshop/Makefile head/games/chroma/Makefile head/games/cultivation/Makefile head/games/enigma/Makefile head/games/fillets-ng/Makefile head/games/flobopuyo/Makefile head/games/flobopuyo/files/patch-IosVector.cpp head/games/flobopuyo/files/patch-PuyoGame.cpp head/games/freedroidrpg/Makefile head/games/gondola/Makefile head/games/instead/pkg-descr head/games/intensityengine/Makefile head/games/irrlamb/Makefile head/games/ivan/Makefile head/games/jvgs/Makefile head/games/lander/Makefile head/games/linwarrior/Makefile head/games/minetest/Makefile head/games/motogt/Makefile head/games/motogt/pkg-descr head/games/neverball/Makefile head/games/nexuiz/Makefile head/games/njam/Makefile head/games/njam/pkg-descr head/games/numptyphysics-npcomplete/Makefile head/games/openlierox/Makefile head/games/phlipple/Makefile head/games/phlipple/pkg-descr head/games/pipepanic/Makefile head/games/pipewalker/Makefile head/games/plutocracy/Makefile head/games/pouetchess/Makefile head/games/powder/Makefile head/games/powermanga/Makefile head/games/pushover/Makefile head/games/qnetwalk/pkg-descr head/games/redeclipse/pkg-descr head/games/sea-defender/pkg-descr head/games/secretmaryochronicles-music/Makefile head/games/secretmaryochronicles/Makefile head/games/spring/Makefile head/games/springlobby/Makefile head/games/steelstorm/pkg-descr head/games/stransball2/Makefile head/games/stransball2/files/patch-sources-main.cpp head/games/supertuxkart/Makefile head/games/tecnoballz/Makefile head/games/teeworlds/Makefile head/games/toycars/Makefile head/games/warzone2100/Makefile head/games/widelands/Makefile head/games/widelands/pkg-descr head/games/windstille/Makefile head/games/wop/Makefile head/games/xmoto/Makefile head/games/xonotic/Makefile head/games/xonotic/pkg-descr head/games/xqf/Makefile head/games/zaz/Makefile head/graphics/devil/Makefile head/graphics/geeqie/Makefile head/graphics/geomorph/Makefile head/graphics/gimp-lqr-plugin/Makefile head/graphics/gimp-resynthesizer/pkg-descr head/graphics/kudu/Makefile head/graphics/liblqr-1/Makefile head/graphics/lprof-devel/Makefile head/graphics/mhgui/Makefile head/graphics/nvidia-texture-tools/Makefile head/graphics/osg-devel/Makefile head/graphics/osg/Makefile head/graphics/scrot/Makefile head/graphics/sharpconstruct/Makefile head/graphics/tiled/pkg-descr head/lang/tolua++/Makefile head/lang/tolua++50/Makefile head/mail/findmaildirs/pkg-descr head/math/drgeo/Makefile head/math/p5-Math-Geometry-Planar-GPC-Polygon/Makefile head/math/p5-Math-Geometry-Planar-GPC-Polygon/pkg-descr head/math/p5-Math-Polygon-Tree/Makefile head/math/p5-Math-Polygon-Tree/pkg-descr head/misc/metromap/pkg-descr head/multimedia/avbin/Makefile head/multimedia/avbin/pkg-descr head/multimedia/avinfo/Makefile head/multimedia/openmovieeditor/Makefile head/security/bruteblock/Makefile head/sysutils/pacman/Makefile head/textproc/p5-Geo-Parse-OSM/pkg-descr head/www/twms/Makefile head/www/twms/pkg-descr head/x11/eaglemode/Makefile Modified: head/astro/mkgmap-splitter/pkg-descr ============================================================================== --- head/astro/mkgmap-splitter/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/astro/mkgmap-splitter/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -3,4 +3,4 @@ meaning that you have to split an .osm f well mapped regions into a number of smaller tiles. This program does that. -WWW: http://www.mkgmap.org.uk/page/tile-splitter +WWW: http://www.mkgmap.org.uk/page/tile-splitter Modified: head/astro/mkgmap/pkg-descr ============================================================================== --- head/astro/mkgmap/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/astro/mkgmap/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -2,4 +2,4 @@ This program converts OpenStreetMap data loaded onto a Garmin GPS device. It does the conversion in one step without depending on any other program. -WWW: http://www.mkgmap.org.uk/index.html +WWW: http://www.mkgmap.org.uk/index.html Copied: head/astro/osmium/files/patch-test-run__tests.sh (from r322839, head/astro/osmium/files/patch-test-run_tests.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/osmium/files/patch-test-run__tests.sh Fri Jul 12 15:01:45 2013 (r322840, copy of r322839, head/astro/osmium/files/patch-test-run_tests.sh) @@ -0,0 +1,15 @@ +--- test/run_tests.sh.orig 2013-05-09 19:20:50.000000000 +0400 ++++ test/run_tests.sh 2013-05-23 00:01:42.140354335 +0400 +@@ -10,8 +10,10 @@ + + set -e + +-CXX="g++" +-CXXFLAGS="-g -Wall -Wextra -Wredundant-decls -Wdisabled-optimization -pedantic -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long" ++if [ -z "$CXX" ]; then ++ CXX="g++" ++fi ++CXXFLAGS="$CXXFLAGS -g -Wall -Wextra -Wredundant-decls -Wdisabled-optimization -pedantic -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long" + COMPILE="$CXX -I../include -I. $CXXFLAGS -o tests" + + if [ "x$1" = "x-v" ]; then Modified: head/audio/audiere/Makefile ============================================================================== --- head/audio/audiere/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/audio/audiere/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -34,7 +34,7 @@ OPTIONS_DEFAULT= DUMB CDAUDIO VORBIS SPE DUMB_DESC= DUMB support CDAUDIO_DESC= libcdaudio support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> # Broken with recent FLAC #.if !defined(WITHOUT_FLAC) @@ -75,12 +75,12 @@ post-patch: -e 's|-lpthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/configure.in -.if !defined(NOPORTDOCS) post-install: +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/dumb/Makefile ============================================================================== --- head/audio/dumb/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/audio/dumb/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -18,7 +18,7 @@ ALLEGRO_DESC= Enable allegro support .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MALLEGRO} -LIB_DEPENDS+= alleg.42:${PORTSDIR}/devel/allegro +LIB_DEPENDS+= alleg:${PORTSDIR}/devel/allegro PLIST_SUB+= ALLEGRO="" MAKE_ARGS= _PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`" PKGNAMESUFFIX= -allegro Modified: head/audio/ximp3/Makefile ============================================================================== --- head/audio/ximp3/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/audio/ximp3/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -1,24 +1,23 @@ -# ex:ts=8 -# Ports collection makefile for: ximp3 -# Date created: Jan 17, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= ximp3 PORTVERSION= 0.1.15 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= apps/sound/players/mp3 +MASTER_SITES= SUNSITE/apps/sound/players/mp3 MAINTAINER= amdmi3@FreeBSD.org COMMENT= A simple console MP3 player GNU_CONFIGURE= yes +PORTDOCS= * + +PLIST_FILES= bin/${PORTNAME} + +.include <bsd.port.options.mk> post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif Modified: head/converters/osm2mp/pkg-descr ============================================================================== --- head/converters/osm2mp/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/converters/osm2mp/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -1,3 +1,3 @@ OpenStreetMap data into Polish map format (MP) convertor -WWW: http://code.google.com/p/osm2mp/ +WWW: http://code.google.com/p/osm2mp/ Modified: head/converters/osm2pgsql/Makefile ============================================================================== --- head/converters/osm2pgsql/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/converters/osm2pgsql/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -10,9 +10,9 @@ MASTER_SITES= http://mirror.amdmi3.ru/di MAINTAINER= amdmi3@FreeBSD.org COMMENT= Convert OSM XML data to PostgreSQL database -LIB_DEPENDS= proj.7:${PORTSDIR}/graphics/proj \ - geos.0:${PORTSDIR}/graphics/geos \ - protobuf-c.0:${PORTSDIR}/devel/protobuf-c +LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \ + geos:${PORTSDIR}/graphics/geos \ + protobuf-c:${PORTSDIR}/devel/protobuf-c LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING Modified: head/converters/osm2pgsql/pkg-descr ============================================================================== --- head/converters/osm2pgsql/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/converters/osm2pgsql/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -5,4 +5,4 @@ The format of the database is optimised by mapnik. It may be less suitable for other general purpose processing. -WWW: http://wiki.openstreetmap.org/wiki/Osm2pgsql +WWW: http://wiki.openstreetmap.org/wiki/Osm2pgsql Modified: head/converters/p5-Encode-Locale/pkg-descr ============================================================================== --- head/converters/p5-Encode-Locale/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/converters/p5-Encode-Locale/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -1,3 +1,3 @@ Encode::Locale - Determine the locale encoding -WWW: http://search.cpan.org/dist/Encode-Locale/ +WWW: http://search.cpan.org/dist/Encode-Locale/ Modified: head/converters/p5-PerlIO-via-Unidecode/pkg-descr ============================================================================== --- head/converters/p5-PerlIO-via-Unidecode/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/converters/p5-PerlIO-via-Unidecode/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -1,4 +1,4 @@ PerlIO::via::Unidecode implements a PerlIO::via layer that applies Unidecode (Text::Unidecode) to data passed through it. -WWW: http://search.cpan.org/dist/PerlIO-via-Unidecode/ +WWW: http://search.cpan.org/dist/PerlIO-via-Unidecode/ Modified: head/devel/bennugd-core/Makefile ============================================================================== --- head/devel/bennugd-core/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/bennugd-core/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bennugd -# Date created: 06 Nov 2009 -# Whom: Dmitry Marakasov <amdmi3@FreeBSD.org> -# +# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org> # $FreeBSD$ -# PORTNAME= core PORTVERSION= r20091106 @@ -20,6 +16,7 @@ MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --bindir="${PREFIX}/libexec" SUB_FILES= bgdc bgdi USE_LDCONFIG= yes +USE_DOS2UNIX= *.c *.h ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= Segfaults on !i386 Modified: head/devel/bennugd-core/files/patch-bgdrtm-src-dirs.c ============================================================================== --- head/devel/bennugd-core/files/patch-bgdrtm-src-dirs.c Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/bennugd-core/files/patch-bgdrtm-src-dirs.c Fri Jul 12 15:01:45 2013 (r322840) @@ -1,13 +1,13 @@ --- bgdrtm/src/dirs.c.orig 2009-07-09 05:10:52.000000000 +0400 +++ bgdrtm/src/dirs.c 2009-11-06 05:50:02.000000000 +0300 @@ -230,9 +230,7 @@ - /* Convert *.* to * */ - if ( fptr > path_final + 2 && fptr[ -1 ] == '*' && fptr[ -2 ] == '.' && fptr[ -3 ] == '*' ) fptr[ -2 ] = 0; - --#if defined(TARGET_MAC) -- glob( path_final, GLOB_ERR | GLOB_NOSORT, NULL, &hDir->globd ); --#elif defined(TARGET_BEOS) -+#if defined(TARGET_MAC) || defined(TARGET_BEOS) || defined(TARGET_BSD) - glob( path_final, GLOB_ERR | GLOB_NOSORT, NULL, &hDir->globd ); - #else - glob( path_final, GLOB_ERR | GLOB_PERIOD | GLOB_NOSORT, NULL, &hDir->globd ); + /* Convert *.* to * */ + if ( fptr > path_final + 2 && fptr[ -1 ] == '*' && fptr[ -2 ] == '.' && fptr[ -3 ] == '*' ) fptr[ -2 ] = 0; + +-#if defined(TARGET_MAC) +- glob( path_final, GLOB_ERR | GLOB_NOSORT, NULL, &hDir->globd ); +-#elif defined(TARGET_BEOS) ++#if defined(TARGET_MAC) || defined(TARGET_BEOS) || defined(TARGET_BSD) + glob( path_final, GLOB_ERR | GLOB_NOSORT, NULL, &hDir->globd ); + #else + glob( path_final, GLOB_ERR | GLOB_PERIOD | GLOB_NOSORT, NULL, &hDir->globd ); Modified: head/devel/bennugd-core/files/patch-include-crypt.h ============================================================================== --- head/devel/bennugd-core/files/patch-include-crypt.h Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/bennugd-core/files/patch-include-crypt.h Fri Jul 12 15:01:45 2013 (r322840) @@ -1,11 +1,11 @@ --- include/crypt.h.orig 2009-07-02 04:20:53.000000000 +0400 +++ include/crypt.h 2009-11-06 05:52:32.000000000 +0300 @@ -24,7 +24,7 @@ - - /* ------------------------------------------------------------------------- */ - --#include <des.h> -+#include <openssl/des.h> - - /* ------------------------------------------------------------------------- */ - + + /* ------------------------------------------------------------------------- */ + +-#include <des.h> ++#include <openssl/des.h> + + /* ------------------------------------------------------------------------- */ + Modified: head/devel/bennugd-modules/Makefile ============================================================================== --- head/devel/bennugd-modules/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/bennugd-modules/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -27,6 +27,8 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --libdir="${PREFIX}/lib/bennugd" MAKE_JOBS_SAFE= yes +USE_DOS2UNIX= *.c + WRKSRC= ${WRKDIR}/bennugd/${PORTNAME} post-extract: Copied and modified: head/devel/bennugd-modules/files/patch-mod__map-file__png.c (from r321502, head/devel/bennugd-modules/files/patch-mod_map-file_png.c) ============================================================================== --- head/devel/bennugd-modules/files/patch-mod_map-file_png.c Fri Jun 21 20:17:11 2013 (r321502, copy source) +++ head/devel/bennugd-modules/files/patch-mod__map-file__png.c Fri Jul 12 15:01:45 2013 (r322840) @@ -1,37 +1,37 @@ --- mod_map/file_png.c.orig 2009-07-22 04:02:45.000000000 +0200 +++ mod_map/file_png.c 2012-05-27 11:54:18.000000000 +0200 @@ -24,6 +24,7 @@ - /* --------------------------------------------------------------------------- */ - - #include <png.h> -+#include <pngpriv.h> - - #include "mod_map.h" - + /* --------------------------------------------------------------------------- */ + + #include <png.h> ++#include <pngpriv.h> + + #include "mod_map.h" + @@ -89,7 +90,7 @@ - - /* Rutina de error */ - -- if ( setjmp( png_ptr->jmpbuf ) ) -+ if ( setjmp( png_jmpbuf(png_ptr) ) ) - { - png_destroy_read_struct( &png_ptr, &info_ptr, &end_info ) ; - file_close( png ) ; + + /* Rutina de error */ + +- if ( setjmp( png_ptr->jmpbuf ) ) ++ if ( setjmp( png_jmpbuf(png_ptr) ) ) + { + png_destroy_read_struct( &png_ptr, &info_ptr, &end_info ) ; + file_close( png ) ; @@ -286,7 +287,7 @@ - - /* Fin */ - -- if ( !setjmp( png_ptr->jmpbuf ) ) png_read_end( png_ptr, 0 ) ; -+ if ( !setjmp( png_jmpbuf(png_ptr) ) ) png_read_end( png_ptr, 0 ) ; - - bitmap->modified = 1 ; - + + /* Fin */ + +- if ( !setjmp( png_ptr->jmpbuf ) ) png_read_end( png_ptr, 0 ) ; ++ if ( !setjmp( png_jmpbuf(png_ptr) ) ) png_read_end( png_ptr, 0 ) ; + + bitmap->modified = 1 ; + @@ -356,7 +357,7 @@ - - /* Error handling... */ - -- if ( setjmp( png_ptr->jmpbuf ) ) -+ if ( setjmp( png_jmpbuf(png_ptr) ) ) - { - png_destroy_write_struct( &png_ptr, NULL ) ; - free( rowpointers ) ; + + /* Error handling... */ + +- if ( setjmp( png_ptr->jmpbuf ) ) ++ if ( setjmp( png_jmpbuf(png_ptr) ) ) + { + png_destroy_write_struct( &png_ptr, NULL ) ; + free( rowpointers ) ; Copied and modified: head/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c (from r321502, head/devel/bennugd-modules/files/patch-mod_mem-mod_mem.c) ============================================================================== --- head/devel/bennugd-modules/files/patch-mod_mem-mod_mem.c Fri Jun 21 20:17:11 2013 (r321502, copy source) +++ head/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c Fri Jul 12 15:01:45 2013 (r322840) @@ -1,20 +1,20 @@ --- mod_mem/mod_mem.c.orig 2009-06-15 22:34:24.000000000 +0400 +++ mod_mem/mod_mem.c 2009-11-06 06:28:55.000000000 +0300 @@ -128,7 +128,7 @@ - get_system_info( &info ); - return B_PAGE_SIZE * ( info.max_pages - info.used_pages ); - --#elif !defined(TARGET_MAC) -+#elif !defined(TARGET_MAC) && !defined(TARGET_BSD) - /* Linux and other Unix (?) */ - struct sysinfo meminf; - int fv; + get_system_info( &info ); + return B_PAGE_SIZE * ( info.max_pages - info.used_pages ); + +-#elif !defined(TARGET_MAC) ++#elif !defined(TARGET_MAC) && !defined(TARGET_BSD) + /* Linux and other Unix (?) */ + struct sysinfo meminf; + int fv; @@ -166,7 +166,7 @@ - get_system_info( &info ); - return B_PAGE_SIZE * ( info.max_pages ); - --#elif !defined(TARGET_MAC) -+#elif !defined(TARGET_MAC) && !defined(TARGET_BSD) - /* Linux and other Unix (?) */ - struct sysinfo meminf; - int fv; + get_system_info( &info ); + return B_PAGE_SIZE * ( info.max_pages ); + +-#elif !defined(TARGET_MAC) ++#elif !defined(TARGET_MAC) && !defined(TARGET_BSD) + /* Linux and other Unix (?) */ + struct sysinfo meminf; + int fv; Modified: head/devel/hgview/Makefile ============================================================================== --- head/devel/hgview/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/hgview/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -1,9 +1,5 @@ -# New ports collection makefile for: hgview -# Date created: 20 Nov 2008 -# Whom: Dmitry Marakasov <amdmi3@FreeBSD.org> -# +# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org> # $FreeBSD$ -# PORTNAME= hgview PORTVERSION= 1.6.2 @@ -31,6 +27,8 @@ PORTDOCS= * MAN1= hgview.1 +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|share/python-support/mercurial-common|${PYTHON_SITELIBDIR:C,^${PYTHONBASE}/,,}|' \ ${WRKSRC}/hgviewlib/__pkginfo__.py @@ -40,8 +38,8 @@ post-patch: ${WRKSRC}/README @${REINPLACE_CMD} -e 's|'make'|'${GMAKE}'|' ${WRKSRC}/setup.py -.if !defined(NOPORTDOCS) post-install: +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif Modified: head/devel/love/Makefile ============================================================================== --- head/devel/love/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/love/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -12,12 +12,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-lin MAINTAINER= amdmi3@FreeBSD.org COMMENT= Open-source 2D game engine -LIB_DEPENDS= IL.2:${PORTSDIR}/graphics/devil \ - modplug.1:${PORTSDIR}/audio/libmodplug \ - mpg123.0:${PORTSDIR}/audio/mpg123 \ - vorbisfile.6:${PORTSDIR}/audio/libvorbis \ - physfs.1:${PORTSDIR}/devel/physfs \ - freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= IL:${PORTSDIR}/graphics/devil \ + modplug:${PORTSDIR}/audio/libmodplug \ + mpg123:${PORTSDIR}/audio/mpg123 \ + vorbisfile:${PORTSDIR}/audio/libvorbis \ + physfs:${PORTSDIR}/devel/physfs \ + freetype:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs USE_GMAKE= yes @@ -31,6 +31,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LO LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib WRKSRC= ${WRKDIR}/love-${PORTVERSION} +USE_DOS2UNIX= yes PLIST_FILES= bin/love Modified: head/devel/love/files/patch-src-modules-graphics-opengl-GLee.h ============================================================================== --- head/devel/love/files/patch-src-modules-graphics-opengl-GLee.h Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/love/files/patch-src-modules-graphics-opengl-GLee.h Fri Jul 12 15:01:45 2013 (r322840) @@ -1,11 +1,11 @@ --- src/modules/graphics/opengl/GLee.h.orig 2011-05-04 20:00:10.000000000 +0400 +++ src/modules/graphics/opengl/GLee.h 2011-09-20 00:16:46.000000000 +0400 @@ -799,8 +799,6 @@ - - /* GLX */ - -- typedef void (*__GLXextFuncPtr)(void); -- - #ifndef GLX_ARB_get_proc_address - #define GLX_ARB_get_proc_address 1 - extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *); + + /* GLX */ + +- typedef void (*__GLXextFuncPtr)(void); +- + #ifndef GLX_ARB_get_proc_address + #define GLX_ARB_get_proc_address 1 + extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *); Modified: head/devel/love07/Makefile ============================================================================== --- head/devel/love07/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/love07/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -12,12 +12,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-lin MAINTAINER= amdmi3@FreeBSD.org COMMENT= Open-source 2D game engine -LIB_DEPENDS= IL.2:${PORTSDIR}/graphics/devil \ - modplug.1:${PORTSDIR}/audio/libmodplug \ - mpg123.0:${PORTSDIR}/audio/mpg123 \ - vorbisfile.6:${PORTSDIR}/audio/libvorbis \ - physfs.1:${PORTSDIR}/devel/physfs \ - freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= IL:${PORTSDIR}/graphics/devil \ + modplug:${PORTSDIR}/audio/libmodplug \ + mpg123:${PORTSDIR}/audio/mpg123 \ + vorbisfile:${PORTSDIR}/audio/libvorbis \ + physfs:${PORTSDIR}/devel/physfs \ + freetype:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs LATEST_LINK= ${PORTNAME}07 @@ -36,6 +36,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIB CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib \ --program-suffix=07 WRKSRC= ${WRKDIR}/love-HEAD +USE_DOS2UNIX= yes PLIST_FILES= bin/love07 Modified: head/devel/love07/files/patch-src-modules-graphics-opengl-GLee.h ============================================================================== --- head/devel/love07/files/patch-src-modules-graphics-opengl-GLee.h Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/love07/files/patch-src-modules-graphics-opengl-GLee.h Fri Jul 12 15:01:45 2013 (r322840) @@ -1,11 +1,11 @@ --- src/modules/graphics/opengl/GLee.h.orig 2011-05-04 20:00:10.000000000 +0400 +++ src/modules/graphics/opengl/GLee.h 2011-09-20 00:16:46.000000000 +0400 @@ -799,8 +799,6 @@ - - /* GLX */ - -- typedef void (*__GLXextFuncPtr)(void); -- - #ifndef GLX_ARB_get_proc_address - #define GLX_ARB_get_proc_address 1 - extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *); + + /* GLX */ + +- typedef void (*__GLXextFuncPtr)(void); +- + #ifndef GLX_ARB_get_proc_address + #define GLX_ARB_get_proc_address 1 + extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *); Modified: head/devel/love5/Makefile ============================================================================== --- head/devel/love5/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/love5/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -10,9 +10,9 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Open-source 2D game engine -LIB_DEPENDS= IL.2:${PORTSDIR}/graphics/devil \ - physfs.1:${PORTSDIR}/devel/physfs \ - freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= IL:${PORTSDIR}/graphics/devil \ + physfs:${PORTSDIR}/devel/physfs \ + freetype:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs LATEST_LINK= love5 @@ -27,6 +27,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LO LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib \ --program-suffix=5 +USE_DOS2UNIX= yes PLIST_FILES= bin/love5 Copied and modified: head/devel/love5/files/patch-src-system-love__system.cpp (from r321502, head/devel/love5/files/patch-src-system-love_system.cpp) ============================================================================== --- head/devel/love5/files/patch-src-system-love_system.cpp Fri Jun 21 20:17:11 2013 (r321502, copy source) +++ head/devel/love5/files/patch-src-system-love__system.cpp Fri Jul 12 15:01:45 2013 (r322840) @@ -1,11 +1,11 @@ --- src/system/love_system.cpp.orig 2008-09-20 18:40:14.000000000 +0400 +++ src/system/love_system.cpp 2011-09-27 07:49:03.000000000 +0400 @@ -83,7 +83,7 @@ - #ifdef WIN32 - bool embedded = (leaf.compare("love.exe") != 0); - #else -- bool embedded = (leaf.compare("love") != 0); -+ bool embedded = (leaf.compare("love5") != 0); - #endif - - std::string base; + #ifdef WIN32 + bool embedded = (leaf.compare("love.exe") != 0); + #else +- bool embedded = (leaf.compare("love") != 0); ++ bool embedded = (leaf.compare("love5") != 0); + #endif + + std::string base; Modified: head/devel/ois/Makefile ============================================================================== --- head/devel/ois/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/ois/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ois -# Date created: 16 Jun 2008 -# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru> -# +# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru> # $FreeBSD$ -# PORTNAME= ois PORTVERSION= 1.2.0 @@ -17,7 +13,7 @@ COMMENT= Object Oriented Input System GNU_CONFIGURE= yes USE_GMAKE= yes -USES= pathfix +USES= pathfix USE_AUTOTOOLS= libtool:env aclocal:env autoheader:env automake:env autoconf:env USE_XORG= x11 xaw USE_LDCONFIG= yes Modified: head/devel/pire/pkg-descr ============================================================================== --- head/devel/pire/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/devel/pire/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -20,4 +20,4 @@ neither has it any capturing facilities. Pire was developed in Yandex (http://company.yandex.ru/) as a part of its web crawler. -WWW: https://github.com/dprokoptsev/pire +WWW: https://github.com/dprokoptsev/pire Copied: head/editors/chexedit/files/patch-docs-hexedit.1 (from r321502, head/editors/chexedit/files/patch-docs_hexedit.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/chexedit/files/patch-docs-hexedit.1 Fri Jul 12 15:01:45 2013 (r322840, copy of r321502, head/editors/chexedit/files/patch-docs_hexedit.c) @@ -0,0 +1,30 @@ +--- docs/hexedit.1.orig Fri Apr 23 22:16:42 1999 ++++ docs/hexedit.1 Wed Jan 31 22:39:36 2001 +@@ -1,14 +1,14 @@ + .\" Copyright (C) 1998,1999 Adam Rogoyski +-.TH HEXEDIT 1 ++.TH CHEXEDIT 1 + .SH NAME +-hexedit \- Full screen curses Hex editor ++chexedit \- Full screen curses Hex editor + .SH SYNOPSIS + .nr a \n(.j + .ad l + .nr i \n(.i +-.in +\w'\fBhexedit 'u ++.in +\w'\fBchexedit 'u + .ti \niu +-.B hexedit ++.B chexedit + .de OP + .ie \\n(.$-1 .RI "[\ \fB\\$1fP" "\\$2" "\ ]" + .el .RB "[\ " "\\$1" "\ ]" +@@ -18,7 +18,7 @@ + .br + .ad \na + .SH DESCRIPTION +-.I Hexedit ++.I Chexedit + is an editor to edit binary (or any) files or disks. The Display consists + of the current offset from 0 (the first byte), the next sixteen bytes + (aligned by bytes or 32-bit words), and it's ASCII or EBCDIC text Copied: head/editors/chexedit/files/patch-src-file.c (from r321502, head/editors/chexedit/files/patch-src_file.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/chexedit/files/patch-src-file.c Fri Jul 12 15:01:45 2013 (r322840, copy of r321502, head/editors/chexedit/files/patch-src_file.c) @@ -0,0 +1,21 @@ +--- src/file.c.orig Wed Jun 30 05:57:15 1999 ++++ src/file.c Sat Mar 17 22:23:57 2001 +@@ -19,6 +19,7 @@ + #include <dirent.h> + #endif + ++#include <sys/types.h> + #include <grp.h> + #include <pwd.h> + +@@ -618,8 +619,8 @@ + + wprintw (Globals.wmain, + /* why does it seem like on OpenBSD this is broken? */ +-#if defined(__OpenBSD__) || defined(BROKEN) +- "%s %-8s %-8s %10ld %1d\b2d-%02d-%02d %02d:%02d ", ++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(BROKEN) ++ "%s %-8s %-8s %10ld %1d\b%04d-%02d-%02d %02d:%02d ", + #else + "%s %-8s %-8s %10ld %d-%02d-%02d %02d:%02d ", + #endif Copied: head/editors/chexedit/files/patch-src-init.c (from r321502, head/editors/chexedit/files/patch-src_init.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/chexedit/files/patch-src-init.c Fri Jul 12 15:01:45 2013 (r322840, copy of r321502, head/editors/chexedit/files/patch-src_init.c) @@ -0,0 +1,23 @@ +--- src/init.c.orig Sun Aug 8 09:56:11 1999 ++++ src/init.c Sat Mar 17 22:23:57 2001 +@@ -33,6 +33,11 @@ + #include <sys/disklabel.h> + #endif + ++#if defined(__FreeBSD__) ++#include <fcntl.h> ++#include <sys/disklabel.h> ++#endif ++ + extern char **environ; + + +@@ -463,7 +468,7 @@ + filestat.st_size = DEFAULT_BUFFER_SIZE; + } + +-#elif defined (__OpenBSD__) ++#elif defined (__OpenBSD__) || defined(__FreeBSD__) + else if (Globals.fixed_disk) + { + Copied: head/games/allacrost/files/patch-src-engine-video-image__base.cpp (from r321502, head/games/allacrost/files/patch-src-engine-video-image_base.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/allacrost/files/patch-src-engine-video-image__base.cpp Fri Jul 12 15:01:45 2013 (r322840, copy of r321502, head/games/allacrost/files/patch-src-engine-video-image_base.cpp) @@ -0,0 +1,10 @@ +--- src/engine/video/image_base.cpp.orig 2010-05-17 01:38:27.000000000 +0200 ++++ src/engine/video/image_base.cpp 2012-05-03 05:51:57.000000000 +0200 +@@ -18,6 +18,7 @@ + + #include "image_base.h" + #include "video.h" ++#include "pngpriv.h" + + using namespace std; + using namespace hoa_utils; Modified: head/games/apricots/Makefile ============================================================================== --- head/games/apricots/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/apricots/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -15,6 +15,7 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_GMAKE= yes USE_SDL= sdl +USE_DOS2UNIX= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include Modified: head/games/apricots/files/patch-apricots-sampleio.cpp ============================================================================== --- head/games/apricots/files/patch-apricots-sampleio.cpp Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/apricots/files/patch-apricots-sampleio.cpp Fri Jul 12 15:01:45 2013 (r322840) @@ -2,45 +2,45 @@ Patch to build with newer openal. Not su --- apricots/sampleio.cpp.orig 2003-08-06 03:21:22.000000000 +0400 +++ apricots/sampleio.cpp 2010-04-07 18:32:05.000000000 +0400 @@ -74,28 +74,21 @@ - alListenerfv(AL_ORIENTATION, front ); - - // Load in samples -- ALvoid* data = malloc(5 * (512 * 3) * 1024); -+ ALvoid* data; - alGenBuffers(numsamples, samples); - - for (int i = 0; i < numsamples; i++){ -- ALsizei freq; -+ ALfloat freq; - ALboolean fileok; - // Evil OpenAL portability fix done here --#ifdef _WIN32 - ALenum format; -- ALboolean trash; -- alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash); -- fileok = (alGetError() == AL_NO_ERROR); --#else -- ALsizei format; -- ALsizei trash; -- fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq); --#endif -- if (!fileok){ -+ data = alutLoadMemoryFromFile(filenames[i], &format, &filelen, &freq); -+ if (!data){ - cerr << "sampleio: could not open " << filenames[i] << endl; - exit(1); - } - alBufferData(samples[i], format, data, filelen, freq); -+ free(data); - } - - // Generate Sources + alListenerfv(AL_ORIENTATION, front ); + + // Load in samples +- ALvoid* data = malloc(5 * (512 * 3) * 1024); ++ ALvoid* data; + alGenBuffers(numsamples, samples); + + for (int i = 0; i < numsamples; i++){ +- ALsizei freq; ++ ALfloat freq; + ALboolean fileok; + // Evil OpenAL portability fix done here +-#ifdef _WIN32 + ALenum format; +- ALboolean trash; +- alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash); +- fileok = (alGetError() == AL_NO_ERROR); +-#else +- ALsizei format; +- ALsizei trash; +- fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq); +-#endif +- if (!fileok){ ++ data = alutLoadMemoryFromFile(filenames[i], &format, &filelen, &freq); ++ if (!data){ + cerr << "sampleio: could not open " << filenames[i] << endl; + exit(1); + } + alBufferData(samples[i], format, data, filelen, freq); ++ free(data); + } + + // Generate Sources @@ -107,8 +100,6 @@ - alSourcefv(sources[j], AL_ORIENTATION, back ); - } - -- free(data); -- - } - - // Clearup routine + alSourcefv(sources[j], AL_ORIENTATION, back ); + } + +- free(data); +- + } + + // Clearup routine Modified: head/games/arx-libertatis/pkg-descr ============================================================================== --- head/games/arx-libertatis/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/arx-libertatis/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -1,4 +1,4 @@ Arx Libertatis is a cross-platform, open source port of Arx Fatalis, a 2002 first-person role-playing game developed by Arkane Studios. -WWW: http://arx-libertatis.org +WWW: http://arx-libertatis.org Modified: head/games/biniax2/Makefile ============================================================================== --- head/games/biniax2/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/biniax2/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -13,6 +13,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Original logic game with arcade and tactics modes USE_SDL= sdl mixer image +USE_DOS2UNIX= yes NO_WRKSUBDIR= yes post-patch: Modified: head/games/biniax2/files/patch-biniax.c ============================================================================== --- head/games/biniax2/files/patch-biniax.c Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/biniax2/files/patch-biniax.c Fri Jul 12 15:01:45 2013 (r322840) @@ -1,26 +1,26 @@ --- biniax.c.orig 2009-05-05 16:49:06.000000000 +0200 +++ biniax.c 2010-01-27 23:57:35.000000000 +0100 @@ -47,6 +47,7 @@ - INCLUDES - ******************************************************************************/ - + INCLUDES + ******************************************************************************/ + +#include <errno.h> - #include "game.h" - #include "lev.h" - #include "inc.h" + #include "game.h" + #include "lev.h" + #include "inc.h" @@ -89,6 +90,15 @@ - - int main( int argc, char *argv[] ) - { -+ if (chdir(getenv("HOME")) != 0) -+ err(1, "cannot chdir to $HOME"); -+ -+ if (mkdir(".biniax2", 0755) != 0 && errno != EEXIST) -+ err(1, "cannot mkdir $HOME/.biniax2"); -+ -+ if (chdir(".biniax2") != 0) -+ err(1, "cannot chdir to $HOME/.biniax2"); -+ - BNX_BOOL bquit = BNX_FALSE; - BNX_INT16 enterState = cStateMainMenu; - BNX_INT16 nmenu = 0; + + int main( int argc, char *argv[] ) + { ++ if (chdir(getenv("HOME")) != 0) ++ err(1, "cannot chdir to $HOME"); ++ ++ if (mkdir(".biniax2", 0755) != 0 && errno != EEXIST) ++ err(1, "cannot mkdir $HOME/.biniax2"); ++ ++ if (chdir(".biniax2") != 0) ++ err(1, "cannot chdir to $HOME/.biniax2"); ++ + BNX_BOOL bquit = BNX_FALSE; + BNX_INT16 enterState = cStateMainMenu; + BNX_INT16 nmenu = 0; Modified: head/games/blackshadeselite/Makefile ============================================================================== --- head/games/blackshadeselite/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/blackshadeselite/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -11,7 +11,7 @@ MASTER_SITES= http://download.gna.org/bl MAINTAINER= amdmi3@FreeBSD.org COMMENT= Psychic Bodyguard FPS - protect the VIP -LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes USE_GMAKE= yes Modified: head/games/blinkensisters/Makefile ============================================================================== --- head/games/blinkensisters/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/blinkensisters/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -63,7 +63,7 @@ PLIST_SUB+= SDL_NET="@comment " .if ${PORT_OPTIONS:MTHEORA} CMAKE_ARGS+= -DUSE_THEORA:BOOL=ON .else -LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora +LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora .endif post-patch: Modified: head/games/blinkensisters/pkg-descr ============================================================================== --- head/games/blinkensisters/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/blinkensisters/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -4,4 +4,4 @@ SDL). You can even make your own levels with a simple text-editor. -WWW: http://sourceforge.net/projects/blinkensisters/ +WWW: http://sourceforge.net/projects/blinkensisters/ Copied: head/games/bloodfrontier/files/patch-src-Makefile (from r321502, head/games/bloodfrontier/files/patch-src_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bloodfrontier/files/patch-src-Makefile Fri Jul 12 15:01:45 2013 (r322840, copy of r321502, head/games/bloodfrontier/files/patch-src_Makefile) @@ -0,0 +1,19 @@ +--- src/Makefile.orig 2009-11-25 14:52:58.000000000 +0300 ++++ src/Makefile 2009-12-17 00:09:47.000000000 +0300 +@@ -1,5 +1,4 @@ + #CXXFLAGS= -ggdb3 +-CXXFLAGS= -O3 -fomit-frame-pointer + override CXXFLAGS+= -Wall -fsigned-char + + PLATFORM= $(shell uname -s) +@@ -21,8 +20,8 @@ + CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -Iinclude + CLIENT_LIBS= -mwindows -lmingw32 -Llib -lSDLmain -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm + else +-CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` +-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL ++CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` ++CLIENT_LIBS= -Lenet -lenet -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL + endif + ifeq ($(PLATFORM),Linux) + CLIENT_LIBS+= -lrt Modified: head/games/bloodfrontier/pkg-descr ============================================================================== --- head/games/bloodfrontier/pkg-descr Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/bloodfrontier/pkg-descr Fri Jul 12 15:01:45 2013 (r322840) @@ -3,4 +3,4 @@ total conversion of Cube Engine 2, which balanced gameplay, completely at the control of map makers, while maintaining a general theme of tactics and low gravity. -WWW: http://www.bloodfrontier.com/ +WWW: http://www.bloodfrontier.com/ Modified: head/games/brainworkshop/Makefile ============================================================================== --- head/games/brainworkshop/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/brainworkshop/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -1,9 +1,5 @@ -# New ports collection makefile for: brainworkshop -# Date created: 27 Oct 2008 -# Whom: Dmitry Marakasov <amdmi3@FreeBSD.org> -# +# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org> # $FreeBSD$ -# PORTNAME= brainworkshop PORTVERSION= 4.4 Modified: head/games/chroma/Makefile ============================================================================== --- head/games/chroma/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/chroma/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -37,7 +37,7 @@ PLIST_SUB+= CURSES="@comment " .if ${PORT_OPTIONS:MSDL} USE_SDL= sdl image -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 PLIST_SUB+= SDL="" .else CONFIGURE_ARGS+=--disable-sdl Copied: head/games/crrcsim/files/patch-src-mod__inputdev-inputdev__parallel-inputdev__parallel.cpp (from r321502, head/games/crrcsim/files/patch-src-mod_inputdev-inputdev_parallel-inputdev_parallel.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/crrcsim/files/patch-src-mod__inputdev-inputdev__parallel-inputdev__parallel.cpp Fri Jul 12 15:01:45 2013 (r322840, copy of r321502, head/games/crrcsim/files/patch-src-mod_inputdev-inputdev_parallel-inputdev_parallel.cpp) @@ -0,0 +1,11 @@ +--- src/mod_inputdev/inputdev_parallel/inputdev_parallel.cpp.orig 2009-03-07 19:41:23.000000000 +0300 ++++ src/mod_inputdev/inputdev_parallel/inputdev_parallel.cpp 2009-03-12 01:47:06.000000000 +0300 +@@ -28,7 +28,7 @@ + #if defined(__APPLE__) || defined(MACOSX) + #else + # if defined(WIN32) +-# elif defined(__powerpc__) ++# elif defined(__powerpc__) || defined (__FreeBSD__) + # define ioperm(a,b,c) -1 + # define inb(a) 0 + # define outb(a,b) Copied: head/games/crrcsim/files/patch-src-mod__inputdev-inputdev__serial-inputdev__serial.cpp (from r321502, head/games/crrcsim/files/patch-src-mod_inputdev-inputdev_serial-inputdev_serial.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/crrcsim/files/patch-src-mod__inputdev-inputdev__serial-inputdev__serial.cpp Fri Jul 12 15:01:45 2013 (r322840, copy of r321502, head/games/crrcsim/files/patch-src-mod_inputdev-inputdev_serial-inputdev_serial.cpp) @@ -0,0 +1,45 @@ +--- src/mod_inputdev/inputdev_serial/inputdev_serial.cpp.orig 2009-03-07 18:41:23.000000000 +0200 ++++ src/mod_inputdev/inputdev_serial/inputdev_serial.cpp 2009-04-11 13:08:44.939571159 +0300 +@@ -44,6 +44,8 @@ + + #ifdef WIN32 + #define DEFAULT_PORT_NAME "COM1" ++#elif defined (__FreeBSD__) ++#define DEFAULT_PORT_NAME "/dev/cuad0" + #else + #define DEFAULT_PORT_NAME "/dev/ttyS0" + #endif +@@ -444,11 +446,19 @@ + #else + // --- implementation for other OSes ---------------------------------------- + #ifdef OLD_WAY ++#if defined (__FreeBSD__) ++ const char* serialDevs[] = {"/dev/cuad0", "/dev/cuad1", ++ "/dev/cuad2", "/dev/cuad3", ++ "/dev/cuaU0", "/dev/cuaU1", ++ "/dev/cuaU2", "/dev/cuaU3", ++ NULL}; ++#else + const char* serialDevs[] = {"/dev/ttyS0", "/dev/ttyS1", + "/dev/ttyS2", "/dev/ttyS3", + "/dev/ttyUSB0", "/dev/ttyUSB1", + "/dev/ttyUSB2", "/dev/ttyUSB3", + NULL}; ++#endif + const char** ptr; + + for (ptr = serialDevs; *ptr != NULL; ptr++) +@@ -459,8 +469,13 @@ + // look for some well-known names in /dev/ + std::vector<std::string> serialDevs; + std::string sPath = "/dev"; ++#if defined (__FreeBSD__) ++ serialDevs.push_back("cuad"); ++ serialDevs.push_back("cuaU"); ++#else + serialDevs.push_back("ttyS"); + serialDevs.push_back("ttyUSB"); ++#endif + + ulDir *dir = ulOpenDir(sPath.c_str()); + if (dir != NULL) Modified: head/games/cultivation/Makefile ============================================================================== --- head/games/cultivation/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/cultivation/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cultivation -# Date created: 06 Feb 2007 -# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru> -# +# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru> # $FreeBSD$ -# PORTNAME= cultivation PORTVERSION= 8 @@ -27,6 +23,8 @@ MAKE_ARGS= CXX=${CXX} PORTDOCS= changeLog.txt how_to_play.txt +.include <bsd.port.options.mk> + post-patch: @cd ${WRKSRC} && ${CAT} Makefile.GnuLinux Makefile.common \ ../minorGems/build/Makefile.minorGems gameSource/Makefile.all \ @@ -46,8 +44,8 @@ do-install: ${INSTALL_DATA} ${BUILD_WRKSRC}/language.txt ${DATADIR} ${INSTALL_DATA} ${BUILD_WRKSRC}/languages/* ${DATADIR}/languages -.if !defined(NOPORTDOCS) post-install: +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/documentation/${f} ${DOCSDIR} Modified: head/games/enigma/Makefile ============================================================================== --- head/games/enigma/Makefile Fri Jul 12 14:31:56 2013 (r322839) +++ head/games/enigma/Makefile Fri Jul 12 15:01:45 2013 (r322840) @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-64b MAINTAINER= amdmi3@FreeBSD.org COMMENT= Enigma is a reimplementation of Oxyd, a puzzle game -LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \ +LIB_DEPENDS= xerces-c:${PORTSDIR}/textproc/xerces-c2 \ png15:${PORTSDIR}/graphics/png *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307121501.r6CF1k5Y041838>