diff --git a/Makefile b/Makefile index 9be4bfac7d..e7292a884f 100644 --- a/Makefile +++ b/Makefile @@ -245,8 +245,6 @@ SUBDIR+= binutils-gold-git SUBDIR+= biopython SUBDIR+= bioruby SUBDIR+= bip -SUBDIR+= bird -SUBDIR+= bird6 SUBDIR+= bitkeeper SUBDIR+= bitlbee SUBDIR+= bkchem @@ -798,15 +796,12 @@ SUBDIR+= firefox-hg SUBDIR+= firefox-webrtc SUBDIR+= firefox-wrapper SUBDIR+= firehose -SUBDIR+= fish SUBDIR+= flam3-svn SUBDIR+= flang-git SUBDIR+= flashrom SUBDIR+= flasm SUBDIR+= flexdock SUBDIR+= flexdump -SUBDIR+= flightgear -SUBDIR+= flightgear-data SUBDIR+= flim SUBDIR+= flimp SUBDIR+= flimsel @@ -838,7 +833,6 @@ SUBDIR+= freedup SUBDIR+= freedup16 SUBDIR+= freefem++ SUBDIR+= freej -SUBDIR+= freeradius2 SUBDIR+= freeswitch-core SUBDIR+= freeswitch-music SUBDIR+= freesynd @@ -2167,7 +2161,6 @@ SUBDIR+= mpfi SUBDIR+= mpg123-jack SUBDIR+= mpg123-svn SUBDIR+= mpgedit -SUBDIR+= mpi-ch SUBDIR+= mpibzip2 SUBDIR+= mplabs SUBDIR+= mplayer-mt @@ -2204,7 +2197,6 @@ SUBDIR+= multisync-syncml SUBDIR+= multisync-syncml-moto SUBDIR+= multitail SUBDIR+= mumble -SUBDIR+= munge SUBDIR+= munin-c-git SUBDIR+= munin-common SUBDIR+= munin-master @@ -2394,7 +2386,6 @@ SUBDIR+= openh264 SUBDIR+= openjazz SUBDIR+= openjdk8-openjfx-hg SUBDIR+= openlogos -SUBDIR+= openmpi SUBDIR+= openmpi163 SUBDIR+= openmw SUBDIR+= openmx-openmpi @@ -2402,11 +2393,9 @@ SUBDIR+= opennurbs SUBDIR+= openra SUBDIR+= openrct2 SUBDIR+= openrw-git -SUBDIR+= opensc SUBDIR+= openscad SUBDIR+= openscep SUBDIR+= opensips -SUBDIR+= openssh SUBDIR+= openssl110 SUBDIR+= opensubdiv SUBDIR+= opentomb @@ -2429,7 +2418,6 @@ SUBDIR+= orbifolder SUBDIR+= org-caldav-git SUBDIR+= orion SUBDIR+= orocos-kdl -SUBDIR+= osg SUBDIR+= oslc SUBDIR+= osmo SUBDIR+= osmo-sdr-git @@ -4293,7 +4281,6 @@ SUBDIR+= sil-scheherazade-ttf SUBDIR+= silky SUBDIR+= silo SUBDIR+= silvertree -SUBDIR+= simgear SUBDIR+= simgrid SUBDIR+= simpa SUBDIR+= simple-mtpfs diff --git a/bird/DESCR b/bird/DESCR deleted file mode 100644 index 25c4157530..0000000000 --- a/bird/DESCR +++ /dev/null @@ -1,14 +0,0 @@ -The BIRD project aims to develop a fully functional dynamic IP routing daemon -primarily targetted on (but not limited to) UNIX-like systems and distributed -under the GNU General Public License. - -+ The bird package is for IPv4, bird6 for IPv6 -+ Multiple routing tables -+ BGP -+ RIP -+ OSPF -+ Static routes -+ Inter-table protocol -+ Command-line interface -+ Soft reconfiguration -+ Powerful language for route filtering diff --git a/bird/Makefile b/bird/Makefile deleted file mode 100644 index 6d9ab93481..0000000000 --- a/bird/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile,v 1.3 2015/08/18 07:31:14 wiz Exp $ - -.include "../bird/Makefile.common" diff --git a/bird/Makefile.common b/bird/Makefile.common deleted file mode 100644 index 8e3c9e2e6e..0000000000 --- a/bird/Makefile.common +++ /dev/null @@ -1,41 +0,0 @@ -# $NetBSD: Makefile.common,v 1.7 2015/02/03 13:58:32 mef Exp $ -# used by net/bird/Makefile -# used by net/bird6/Makefile - -DISTNAME= bird-1.6.3 -PKGNAME= ${DISTNAME:S/bird/bird${BIRD6}/} -CATEGORIES= net -MASTER_SITES= ftp://bird.network.cz/pub/bird/ - -MAINTAINER= amd@pd-house.info -HOMEPAGE= http://bird.network.cz/ -COMMENT= The BIRD Internet Routing Daemon -LICENSE= gnu-gpl-v2 - -# Has hardcoded BSD/Linux support. -NOT_FOR_PLATFORM= SunOS-*-* - -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= gmake flex bison - -CONFIGURE_ARGS+= --localstatedir=/var -BIRD6?= # empty -PLIST_SUBST+= BIRD6=${BIRD6} - -FILESDIR= ${.CURDIR}/../bird/files -PATCHDIR= ${.CURDIR}/../bird/patches -DISTINFO_FILE= ${.CURDIR}/../bird/distinfo -PLIST_SRC= ${.CURDIR}/../bird/PLIST -DESCR_SRC= ${.CURDIR}/../bird/DESCR - -RCD_SCRIPTS+= bird${BIRD6} - -EGDIR= ${PREFIX}/share/examples/bird${BIRD6} -ALL_ENV+= EGDIR=${EGDIR} -CONF_FILES= ${EGDIR}/bird${BIRD6}.conf ${PKG_SYSCONFDIR}/bird${BIRD6}.conf - -.include "../../devel/readline/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/bird/PLIST b/bird/PLIST deleted file mode 100644 index ffe9fadf4f..0000000000 --- a/bird/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2014/03/28 23:27:16 pettai Exp $ -sbin/bird${BIRD6} -sbin/birdc${BIRD6} -sbin/birdcl${BIRD6} -share/examples/bird${BIRD6}/bird${BIRD6}.conf diff --git a/bird/distinfo b/bird/distinfo deleted file mode 100644 index 4c78066d3e..0000000000 --- a/bird/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.9 2015/11/04 00:34:54 agc Exp $ - -SHA1 (bird-1.6.3.tar.gz) = a6714488c4466778abeaba14ca9441066283676e -RMD160 (bird-1.6.3.tar.gz) = 238e113ebbe1871413bce307cd5303f92bc21fe9 -SHA512 (bird-1.6.3.tar.gz) = d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df -Size (bird-1.6.3.tar.gz) = 1337198 bytes -SHA1 (patch-configure) = b22044e5be530867a05406d4b32d789933993d53 -SHA1 (patch-tools_Makefile.in) = 4a6ad298abbe8c42627528c9156ce581a6e07917 diff --git a/bird/files/bird.sh b/bird/files/bird.sh deleted file mode 100644 index 9b3c26e3d3..0000000000 --- a/bird/files/bird.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: bird.sh,v 1.1.1.1 2012/01/22 02:53:01 agc Exp $ -# -# PROVIDE: bird -# REQUIRE: DAEMON NETWORKING - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="bird" -rcvar="${name}" -command="@PREFIX@/sbin/${name}" - -load_rc_config $name -run_rc_command "$1" diff --git a/bird/files/bird6.sh b/bird/files/bird6.sh deleted file mode 100644 index 0a2fe38183..0000000000 --- a/bird/files/bird6.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: bird6.sh,v 1.1.1.1 2012/01/22 02:53:01 agc Exp $ -# -# PROVIDE: bird6 -# REQUIRE: DAEMON NETWORKING - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="bird6" -rcvar="${name}" -command="@PREFIX@/sbin/${name}" - -load_rc_config $name -run_rc_command "$1" diff --git a/bird/patches/patch-configure b/bird/patches/patch-configure deleted file mode 100644 index 430dd0eb0e..0000000000 --- a/bird/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-configure,v 1.4 2015/02/03 13:58:32 mef Exp $ - -date: 2013-10-21 03:00:57 +0900; author: joerg; state: Exp; lines: +12 -1; commitid: 17vYRnrUrAvnK3ax; -Prefix rpath options with -Wl. - ---- configure.orig 2013-07-28 18:57:59.000000000 +0000 -+++ configure -@@ -4442,12 +4442,8 @@ else - default_iproutedir="/etc/iproute2" - ;; - ipv6:netbsd*) sysdesc=bsd-v6 -- CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" -- LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib" - ;; - ipv4:netbsd*) sysdesc=bsd -- CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" -- LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib" - ;; - ipv6:freebsd*) sysdesc=bsd-v6 - ;; diff --git a/bird/patches/patch-tools_Makefile.in b/bird/patches/patch-tools_Makefile.in deleted file mode 100644 index f2b157301c..0000000000 --- a/bird/patches/patch-tools_Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-tools_Makefile.in,v 1.3 2015/02/03 13:58:32 mef Exp $ - -install the example config files into the correct directory - ---- tools/Makefile.in.orig 2015-02-03 22:44:02.000000000 +0900 -+++ tools/Makefile.in 2015-02-03 22:49:01.000000000 +0900 -@@ -68,17 +68,14 @@ tags: - cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` - - install: all -- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ -+ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(EGDIR) $(DESTDIR)/@runtimedir@ - $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@ - $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@ - if test -n "@CLIENT@" ; then \ - $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ; \ - fi -- if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then \ -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ; \ -- else \ -- echo "Not overwriting old bird@SUFFIX@.conf" ; \ -- fi -+ -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(EGDIR)/bird@SUFFIX@.conf - - install-docs: - $(INSTALL) -d $(DESTDIR)/$(docdir) diff --git a/bird6/Makefile b/bird6/Makefile deleted file mode 100644 index bcaf36f916..0000000000 --- a/bird6/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2015/08/17 17:11:27 wiz Exp $ - -CONFIGURE_ARGS+= --enable-ipv6 -BIRD6= 6 - -.include "../bird/Makefile.common" diff --git a/fftw-mpich/Makefile b/fftw-mpich/Makefile index 722c54c5f9..058a58cdd8 100644 --- a/fftw-mpich/Makefile +++ b/fftw-mpich/Makefile @@ -37,5 +37,5 @@ USE_TOOLS+= perl TEST_MAKE_FLAGS+= MPIRUN=$(PREFIX}/mpich/bin/mpirun .endif -.include "../../wip/mpi-ch/buildlink3.mk" +.include "../../parallel/mpi-ch/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fish/DESCR b/fish/DESCR deleted file mode 100644 index 741ea0a3a8..0000000000 --- a/fish/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -fish is a user friendly command line shell for UNIX-like operating -systems, written mainly with interactive use in mind. It differs -from other shells in that it only provides as few commands as -built-ins as possible and has a daemon which allows it to have -shared variables and command-line history between shell instances. -It also features feature-rich tab-completion and has command-line -syntax highlighting. diff --git a/fish/Makefile b/fish/Makefile deleted file mode 100644 index 8ec72a2a3a..0000000000 --- a/fish/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# $NetBSD: Makefile,v 1.11 2017/08/19 09:28:38 fhajny Exp $ - -DISTNAME= fish-2.6.0 -CATEGORIES= shells -MASTER_SITES= http://fishshell.com/files/${PKGVERSION_NOREV}/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.fishshell.com/ -COMMENT= User friendly command line shell for UNIX-like operating systems -LICENSE= gnu-gpl-v2 - -EXTRACT_USING= gtar - -USE_LANGUAGES+= c c++ -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --without-xsel -USE_TOOLS+= gmake autoreconf autoconf automake - -EGDIR= ${PREFIX}/share/examples/fish -INSTALL_ENV+= EGDIR=${EGDIR} - -PKG_SHELL= bin/fish - -REPLACE_PYTHON+= share/tools/*.py -REPLACE_PYTHON+= share/tools/web_config/webconfig.py - -LDFLAGS.SunOS+= -lintl - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) -CPPFLAGS+= -DHAVE_BACKTRACE -CPPFLAGS+= -DHAVE_BACKTRACE_SYMBOLS -CXXFLAGS.NetBSD+= -fpermissive -LDFLAGS+= -lexecinfo -.endif - -# Upstream intentionally omits open.1 on Darwin -PLIST_VARS+= open -.if ${OPSYS} != "Darwin" -PLIST.open= yes -.endif - -pre-configure: - ${RUN} cd ${WRKSRC} && autoreconf -fiv - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/gettext-tools/buildlink3.mk" -.include "../../lang/python/application.mk" -.include "../../mk/curses.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/fish/PLIST b/fish/PLIST deleted file mode 100644 index bb94fd0ab1..0000000000 --- a/fish/PLIST +++ /dev/null @@ -1,892 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2017/08/19 09:28:38 fhajny Exp $ -bin/fish -bin/fish_indent -bin/fish_key_reader -man/man1/fish.1 -man/man1/fish_indent.1 -man/man1/fish_key_reader.1 -share/doc/fish/CHANGELOG.md -share/doc/fish/ascii_fish.png -share/doc/fish/bc_s.png -share/doc/fish/bdwn.png -share/doc/fish/closed.png -share/doc/fish/commands.html -share/doc/fish/design.html -share/doc/fish/doxygen.css -share/doc/fish/doxygen.png -share/doc/fish/dynsections.js -share/doc/fish/faq.html -share/doc/fish/ftv2blank.png -share/doc/fish/ftv2doc.png -share/doc/fish/ftv2folderclosed.png -share/doc/fish/ftv2folderopen.png -share/doc/fish/ftv2lastnode.png -share/doc/fish/ftv2link.png -share/doc/fish/ftv2mlastnode.png -share/doc/fish/ftv2mnode.png -share/doc/fish/ftv2node.png -share/doc/fish/ftv2plastnode.png -share/doc/fish/ftv2pnode.png -share/doc/fish/ftv2splitbar.png -share/doc/fish/ftv2vertline.png -share/doc/fish/index.html -share/doc/fish/license.html -share/doc/fish/nav_f.png -share/doc/fish/nav_g.png -share/doc/fish/nav_h.png -share/doc/fish/open.png -share/doc/fish/pages.html -share/doc/fish/sync_off.png -share/doc/fish/sync_on.png -share/doc/fish/tab_a.png -share/doc/fish/tab_b.png -share/doc/fish/tab_h.png -share/doc/fish/tab_s.png -share/doc/fish/tabs.css -share/doc/fish/tutorial.html -share/doc/fish/user_doc.css -share/examples/fish/config.fish -share/fish/__fish_build_paths.fish -share/fish/completions/..fish -share/fish/completions/VBoxHeadless.fish -share/fish/completions/VBoxSDL.fish -share/fish/completions/a2disconf.fish -share/fish/completions/a2dismod.fish -share/fish/completions/a2dissite.fish -share/fish/completions/a2enconf.fish -share/fish/completions/a2enmod.fish -share/fish/completions/a2ensite.fish -share/fish/completions/abbr.fish -share/fish/completions/abook.fish -share/fish/completions/acat.fish -share/fish/completions/accept.fish -share/fish/completions/ack.fish -share/fish/completions/acpi.fish -share/fish/completions/adb.fish -share/fish/completions/adduser.fish -share/fish/completions/adiff.fish -share/fish/completions/als.fish -share/fish/completions/alsactl.fish -share/fish/completions/alsamixer.fish -share/fish/completions/amixer.fish -share/fish/completions/and.fish -share/fish/completions/animate.fish -share/fish/completions/ant.fish -share/fish/completions/apack.fish -share/fish/completions/apm.fish -share/fish/completions/apropos.fish -share/fish/completions/apt-build.fish -share/fish/completions/apt-cache.fish -share/fish/completions/apt-cdrom.fish -share/fish/completions/apt-config.fish -share/fish/completions/apt-extracttemplates.fish -share/fish/completions/apt-file.fish -share/fish/completions/apt-ftparchive.fish -share/fish/completions/apt-get.fish -share/fish/completions/apt-key.fish -share/fish/completions/apt-listbugs.fish -share/fish/completions/apt-listchanges.fish -share/fish/completions/apt-mark.fish -share/fish/completions/apt-move.fish -share/fish/completions/apt-proxy-import.fish -share/fish/completions/apt-rdepends.fish -share/fish/completions/apt-setup.fish -share/fish/completions/apt-show-source.fish -share/fish/completions/apt-show-versions.fish -share/fish/completions/apt-sortpkgs.fish -share/fish/completions/apt-spy.fish -share/fish/completions/apt-src.fish -share/fish/completions/apt-zip-inst.fish -share/fish/completions/apt-zip-list.fish -share/fish/completions/apt.fish -share/fish/completions/aptitude.fish -share/fish/completions/arc.fish -share/fish/completions/arepack.fish -share/fish/completions/arp.fish -share/fish/completions/asp.fish -share/fish/completions/at.fish -share/fish/completions/atd.fish -share/fish/completions/atom.fish -share/fish/completions/atool.fish -share/fish/completions/atq.fish -share/fish/completions/atrm.fish -share/fish/completions/aunpack.fish -share/fish/completions/aura.fish -share/fish/completions/awk.fish -share/fish/completions/badblocks.fish -share/fish/completions/base64.fish -share/fish/completions/bc.fish -share/fish/completions/bg.fish -share/fish/completions/bind.fish -share/fish/completions/bison.fish -share/fish/completions/block.fish -share/fish/completions/break.fish -share/fish/completions/brew.fish -share/fish/completions/btdownloadcurses.py.fish -share/fish/completions/btdownloadheadless.py.fish -share/fish/completions/builtin.fish -share/fish/completions/bundle.fish -share/fish/completions/bunzip2.fish -share/fish/completions/busctl.fish -share/fish/completions/bzcat.fish -share/fish/completions/bzip2.fish -share/fish/completions/bzip2recover.fish -share/fish/completions/bzr.fish -share/fish/completions/cabal-dev.fish -share/fish/completions/cabal.fish -share/fish/completions/caddy.fish -share/fish/completions/caffeinate.fish -share/fish/completions/cancel.fish -share/fish/completions/canto.fish -share/fish/completions/cargo.fish -share/fish/completions/castnow.fish -share/fish/completions/cat.fish -share/fish/completions/cd.fish -share/fish/completions/cdrecord.fish -share/fish/completions/chgrp.fish -share/fish/completions/chmod.fish -share/fish/completions/chown.fish -share/fish/completions/chsh.fish -share/fish/completions/climate.fish -share/fish/completions/colordiff.fish -share/fish/completions/colorsvn.fish -share/fish/completions/combine.fish -share/fish/completions/command.fish -share/fish/completions/commandline.fish -share/fish/completions/compare.fish -share/fish/completions/complete.fish -share/fish/completions/composer.fish -share/fish/completions/composer.phar.fish -share/fish/completions/composite.fish -share/fish/completions/configure.fish -share/fish/completions/conjure.fish -share/fish/completions/connmanctl.fish -share/fish/completions/continue.fish -share/fish/completions/convert.fish -share/fish/completions/cower.fish -share/fish/completions/cowsay.fish -share/fish/completions/cowthink.fish -share/fish/completions/cp.fish -share/fish/completions/cupsaccept.fish -share/fish/completions/cupsdisable.fish -share/fish/completions/cupsenable.fish -share/fish/completions/cupsreject.fish -share/fish/completions/cut.fish -share/fish/completions/cvs.fish -share/fish/completions/cygport.fish -share/fish/completions/darcs.fish -share/fish/completions/date.fish -share/fish/completions/dconf.fish -share/fish/completions/dd.fish -share/fish/completions/defaults.fish -share/fish/completions/df.fish -share/fish/completions/diff.fish -share/fish/completions/dig.fish -share/fish/completions/diskutil.fish -share/fish/completions/display.fish -share/fish/completions/djview.fish -share/fish/completions/djview4.fish -share/fish/completions/dlocate.fish -share/fish/completions/dmesg.fish -share/fish/completions/dnf.fish -share/fish/completions/dpkg-reconfigure.fish -share/fish/completions/dpkg.fish -share/fish/completions/dropbox.fish -share/fish/completions/du.fish -share/fish/completions/duply.fish -share/fish/completions/dvipdf.fish -share/fish/completions/dvipdfm.fish -share/fish/completions/echo.fish -share/fish/completions/egrep.fish -share/fish/completions/eix-sync.fish -share/fish/completions/eix.fish -share/fish/completions/elatex.fish -share/fish/completions/elixir.fish -share/fish/completions/emacs.fish -share/fish/completions/emerge.fish -share/fish/completions/encfs.fish -share/fish/completions/entr.fish -share/fish/completions/env.fish -share/fish/completions/equery.fish -share/fish/completions/eselect.fish -share/fish/completions/etex.fish -share/fish/completions/eval.fish -share/fish/completions/evince.fish -share/fish/completions/exec.fish -share/fish/completions/exit.fish -share/fish/completions/expand.fish -share/fish/completions/feh.fish -share/fish/completions/fg.fish -share/fish/completions/fgrep.fish -share/fish/completions/figlet.fish -share/fish/completions/file.fish -share/fish/completions/find.fish -share/fish/completions/fish.fish -share/fish/completions/fish_indent.fish -share/fish/completions/flac.fish -share/fish/completions/flatpak.fish -share/fish/completions/fluxbox-remote.fish -share/fish/completions/fossil.fish -share/fish/completions/ftp.fish -share/fish/completions/funced.fish -share/fish/completions/funcsave.fish -share/fish/completions/function.fish -share/fish/completions/functions.fish -share/fish/completions/fuser.fish -share/fish/completions/fusermount.fish -share/fish/completions/gcc.fish -share/fish/completions/gdb.fish -share/fish/completions/gem.fish -share/fish/completions/git.fish -share/fish/completions/go.fish -share/fish/completions/godoc.fish -share/fish/completions/gofmt.fish -share/fish/completions/goimports.fish -share/fish/completions/golint.fish -share/fish/completions/gorename.fish -share/fish/completions/gpasswd.fish -share/fish/completions/gpg.fish -share/fish/completions/gphoto2.fish -share/fish/completions/gprof.fish -share/fish/completions/gradle.fish -share/fish/completions/grep.fish -share/fish/completions/groupadd.fish -share/fish/completions/grunt.fish -share/fish/completions/gsettings.fish -share/fish/completions/gunzip.fish -share/fish/completions/gv.fish -share/fish/completions/gvim.fish -share/fish/completions/gvimdiff.fish -share/fish/completions/gzip.fish -share/fish/completions/head.fish -share/fish/completions/helm.fish -share/fish/completions/help.fish -share/fish/completions/heroku.fish -share/fish/completions/hg.fish -share/fish/completions/highlight.fish -share/fish/completions/history.fish -share/fish/completions/htop.fish -share/fish/completions/i3-msg.fish -share/fish/completions/iconv.fish -share/fish/completions/id.fish -share/fish/completions/identify.fish -share/fish/completions/iex.fish -share/fish/completions/ifconfig.fish -share/fish/completions/ifdata.fish -share/fish/completions/ifdown.fish -share/fish/completions/ifup.fish -share/fish/completions/import.fish -share/fish/completions/invoke-rc.d.fish -share/fish/completions/ip.fish -share/fish/completions/ipset.fish -share/fish/completions/iptables.fish -share/fish/completions/jobs.fish -share/fish/completions/journalctl.fish -share/fish/completions/jq.fish -share/fish/completions/kcmshell5.fish -share/fish/completions/kill.fish -share/fish/completions/killall.fish -share/fish/completions/kitchen.fish -share/fish/completions/la.fish -share/fish/completions/latex.fish -share/fish/completions/latexmk.fish -share/fish/completions/launchctl.fish -share/fish/completions/lein.fish -share/fish/completions/less.fish -share/fish/completions/light.fish -share/fish/completions/ll.fish -share/fish/completions/ln.fish -share/fish/completions/localectl.fish -share/fish/completions/locate.fish -share/fish/completions/logkeys.fish -share/fish/completions/lp.fish -share/fish/completions/lpadmin.fish -share/fish/completions/lpinfo.fish -share/fish/completions/lpmove.fish -share/fish/completions/lpoptions.fish -share/fish/completions/lppasswd.fish -share/fish/completions/lpq.fish -share/fish/completions/lpr.fish -share/fish/completions/lprm.fish -share/fish/completions/lpstat.fish -share/fish/completions/ls.fish -share/fish/completions/lsblk.fish -share/fish/completions/lscpu.fish -share/fish/completions/lsof.fish -share/fish/completions/lsusb.fish -share/fish/completions/lua.fish -share/fish/completions/lualatex.fish -share/fish/completions/lunchy.fish -share/fish/completions/lxc.fish -share/fish/completions/lxpanel.fish -share/fish/completions/m4.fish -share/fish/completions/machinectl.fish -share/fish/completions/magento.fish -share/fish/completions/make.fish -share/fish/completions/makedepend.fish -share/fish/completions/makepkg.fish -share/fish/completions/man.fish -share/fish/completions/mc.fish -share/fish/completions/md5sum.fish -share/fish/completions/mdbook.fish -share/fish/completions/mddiagnose.fish -share/fish/completions/mdfind.fish -share/fish/completions/mdimport.fish -share/fish/completions/mdls.fish -share/fish/completions/mdutil.fish -share/fish/completions/minikube.fish -share/fish/completions/mix.fish -share/fish/completions/mkdir.fish -share/fish/completions/mkdosfs.fish -share/fish/completions/mkfs.fat.fish -share/fish/completions/mkfs.vfat.fish -share/fish/completions/mkinitcpio.fish -share/fish/completions/mktemp.fish -share/fish/completions/mkvextract.fish -share/fish/completions/mocha.fish -share/fish/completions/mocp.fish -share/fish/completions/modinfo.fish -share/fish/completions/modprobe.fish -share/fish/completions/mogrify.fish -share/fish/completions/montage.fish -share/fish/completions/mosh.fish -share/fish/completions/mount.fish -share/fish/completions/mplayer.fish -share/fish/completions/msgfmt.fish -share/fish/completions/mupdf.fish -share/fish/completions/mutt.fish -share/fish/completions/mv.fish -share/fish/completions/mvn.fish -share/fish/completions/namei.fish -share/fish/completions/native2ascii.fish -share/fish/completions/ncdu.fish -share/fish/completions/netcat.fish -share/fish/completions/netctl-auto.fish -share/fish/completions/netctl.fish -share/fish/completions/networkctl.fish -share/fish/completions/nextd.fish -share/fish/completions/nice.fish -share/fish/completions/ninja.fish -share/fish/completions/nl.fish -share/fish/completions/nm.fish -share/fish/completions/nmcli.fish -share/fish/completions/node.fish -share/fish/completions/not.fish -share/fish/completions/npm.fish -share/fish/completions/nvim.fish -share/fish/completions/nvram.fish -share/fish/completions/objdump.fish -share/fish/completions/obnam.fish -share/fish/completions/oggenc.fish -share/fish/completions/omega.fish -share/fish/completions/opam.fish -share/fish/completions/open.fish -share/fish/completions/or.fish -share/fish/completions/p4.fish -share/fish/completions/pacaur.fish -share/fish/completions/pacman-color.fish -share/fish/completions/pacman-key.fish -share/fish/completions/pacman.fish -share/fish/completions/pacmatic.fish -share/fish/completions/pacmd.fish -share/fish/completions/pacsrv.fish -share/fish/completions/pactl.fish -share/fish/completions/pactree.fish -share/fish/completions/patch.fish -share/fish/completions/pbget.fish -share/fish/completions/pdfelatex.fish -share/fish/completions/pdfetex.fish -share/fish/completions/pdflatex.fish -share/fish/completions/pdftex.fish -share/fish/completions/pdftotext.fish -share/fish/completions/perl.fish -share/fish/completions/pftp.fish -share/fish/completions/pgrep.fish -share/fish/completions/pine.fish -share/fish/completions/ping.fish -share/fish/completions/pinky.fish -share/fish/completions/pkg-config.fish -share/fish/completions/pkg.fish -share/fish/completions/pkgadd.fish -share/fish/completions/pkgfile.fish -share/fish/completions/pkginfo.fish -share/fish/completions/pkgmk.fish -share/fish/completions/pkgrm.fish -share/fish/completions/pkill.fish -share/fish/completions/poff.fish -share/fish/completions/pon.fish -share/fish/completions/portmaster.fish -share/fish/completions/ports.fish -share/fish/completions/poweroff.fish -share/fish/completions/prevd.fish -share/fish/completions/prt-get.fish -share/fish/completions/ps.fish -share/fish/completions/ps2pdf.fish -share/fish/completions/psql.fish -share/fish/completions/psub.fish -share/fish/completions/pushd.fish -share/fish/completions/pv.fish -share/fish/completions/pydf.fish -share/fish/completions/pygmentize.fish -share/fish/completions/python.fish -share/fish/completions/python2.fish -share/fish/completions/python3.fish -share/fish/completions/quilt.fish -share/fish/completions/random.fish -share/fish/completions/ranger.fish -share/fish/completions/rbenv.fish -share/fish/completions/rc-service.fish -share/fish/completions/rc-update.fish -share/fish/completions/rc.d.fish -share/fish/completions/read.fish -share/fish/completions/readlink.fish -share/fish/completions/realpath.fish -share/fish/completions/reject.fish -share/fish/completions/rejmerge.fish -share/fish/completions/renice.fish -share/fish/completions/return.fish -share/fish/completions/rfkill.fish -share/fish/completions/rgrep.fish -share/fish/completions/rm.fish -share/fish/completions/rmdir.fish -share/fish/completions/rmmod.fish -share/fish/completions/root.fish -share/fish/completions/rpm.fish -share/fish/completions/rsync.fish -share/fish/completions/ruby-build.fish -share/fish/completions/ruby.fish -share/fish/completions/rustc.fish -share/fish/completions/sass-convert.fish -share/fish/completions/sass.fish -share/fish/completions/scanimage.fish -share/fish/completions/scons.fish -share/fish/completions/scp.fish -share/fish/completions/screen.fish -share/fish/completions/scrot.fish -share/fish/completions/scss.fish -share/fish/completions/sed.fish -share/fish/completions/seq.fish -share/fish/completions/service.fish -share/fish/completions/set.fish -share/fish/completions/set_color.fish -share/fish/completions/setfacl.fish -share/fish/completions/setsid.fish -share/fish/completions/setxkbmap.fish -share/fish/completions/sha1sum.fish -share/fish/completions/sha224sum.fish -share/fish/completions/sha256sum.fish -share/fish/completions/sha384sum.fish -share/fish/completions/sha512sum.fish -share/fish/completions/sort.fish -share/fish/completions/source.fish -share/fish/completions/ssh.fish -share/fish/completions/sshfs.fish -share/fish/completions/stack.fish -share/fish/completions/stat.fish -share/fish/completions/status.fish -share/fish/completions/stream.fish -share/fish/completions/string.fish -share/fish/completions/su.fish -share/fish/completions/sudo.fish -share/fish/completions/svn.fish -share/fish/completions/sylpheed.fish -share/fish/completions/sysbench.fish -share/fish/completions/sysctl.fish -share/fish/completions/systemctl.fish -share/fish/completions/systemd-analyze.fish -share/fish/completions/systemd-nspawn.fish -share/fish/completions/tail.fish -share/fish/completions/tar.fish -share/fish/completions/tee.fish -share/fish/completions/telnet.fish -share/fish/completions/termite.fish -share/fish/completions/terraform.fish -share/fish/completions/test.fish -share/fish/completions/tex.fish -share/fish/completions/time.fish -share/fish/completions/timedatectl.fish -share/fish/completions/timeout.fish -share/fish/completions/tmutil.fish -share/fish/completions/tmux.fish -share/fish/completions/tmuxinator.fish -share/fish/completions/top.fish -share/fish/completions/totem.fish -share/fish/completions/touch.fish -share/fish/completions/tr.fish -share/fish/completions/transmission-remote.fish -share/fish/completions/trap.fish -share/fish/completions/travis.fish -share/fish/completions/tree.fish -share/fish/completions/type.fish -share/fish/completions/udisksctl.fish -share/fish/completions/ulimit.fish -share/fish/completions/umount.fish -share/fish/completions/uname.fish -share/fish/completions/unexpand.fish -share/fish/completions/uniq.fish -share/fish/completions/unrar.fish -share/fish/completions/update-eix-remote.fish -share/fish/completions/update-eix.fish -share/fish/completions/useradd.fish -share/fish/completions/usermod.fish -share/fish/completions/vagrant.fish -share/fish/completions/valgrind.fish -share/fish/completions/vared.fish -share/fish/completions/vi.fish -share/fish/completions/vim-addons.fish -share/fish/completions/vim.fish -share/fish/completions/vimdiff.fish -share/fish/completions/w.fish -share/fish/completions/wajig.fish -share/fish/completions/watch.fish -share/fish/completions/wc.fish -share/fish/completions/wesnoth.fish -share/fish/completions/wget.fish -share/fish/completions/whatis.fish -share/fish/completions/which.fish -share/fish/completions/who.fish -share/fish/completions/wicd-cli.fish -share/fish/completions/wicd-client.fish -share/fish/completions/wicd-gtk.fish -share/fish/completions/wpa_cli.fish -share/fish/completions/wvdial.fish -share/fish/completions/xargs.fish -share/fish/completions/xdg-mime.fish -share/fish/completions/xdvi.fish -share/fish/completions/xelatex.fish -share/fish/completions/xgettext.fish -share/fish/completions/xinput.fish -share/fish/completions/xmms.fish -share/fish/completions/xpdf.fish -share/fish/completions/xprop.fish -share/fish/completions/xrandr.fish -share/fish/completions/xrdb.fish -share/fish/completions/xsel.fish -share/fish/completions/xterm.fish -share/fish/completions/xz.fish -share/fish/completions/yaourt.fish -share/fish/completions/yarn.fish -share/fish/completions/yast2.fish -share/fish/completions/yum.fish -share/fish/completions/zcat.fish -share/fish/completions/zip.fish -share/fish/completions/zypper.fish -share/fish/config.fish -share/fish/functions/N_.fish -share/fish/functions/_.fish -share/fish/functions/__fish_append.fish -share/fish/functions/__fish_bind_test1.fish -share/fish/functions/__fish_bind_test2.fish -share/fish/functions/__fish_cancel_commandline.fish -share/fish/functions/__fish_commandline_is_singlequoted.fish -share/fish/functions/__fish_commandline_test.fish -share/fish/functions/__fish_complete_abook_formats.fish -share/fish/functions/__fish_complete_ant_targets.fish -share/fish/functions/__fish_complete_atool_archive_contents.fish -share/fish/functions/__fish_complete_bittorrent.fish -share/fish/functions/__fish_complete_blockdevice.fish -share/fish/functions/__fish_complete_cd.fish -share/fish/functions/__fish_complete_command.fish -share/fish/functions/__fish_complete_convert_options.fish -share/fish/functions/__fish_complete_directories.fish -share/fish/functions/__fish_complete_file_url.fish -share/fish/functions/__fish_complete_ftp.fish -share/fish/functions/__fish_complete_groups.fish -share/fish/functions/__fish_complete_job_pids.fish -share/fish/functions/__fish_complete_list.fish -share/fish/functions/__fish_complete_lpr.fish -share/fish/functions/__fish_complete_lpr_option.fish -share/fish/functions/__fish_complete_lsusb.fish -share/fish/functions/__fish_complete_man.fish -share/fish/functions/__fish_complete_mount_opts.fish -share/fish/functions/__fish_complete_path.fish -share/fish/functions/__fish_complete_pgrep.fish -share/fish/functions/__fish_complete_pids.fish -share/fish/functions/__fish_complete_ppp_peer.fish -share/fish/functions/__fish_complete_proc.fish -share/fish/functions/__fish_complete_setxkbmap.fish -share/fish/functions/__fish_complete_ssh.fish -share/fish/functions/__fish_complete_subcommand.fish -share/fish/functions/__fish_complete_subcommand_root.fish -share/fish/functions/__fish_complete_suffix.fish -share/fish/functions/__fish_complete_svn_diff.fish -share/fish/functions/__fish_complete_tar.fish -share/fish/functions/__fish_complete_unrar.fish -share/fish/functions/__fish_complete_users.fish -share/fish/functions/__fish_complete_wvdial_peers.fish -share/fish/functions/__fish_config_interactive.fish -share/fish/functions/__fish_contains_opt.fish -share/fish/functions/__fish_crux_packages.fish -share/fish/functions/__fish_cursor_1337.fish -share/fish/functions/__fish_cursor_konsole.fish -share/fish/functions/__fish_cursor_xterm.fish -share/fish/functions/__fish_describe_command.fish -share/fish/functions/__fish_filter_ant_targets.fish -share/fish/functions/__fish_git_prompt.fish -share/fish/functions/__fish_gnu_complete.fish -share/fish/functions/__fish_hg_prompt.fish -share/fish/functions/__fish_is_first_token.fish -share/fish/functions/__fish_is_git_repository.fish -share/fish/functions/__fish_is_token_n.fish -share/fish/functions/__fish_list_current_token.fish -share/fish/functions/__fish_make_completion_signals.fish -share/fish/functions/__fish_man_page.fish -share/fish/functions/__fish_move_last.fish -share/fish/functions/__fish_no_arguments.fish -share/fish/functions/__fish_not_contain_opt.fish -share/fish/functions/__fish_number_of_cmd_args_wo_opts.fish -share/fish/functions/__fish_paginate.fish -share/fish/functions/__fish_ports_dirs.fish -share/fish/functions/__fish_print_VBox_vms.fish -share/fish/functions/__fish_print_abook_emails.fish -share/fish/functions/__fish_print_addresses.fish -share/fish/functions/__fish_print_arch_daemons.fish -share/fish/functions/__fish_print_cmd_args.fish -share/fish/functions/__fish_print_cmd_args_without_options.fish -share/fish/functions/__fish_print_commands.fish -share/fish/functions/__fish_print_debian_apache_confs.fish -share/fish/functions/__fish_print_debian_apache_mods.fish -share/fish/functions/__fish_print_debian_apache_sites.fish -share/fish/functions/__fish_print_debian_services.fish -share/fish/functions/__fish_print_encodings.fish -share/fish/functions/__fish_print_filesystems.fish -share/fish/functions/__fish_print_function_prototypes.fish -share/fish/functions/__fish_print_help.fish -share/fish/functions/__fish_print_hostnames.fish -share/fish/functions/__fish_print_interfaces.fish -share/fish/functions/__fish_print_lpr_options.fish -share/fish/functions/__fish_print_lpr_printers.fish -share/fish/functions/__fish_print_lsblk_columns.fish -share/fish/functions/__fish_print_make_targets.fish -share/fish/functions/__fish_print_modules.fish -share/fish/functions/__fish_print_mounted.fish -share/fish/functions/__fish_print_ninja_targets.fish -share/fish/functions/__fish_print_ninja_tools.fish -share/fish/functions/__fish_print_packages.fish -share/fish/functions/__fish_print_pacman_repos.fish -share/fish/functions/__fish_print_service_names.fish -share/fish/functions/__fish_print_svn_rev.fish -share/fish/functions/__fish_print_users.fish -share/fish/functions/__fish_print_xdg_mimeapps.fish -share/fish/functions/__fish_print_xdg_mimetypes.fish -share/fish/functions/__fish_print_xrandr_modes.fish -share/fish/functions/__fish_print_xrandr_outputs.fish -share/fish/functions/__fish_print_xwindows.fish -share/fish/functions/__fish_prt_no_subcommand.fish -share/fish/functions/__fish_prt_packages.fish -share/fish/functions/__fish_prt_ports.fish -share/fish/functions/__fish_prt_use_package.fish -share/fish/functions/__fish_prt_use_port.fish -share/fish/functions/__fish_pwd.fish -share/fish/functions/__fish_seen_subcommand_from.fish -share/fish/functions/__fish_set_locale.fish -share/fish/functions/__fish_sgrep.fish -share/fish/functions/__fish_shared_key_bindings.fish -share/fish/functions/__fish_svn_prompt.fish -share/fish/functions/__fish_systemctl_automounts.fish -share/fish/functions/__fish_systemctl_devices.fish -share/fish/functions/__fish_systemctl_mounts.fish -share/fish/functions/__fish_systemctl_scopes.fish -share/fish/functions/__fish_systemctl_service_paths.fish -share/fish/functions/__fish_systemctl_services.fish -share/fish/functions/__fish_systemctl_slices.fish -share/fish/functions/__fish_systemctl_snapshots.fish -share/fish/functions/__fish_systemctl_sockets.fish -share/fish/functions/__fish_systemctl_swaps.fish -share/fish/functions/__fish_systemctl_targets.fish -share/fish/functions/__fish_systemctl_timers.fish -share/fish/functions/__fish_systemd_machine_images.fish -share/fish/functions/__fish_systemd_machines.fish -share/fish/functions/__fish_test_arg.fish -share/fish/functions/__fish_toggle_comment_commandline.fish -share/fish/functions/__fish_urlencode.fish -share/fish/functions/__fish_use_subcommand.fish -share/fish/functions/__fish_vcs_prompt.fish -share/fish/functions/__terlar_git_prompt.fish -share/fish/functions/abbr.fish -share/fish/functions/alias.fish -share/fish/functions/cd.fish -share/fish/functions/contains_seq.fish -share/fish/functions/delete-or-exit.fish -share/fish/functions/dirh.fish -share/fish/functions/dirs.fish -share/fish/functions/down-or-search.fish -share/fish/functions/edit_command_buffer.fish -share/fish/functions/eval.fish -share/fish/functions/export.fish -share/fish/functions/fish_clipboard_copy.fish -share/fish/functions/fish_clipboard_paste.fish -share/fish/functions/fish_config.fish -share/fish/functions/fish_default_key_bindings.fish -share/fish/functions/fish_default_mode_prompt.fish -share/fish/functions/fish_fallback_prompt.fish -share/fish/functions/fish_hybrid_key_bindings.fish -share/fish/functions/fish_indent.fish -share/fish/functions/fish_key_reader.fish -share/fish/functions/fish_md5.fish -share/fish/functions/fish_mode_prompt.fish -share/fish/functions/fish_prompt.fish -share/fish/functions/fish_update_completions.fish -share/fish/functions/fish_vi_cursor.fish -share/fish/functions/fish_vi_key_bindings.fish -share/fish/functions/fish_vi_mode.fish -share/fish/functions/funced.fish -share/fish/functions/funcsave.fish -share/fish/functions/grep.fish -share/fish/functions/help.fish -share/fish/functions/history.fish -share/fish/functions/hostname.fish -share/fish/functions/isatty.fish -share/fish/functions/la.fish -share/fish/functions/ll.fish -share/fish/functions/ls.fish -share/fish/functions/man.fish -share/fish/functions/math.fish -share/fish/functions/nextd-or-forward-word.fish -share/fish/functions/nextd.fish -share/fish/functions/open.fish -share/fish/functions/popd.fish -share/fish/functions/prevd-or-backward-word.fish -share/fish/functions/prevd.fish -share/fish/functions/prompt_hostname.fish -share/fish/functions/prompt_pwd.fish -share/fish/functions/psub.fish -share/fish/functions/pushd.fish -share/fish/functions/realpath.fish -share/fish/functions/seq.fish -share/fish/functions/setenv.fish -share/fish/functions/string.fish -share/fish/functions/suspend.fish -share/fish/functions/trap.fish -share/fish/functions/type.fish -share/fish/functions/umask.fish -share/fish/functions/up-or-search.fish -share/fish/functions/vared.fish -share/fish/groff/fish.tmac -share/fish/man/man1/abbr.1 -share/fish/man/man1/alias.1 -share/fish/man/man1/and.1 -share/fish/man/man1/begin.1 -share/fish/man/man1/bg.1 -share/fish/man/man1/bind.1 -share/fish/man/man1/block.1 -share/fish/man/man1/break.1 -share/fish/man/man1/breakpoint.1 -share/fish/man/man1/builtin.1 -share/fish/man/man1/case.1 -share/fish/man/man1/cd.1 -share/fish/man/man1/command.1 -share/fish/man/man1/commandline.1 -share/fish/man/man1/complete.1 -share/fish/man/man1/contains.1 -share/fish/man/man1/continue.1 -share/fish/man/man1/count.1 -share/fish/man/man1/dirh.1 -share/fish/man/man1/dirs.1 -share/fish/man/man1/disown.1 -share/fish/man/man1/echo.1 -share/fish/man/man1/else.1 -share/fish/man/man1/emit.1 -share/fish/man/man1/end.1 -share/fish/man/man1/eval.1 -share/fish/man/man1/exec.1 -share/fish/man/man1/exit.1 -share/fish/man/man1/false.1 -share/fish/man/man1/fg.1 -share/fish/man/man1/fish.1 -share/fish/man/man1/fish_config.1 -share/fish/man/man1/fish_indent.1 -share/fish/man/man1/fish_key_reader.1 -share/fish/man/man1/fish_mode_prompt.1 -share/fish/man/man1/fish_prompt.1 -share/fish/man/man1/fish_right_prompt.1 -share/fish/man/man1/fish_update_completions.1 -share/fish/man/man1/fish_vi_mode.1 -share/fish/man/man1/for.1 -share/fish/man/man1/funced.1 -share/fish/man/man1/funcsave.1 -share/fish/man/man1/function.1 -share/fish/man/man1/functions.1 -share/fish/man/man1/help.1 -share/fish/man/man1/history.1 -share/fish/man/man1/if.1 -share/fish/man/man1/isatty.1 -share/fish/man/man1/jobs.1 -share/fish/man/man1/math.1 -share/fish/man/man1/nextd.1 -share/fish/man/man1/not.1 -${PLIST.open}share/fish/man/man1/open.1 -share/fish/man/man1/or.1 -share/fish/man/man1/popd.1 -share/fish/man/man1/prevd.1 -share/fish/man/man1/printf.1 -share/fish/man/man1/prompt_pwd.1 -share/fish/man/man1/psub.1 -share/fish/man/man1/pushd.1 -share/fish/man/man1/pwd.1 -share/fish/man/man1/random.1 -share/fish/man/man1/read.1 -share/fish/man/man1/realpath.1 -share/fish/man/man1/return.1 -share/fish/man/man1/set.1 -share/fish/man/man1/set_color.1 -share/fish/man/man1/source.1 -share/fish/man/man1/status.1 -share/fish/man/man1/string.1 -share/fish/man/man1/suspend.1 -share/fish/man/man1/switch.1 -share/fish/man/man1/test.1 -share/fish/man/man1/trap.1 -share/fish/man/man1/true.1 -share/fish/man/man1/type.1 -share/fish/man/man1/ulimit.1 -share/fish/man/man1/umask.1 -share/fish/man/man1/vared.1 -share/fish/man/man1/while.1 -share/fish/tools/create_manpage_completions.py -share/fish/tools/deroff.py -share/fish/tools/web_config/delete.png -share/fish/tools/web_config/favicon.png -share/fish/tools/web_config/fishconfig.css -share/fish/tools/web_config/index.html -share/fish/tools/web_config/js/angular-sanitize.js -share/fish/tools/web_config/js/angular.js -share/fish/tools/web_config/js/app.js -share/fish/tools/web_config/js/colorutils.js -share/fish/tools/web_config/js/controllers.js -share/fish/tools/web_config/js/filters.js -share/fish/tools/web_config/partials/abbreviations.html -share/fish/tools/web_config/partials/bindings.html -share/fish/tools/web_config/partials/colors.html -share/fish/tools/web_config/partials/functions.html -share/fish/tools/web_config/partials/history.html -share/fish/tools/web_config/partials/prompt.html -share/fish/tools/web_config/partials/variables.html -share/fish/tools/web_config/sample_prompts/acidhub.fish -share/fish/tools/web_config/sample_prompts/classic.fish -share/fish/tools/web_config/sample_prompts/classic_status.fish -share/fish/tools/web_config/sample_prompts/classic_vcs.fish -share/fish/tools/web_config/sample_prompts/debian_chroot.fish -share/fish/tools/web_config/sample_prompts/informative.fish -share/fish/tools/web_config/sample_prompts/informative_vcs.fish -share/fish/tools/web_config/sample_prompts/justadollar.fish -share/fish/tools/web_config/sample_prompts/lonetwin.fish -share/fish/tools/web_config/sample_prompts/minimalist.fish -share/fish/tools/web_config/sample_prompts/nim.fish -share/fish/tools/web_config/sample_prompts/pythonista.fish -share/fish/tools/web_config/sample_prompts/robbyrussell.fish -share/fish/tools/web_config/sample_prompts/screen_savvy.fish -share/fish/tools/web_config/sample_prompts/sorin.fish -share/fish/tools/web_config/sample_prompts/terlar.fish -share/fish/tools/web_config/sample_prompts/user_host_path.fish -share/fish/tools/web_config/webconfig.py -share/locale/de/LC_MESSAGES/fish.mo -share/locale/en/LC_MESSAGES/fish.mo -share/locale/fr/LC_MESSAGES/fish.mo -share/locale/nb/LC_MESSAGES/fish.mo -share/locale/nn/LC_MESSAGES/fish.mo -share/locale/pl/LC_MESSAGES/fish.mo -share/locale/pt_BR/LC_MESSAGES/fish.mo -share/locale/sv/LC_MESSAGES/fish.mo -share/locale/zh_CN/LC_MESSAGES/fish.mo -share/pkgconfig/fish.pc diff --git a/fish/distinfo b/fish/distinfo deleted file mode 100644 index 8e80e3b4f3..0000000000 --- a/fish/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.8 2017/08/19 09:28:38 fhajny Exp $ - -SHA1 (fish-2.6.0.tar.gz) = 16f6612747f8013cd04b3639fe504d4750f363ca -RMD160 (fish-2.6.0.tar.gz) = f12093fef235487b7c02c245cbbd600750fff874 -SHA512 (fish-2.6.0.tar.gz) = d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1 -Size (fish-2.6.0.tar.gz) = 3575346 bytes -SHA1 (patch-Makefile.in) = e2f5722d2e08e644e0813a662b64bbfe811a8ec6 -SHA1 (patch-configure.ac) = 862b6cef9e269531924965ce928031e063aa90ba -SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc -SHA1 (patch-src_fallback.cpp) = 4a35401ed0d3c3a912e448d56c9375801c919fbc -SHA1 (patch-src_fallback.h) = 87537e6f5be2fa1b8a196d67eb21e6b48380cabb -SHA1 (patch-src_output.cpp) = 36a2cc0576aca6585090a1b5b32aa39c90ed3996 -SHA1 (patch-src_output.h) = 8e72aefbd940450fb69f4b970ce1d151f17eb48a -SHA1 (patch-src_screen.cpp) = f2d5e10dff9d09e985a8e27a8f2066dcfb58db05 -SHA1 (patch-src_wutil.cpp) = dbb73cf81d850c4b73598d0c711f68b0d74cabd6 diff --git a/fish/patches/patch-Makefile.in b/fish/patches/patch-Makefile.in deleted file mode 100644 index 4dd8ef449c..0000000000 --- a/fish/patches/patch-Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.3 2017/05/13 01:19:05 wen Exp $ - -Install configuration files to EGDIR - ---- Makefile.in.orig 2017-04-29 23:37:12.000000000 +0000 -+++ Makefile.in -@@ -653,9 +653,9 @@ install-force: all install-translations - true ;\ - done; - @echo "Creating sysconfdir tree" -- $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish -- $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/conf.d -- $v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/ -+ $v $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish -+ $v $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish/conf.d -+ $v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(EGDIR)/ - @echo "Creating datadir tree" - $v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish - $v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions diff --git a/fish/patches/patch-configure.ac b/fish/patches/patch-configure.ac deleted file mode 100644 index 63aba02188..0000000000 --- a/fish/patches/patch-configure.ac +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD$ - ---- configure.ac.orig 2017-06-03 12:45:13.000000000 +0000 -+++ configure.ac -@@ -323,7 +323,24 @@ AC_CHECK_FUNCS( wcslcpy lrand48_r killpg - AC_CHECK_FUNCS( backtrace_symbols getifaddrs ) - AC_CHECK_FUNCS( futimens clock_gettime ) - AC_CHECK_FUNCS( getpwent flock ) --AC_CHECK_FUNCS( dirfd ) -+ -+AC_MSG_CHECKING([dirfd]) -+AC_LINK_IFELSE([ -+ -+#include -+ -+DIR *dirp; -+ -+int -+main(void) -+{ -+ return dirfd(dirp); -+} -+], [ AC_MSG_RESULT([yes]) -+ AC_DEFINE([HAVE_DIRFD], 1, [ Define to 1 if you have the `dirfd' function or macro. ]) -+ ], -+ [ AC_MSG_RESULT([no])] -+) - - AC_CHECK_DECL( [mkostemp], [ AC_CHECK_FUNCS([mkostemp]) ] ) - diff --git a/fish/patches/patch-src_builtin.cpp b/fish/patches/patch-src_builtin.cpp deleted file mode 100644 index 2bafa93c25..0000000000 --- a/fish/patches/patch-src_builtin.cpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-src_builtin.cpp,v 1.1 2017/05/13 01:19:05 wen Exp $ - ---- src/builtin.cpp.orig 2017-04-29 23:41:45.000000000 +0000 -+++ src/builtin.cpp -@@ -190,11 +190,11 @@ void builtin_print_help(parser_t &parser - bool is_short = false; - if (is_stderr) { - // Interactive mode help to screen - only print synopsis if the rest won't fit. -- int screen_height, lines; -+ int screen_height, my_lines; - - screen_height = common_get_height(); -- lines = count_char(str, L'\n'); -- if (!shell_is_interactive() || (lines > 2 * screen_height / 3)) { -+ my_lines = count_char(str, L'\n'); -+ if (!shell_is_interactive() || (my_lines > 2 * screen_height / 3)) { - wchar_t *pos; - int cut = 0; - int i; diff --git a/fish/patches/patch-src_fallback.cpp b/fish/patches/patch-src_fallback.cpp deleted file mode 100644 index 76ddf6bdc8..0000000000 --- a/fish/patches/patch-src_fallback.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD$ - ---- src/fallback.cpp.orig 2017-06-03 12:45:13.000000000 +0000 -+++ src/fallback.cpp -@@ -46,7 +46,7 @@ - #undef tparm - - /// Checks for known string values and maps to correct number of parameters. --char *tparm_solaris_kludge(char *str, ...) { -+char *tparm_solaris_kludge(const char *str, ...) { - long int param[9] = {}; - - va_list ap; diff --git a/fish/patches/patch-src_fallback.h b/fish/patches/patch-src_fallback.h deleted file mode 100644 index 053629123e..0000000000 --- a/fish/patches/patch-src_fallback.h +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD$ - ---- src/fallback.h.orig 2017-06-03 12:45:13.000000000 +0000 -+++ src/fallback.h -@@ -37,7 +37,7 @@ int fish_mkstemp_cloexec(char *); - /// Under curses, tputs expects an int (*func)(char) as its last parameter, but in ncurses, tputs - /// expects a int (*func)(int) as its last parameter. tputs_arg_t is defined to always be what tputs - /// expects. Hopefully. --#ifdef NCURSES_VERSION -+#if defined(NCURSES_VERSION) || defined(__NetBSD__) - typedef int tputs_arg_t; - #else - typedef char tputs_arg_t; -@@ -57,7 +57,7 @@ struct winsize { - #ifdef TPARM_SOLARIS_KLUDGE - /// Solaris tparm has a set fixed of paramters in it's curses implementation, work around this here. - #define tparm tparm_solaris_kludge --char *tparm_solaris_kludge(char *str, ...); -+char *tparm_solaris_kludge(const char *str, ...); - #endif - - /// On OS X, use weak linking for wcsdup and wcscasecmp. Weak linking allows you to call the diff --git a/fish/patches/patch-src_output.cpp b/fish/patches/patch-src_output.cpp deleted file mode 100644 index d8af5c7bb5..0000000000 --- a/fish/patches/patch-src_output.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD$ - ---- src/output.cpp.orig 2017-06-03 12:45:13.000000000 +0000 -+++ src/output.cpp -@@ -63,7 +63,7 @@ unsigned char index_for_color(rgb_color_ - return c.to_term256_index(); - } - --static bool write_color_escape(char *todo, unsigned char idx, bool is_fg) { -+static bool write_color_escape(const char *todo, unsigned char idx, bool is_fg) { - if (term_supports_color_natively(idx)) { - // Use tparm to emit color escape. - writembs(tparm(todo, idx)); -@@ -550,7 +550,7 @@ rgb_color_t parse_color(const wcstring & - } - - /// Write specified multibyte string. --void writembs_check(char *mbs, const char *mbs_name, const char *file, long line) { -+void writembs_check(const char *mbs, const char *mbs_name, const char *file, long line) { - if (mbs != NULL) { - tputs(mbs, 1, &writeb); - } else { diff --git a/fish/patches/patch-src_output.h b/fish/patches/patch-src_output.h deleted file mode 100644 index 8e787612b5..0000000000 --- a/fish/patches/patch-src_output.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD$ - ---- src/output.h.orig 2017-06-03 12:45:13.000000000 +0000 -+++ src/output.h -@@ -29,7 +29,7 @@ enum { - - void set_color(rgb_color_t c, rgb_color_t c2); - --void writembs_check(char *mbs, const char *mbs_name, const char *file, long line); -+void writembs_check(const char *mbs, const char *mbs_name, const char *file, long line); - #define writembs(mbs) writembs_check((mbs), #mbs, __FILE__, __LINE__) - - int writech(wint_t ch); diff --git a/fish/patches/patch-src_screen.cpp b/fish/patches/patch-src_screen.cpp deleted file mode 100644 index f9e0ee79d4..0000000000 --- a/fish/patches/patch-src_screen.cpp +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD$ - ---- src/screen.cpp.orig 2017-06-03 12:45:13.000000000 +0000 -+++ src/screen.cpp -@@ -215,7 +215,7 @@ static bool is_color_escape_seq(const wc - - // Detect these terminfo color escapes with parameter value up to max_colors, all of which - // don't move the cursor. -- char *const esc[] = { -+ const char *const esc[] = { - set_a_foreground, set_a_background, set_foreground, set_background, - }; - -@@ -238,7 +238,7 @@ static bool is_color_escape_seq(const wc - /// displayed other than the color. - static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length) { - if (!cur_term) return false; -- char *const esc2[] = { -+ const char *const esc2[] = { - enter_bold_mode, exit_attribute_mode, enter_underline_mode, exit_underline_mode, - enter_standout_mode, exit_standout_mode, flash_screen, enter_subscript_mode, - exit_subscript_mode, enter_superscript_mode, exit_superscript_mode, enter_blink_mode, -@@ -506,7 +506,7 @@ static void s_move(screen_t *s, data_buf - int i; - int x_steps, y_steps; - -- char *str; -+ const char *str; - /* - debug( 0, L"move from %d %d to %d %d", - s->screen_cursor[0], s->screen_cursor[1], -@@ -540,7 +540,7 @@ static void s_move(screen_t *s, data_buf - x_steps = 0; - } - -- char *multi_str = NULL; -+ const char *multi_str = NULL; - if (x_steps < 0) { - str = cursor_left; - multi_str = parm_left_cursor; -@@ -594,7 +594,7 @@ static void s_write_char(screen_t *s, da - } - - /// Send the specified string through tputs and append the output to the specified buffer. --static void s_write_mbs(data_buffer_t *b, char *s) { -+static void s_write_mbs(data_buffer_t *b, const char *s) { - scoped_buffer_t scoped_buffer(b); - writembs(s); - } diff --git a/fish/patches/patch-src_wutil.cpp b/fish/patches/patch-src_wutil.cpp deleted file mode 100644 index bc870026d0..0000000000 --- a/fish/patches/patch-src_wutil.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_wutil.cpp,v 1.1 2017/05/15 13:46:47 jperkin Exp $ - -SunOS needs an explicit size to getcwd(). - ---- src/wutil.cpp.orig 2017-02-03 01:46:58.000000000 +0000 -+++ src/wutil.cpp -@@ -129,7 +129,11 @@ bool wreaddir_for_dirs(DIR *dir, wcstrin - const wcstring wgetcwd() { - wcstring retval; - -+#ifdef __sun -+ char *res = getcwd(NULL, PATH_MAX); -+#else - char *res = getcwd(NULL, 0); -+#endif - if (res) { - retval = str2wcstring(res); - free(res); diff --git a/flightgear-data/DESCR b/flightgear-data/DESCR deleted file mode 100644 index 5e3c6d902c..0000000000 --- a/flightgear-data/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -FlightGear is a free, open-source, multi-platform, and sophisticated flight -simulator framework for the development and pursuit of interesting flight -simulator ideas. This package contains the data files (textures, models, etc). diff --git a/flightgear-data/Makefile b/flightgear-data/Makefile deleted file mode 100644 index 7175ac762a..0000000000 --- a/flightgear-data/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2015/04/21 17:02:51 joerg Exp $ - -DISTNAME= FlightGear-data-3.4.0 -PKGNAME= ${DISTNAME:tl} -CATEGORIES= games -MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/ \ - ftp://ftp.de.flightgear.org/pub/fgfs/Shared/ \ - ftp://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Shared/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.flightgear.org/ -COMMENT= FlightGear Simulator data files -LICENSE= gnu-gpl-v2 - -UNLIMIT_RESOURCES+= cputime - -WRKSRC= ${WRKDIR}/fgdata -NO_BUILD= yes -NO_CONFIGURE= yes - -DATASUBDIR= lib/FlightGear -DATADIR= ${PREFIX}/${DATASUBDIR} -PLIST_SRC= PLIST ${WRKDIR}/PLIST.F - -do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR} - # auto-generated PLIST - rm -f ${WRKDIR}/PLIST.F - set -e; cd ${WRKSRC} && \ - find . -type d -print | while read d; do \ - ${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR}/"$${d}"; \ - done; \ - find . -type f -print | while read f; do \ - ${INSTALL_DATA} "$${f}" ${DESTDIR}${DATADIR}/"$${f}"; \ - ${ECHO} ${DATASUBDIR}/"$${f#./}" >> ${WRKDIR}/PLIST.F; \ - done; - -.include "../../mk/bsd.pkg.mk" diff --git a/flightgear-data/PLIST b/flightgear-data/PLIST deleted file mode 100644 index 962a65d4f3..0000000000 --- a/flightgear-data/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/27 08:02:05 adam Exp $ -@pkgdir lib/FlightGear/Aircraft/777/Docs -@pkgdir lib/FlightGear/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf diff --git a/flightgear-data/distinfo b/flightgear-data/distinfo deleted file mode 100644 index 04d34aba51..0000000000 --- a/flightgear-data/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.3 2015/11/03 20:56:49 agc Exp $ - -SHA1 (FlightGear-data-3.4.0.tar.bz2) = b68926c4443c897a4d099f4b1003ea378085aeb8 -RMD160 (FlightGear-data-3.4.0.tar.bz2) = c263805c651c6e88dbfda094f6536c6296b7094b -SHA512 (FlightGear-data-3.4.0.tar.bz2) = 791ff1b1f7f759ccc73f738ba6cb6fd050d1341ae031a872745b4c1145cdb92de62193df7ea6e9fe05a1c95a60fa664da56015d643244d38c7b0b72a2c3146d9 -Size (FlightGear-data-3.4.0.tar.bz2) = 1145893777 bytes diff --git a/flightgear/DESCR b/flightgear/DESCR deleted file mode 100644 index d1511d3c19..0000000000 --- a/flightgear/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -FlightGear is a free, open-source, multi-platform, and sophisticated -flight simulator framework for the development and pursuit of interesting -flight simulator ideas. diff --git a/flightgear/MESSAGE b/flightgear/MESSAGE deleted file mode 100644 index 10df80a962..0000000000 --- a/flightgear/MESSAGE +++ /dev/null @@ -1,5 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 2010/08/27 07:54:22 adam Exp $ - -To use FlightGear, you may also need to install pkgsrc/games/flightgear-data. -=========================================================================== diff --git a/flightgear/Makefile b/flightgear/Makefile deleted file mode 100644 index 1a44dbbed0..0000000000 --- a/flightgear/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile,v 1.53 2015/06/30 09:57:35 ryoon Exp $ - -DISTNAME= flightgear-3.4.0 -CATEGORIES= games -MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Source/ \ - http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \ - ftp://ftp.kingmont.com/flightsims/flightgear/Source/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.flightgear.org/ -COMMENT= The FlightGear Simulator -LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 - -USE_LANGUAGES= c c++ -USE_PKGLOCALEDIR= yes -USE_CMAKE= yes -CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON - -.include "../../mk/jpeg.buildlink3.mk" -.include "../../audio/freealut/buildlink3.mk" -.include "../../audio/openal-soft/buildlink3.mk" -.include "../../devel/SDL/buildlink3.mk" -.include "../../devel/boost-headers/buildlink3.mk" -.include "../../games/plib/buildlink3.mk" -BUILDLINK_API_DEPENDS.simgear+= simgear>=${PKGVERSION} -.include "../../wip/simgear/buildlink3.mk" -.include "../../graphics/glut/buildlink3.mk" -BUILDLINK_API_DEPENDS.osg+= osg>=3.2.0 -.include "../../wip/osg/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/flightgear/PLIST b/flightgear/PLIST deleted file mode 100644 index c29aa50c3b..0000000000 --- a/flightgear/PLIST +++ /dev/null @@ -1,20 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2012/09/30 10:04:33 dholland Exp $ -bin/GPSsmooth -bin/MIDGsmooth -bin/UGsmooth -bin/fgcom -bin/fgelev -bin/fgfs -bin/fgjs -bin/fgpanel -bin/fgviewer -bin/js_demo -bin/metar -bin/terrasync -bin/yasim -bin/yasim-proptest -man/man1/fgfs.1 -man/man1/fgjs.1 -man/man1/fgpanel.1 -man/man1/js_demo.1 -man/man1/terrasync.1 diff --git a/flightgear/distinfo b/flightgear/distinfo deleted file mode 100644 index b523500123..0000000000 --- a/flightgear/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.6 2015/11/03 20:56:49 agc Exp $ - -SHA1 (flightgear-3.4.0.tar.bz2) = 6ec57120338212a54dcb906f33d78ac4def8df18 -RMD160 (flightgear-3.4.0.tar.bz2) = 18e2b3e75c4f54f998f1654428e645b33f7493d9 -SHA512 (flightgear-3.4.0.tar.bz2) = 840d695f90f34879e36cd44a6ed3f5be1fb27ac48fcbc71a5ae99b556778289d4303d20b6dce3d70d16c1c34a7c69dee81af06898d08b9e55808efb6540f70f8 -Size (flightgear-3.4.0.tar.bz2) = 7520321 bytes -SHA1 (patch-3rdparty_hts__engine__API_lib_HTS__misc.c) = da3f79e04f4fc20dac5697a242931a2aa1ee1886 -SHA1 (patch-3rdparty_iaxclient_lib_libiax2_src_iax.c) = 3a9b8cb33d92aca86fd5ed72fcecb40f5e381225 -SHA1 (patch-3rdparty_mongoose_mongoose.c) = a106619eadb26907865691e66bdd6955a02aa291 -SHA1 (patch-CMakeModules_FindPLIB_cmake) = c5761d425743761f5f0c711ef2ca384a06f6d524 -SHA1 (patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp) = 964b8b9986762187e89b332f4fd1cfbd60253a22 -SHA1 (patch-src_Main_locale_cxx) = b10930f1cd770108896e695b30ef8470505ddadb -SHA1 (patch-src_Network_ATC-Inputs_cxx) = 08644c682ddddcefea48aa84fa538b8fd20289c0 -SHA1 (patch-src_Network_ATC-Outputs_cxx) = d5367f8536988b2705b2ba4f8d86e28576b04648 -SHA1 (patch-utils_TerraSync_terrasync_cxx) = 48855911a5052301f2c7a449ac8ff14ada9ae8ea diff --git a/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c b/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c deleted file mode 100644 index 0d73cf73c2..0000000000 --- a/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD$ - ---- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig 2015-02-15 20:01:07.000000000 +0000 -+++ 3rdparty/hts_engine_API/lib/HTS_misc.c -@@ -247,6 +247,8 @@ size_t HTS_ftell(HTS_File * fp) - fgetpos((FILE *) fp->pointer, &pos); - #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__) - return (size_t) pos; -+#elif defined(__NetBSD__) -+ return (size_t) pos._pos; - #else - return (size_t) pos.__pos; - #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */ diff --git a/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c b/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c deleted file mode 100644 index 06dd63c073..0000000000 --- a/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD$ - ---- 3rdparty/iaxclient/lib/libiax2/src/iax.c.orig 2015-02-15 20:01:07.000000000 +0000 -+++ 3rdparty/iaxclient/lib/libiax2/src/iax.c -@@ -75,7 +75,7 @@ - // FlightGear: Modified to include FreeBSD - #if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - #include --#if !defined(SOLARIS) -+#if !defined(SOLARIS) && !defined(__NetBSD__) - #include - #endif - #endif diff --git a/flightgear/patches/patch-3rdparty_mongoose_mongoose.c b/flightgear/patches/patch-3rdparty_mongoose_mongoose.c deleted file mode 100644 index 9792ea8427..0000000000 --- a/flightgear/patches/patch-3rdparty_mongoose_mongoose.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD$ - ---- 3rdparty/mongoose/mongoose.c.orig 2015-02-15 20:01:07.000000000 +0000 -+++ 3rdparty/mongoose/mongoose.c -@@ -118,6 +118,13 @@ typedef struct _stati64 ns_stat_t; - #include - #include - #include -+#ifndef va_copy -+#ifdef __va_copy -+#define va_copy(x,y) __va_copy((x), (y)) -+#else -+#define va_copy(x,y) ((x) = (y)) -+#endif // NetBSD defines va_copy only when certain conditions are met -+#endif - #include - #include // For inet_pton() when NS_ENABLE_IPV6 is defined - #include diff --git a/flightgear/patches/patch-CMakeModules_FindPLIB_cmake b/flightgear/patches/patch-CMakeModules_FindPLIB_cmake deleted file mode 100644 index b0608ad44c..0000000000 --- a/flightgear/patches/patch-CMakeModules_FindPLIB_cmake +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-CMakeModules_FindPLIB_cmake,v 1.1 2012/09/30 10:04:33 dholland Exp $ - -Recognize BSDs other than FreeBSD. - ---- CMakeModules/FindPLIB.cmake~ 2012-08-16 14:20:57.000000000 +0000 -+++ CMakeModules/FindPLIB.cmake -@@ -169,6 +169,18 @@ if(${haveJs} GREATER -1) - find_library(USBHID_LIBRARY usbhid) - # check_function_exists(hidinit) - set(JS_LIBS ${USBHID_LIBRARY}) -+ elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD") -+ find_library(USBHID_LIBRARY usbhid) -+ # check_function_exists(hidinit) -+ set(JS_LIBS ${USBHID_LIBRARY}) -+ elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD") -+ find_library(USBHID_LIBRARY usbhid) -+ # check_function_exists(hidinit) -+ set(JS_LIBS ${USBHID_LIBRARY}) -+ elseif(CMAKE_SYSTEM_NAME MATCHES "DragonFly") -+ find_library(USBHID_LIBRARY usbhid) -+ # check_function_exists(hidinit) -+ set(JS_LIBS ${USBHID_LIBRARY}) - else() - message(WARNING "Unsupported platform for PLIB JS libs") - endif() diff --git a/flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp b/flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp deleted file mode 100644 index 3aafb07c9c..0000000000 --- a/flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp,v 1.1 2014/08/19 13:32:46 joerg Exp $ - ---- src/FDM/JSBSim/models/propulsion/FGEngine.cpp.orig 2014-08-19 13:11:25.000000000 +0000 -+++ src/FDM/JSBSim/models/propulsion/FGEngine.cpp -@@ -83,7 +83,7 @@ FGEngine::FGEngine(FGFDMExec* exec, Elem - - Name = engine_element->GetAttributeValue("name"); - -- FGModelFunctions::Load(engine_element, PropertyManager, to_string((int)EngineNumber)); // Call ModelFunctions loader -+ FGModelFunctions::Load(engine_element, PropertyManager, ::to_string((int)EngineNumber)); // Call ModelFunctions loader - - // Find and set engine location - -@@ -132,7 +132,7 @@ FGEngine::FGEngine(FGFDMExec* exec, Elem - property_name = base_property_name + "/fuel-used-lbs"; - PropertyManager->Tie( property_name.c_str(), this, &FGEngine::GetFuelUsedLbs); - -- PostLoad(engine_element, PropertyManager, to_string((int)EngineNumber)); -+ PostLoad(engine_element, PropertyManager, ::to_string((int)EngineNumber)); - - Debug(0); - diff --git a/flightgear/patches/patch-src_Main_locale_cxx b/flightgear/patches/patch-src_Main_locale_cxx deleted file mode 100644 index 4e0f879ccb..0000000000 --- a/flightgear/patches/patch-src_Main_locale_cxx +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_Main_locale_cxx,v 1.1 2012/09/30 10:04:33 dholland Exp $ - -Use standard headers. - ---- src/Main/locale.cxx~ 2012-08-16 14:20:56.000000000 +0000 -+++ src/Main/locale.cxx -@@ -20,6 +20,8 @@ - - #ifdef HAVE_WINDOWS_H - #include -+#else -+#include - #endif - - #include diff --git a/flightgear/patches/patch-src_Network_ATC-Inputs_cxx b/flightgear/patches/patch-src_Network_ATC-Inputs_cxx deleted file mode 100644 index 3ff1673820..0000000000 --- a/flightgear/patches/patch-src_Network_ATC-Inputs_cxx +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-src_Network_ATC-Inputs_cxx,v 1.1 2012/09/30 10:04:33 dholland Exp $ - -Fix build failure. - ---- src/Network/ATC-Inputs.cxx~ 2012-08-16 14:20:57.000000000 +0000 -+++ src/Network/ATC-Inputs.cxx -@@ -27,14 +27,14 @@ - - #include - --#if defined( unix ) || defined( __CYGWIN__ ) -+//#if defined( unix ) || defined( __CYGWIN__ ) - # include - # include - # include - # include - # include - # include --#endif -+//#endif - - #include - #include diff --git a/flightgear/patches/patch-src_Network_ATC-Outputs_cxx b/flightgear/patches/patch-src_Network_ATC-Outputs_cxx deleted file mode 100644 index 4934e6923d..0000000000 --- a/flightgear/patches/patch-src_Network_ATC-Outputs_cxx +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-src_Network_ATC-Outputs_cxx,v 1.1 2012/09/30 10:04:33 dholland Exp $ - -Fix build failure. - ---- src/Network/ATC-Outputs.cxx~ 2012-08-16 14:20:57.000000000 +0000 -+++ src/Network/ATC-Outputs.cxx -@@ -27,14 +27,14 @@ - - #include - --#if defined( unix ) || defined( __CYGWIN__ ) -+//#if defined( unix ) || defined( __CYGWIN__ ) - # include - # include - # include - # include - # include - # include --#endif -+//#endif - - #include - #include diff --git a/flightgear/patches/patch-utils_TerraSync_terrasync_cxx b/flightgear/patches/patch-utils_TerraSync_terrasync_cxx deleted file mode 100644 index 1a019ec236..0000000000 --- a/flightgear/patches/patch-utils_TerraSync_terrasync_cxx +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-utils_TerraSync_terrasync_cxx,v 1.1 2012/09/30 10:04:33 dholland Exp $ - -Recognize more BSDs. - ---- utils/TerraSync/terrasync.cxx~ 2012-08-16 14:20:53.000000000 +0000 -+++ utils/TerraSync/terrasync.cxx -@@ -51,7 +51,7 @@ - - #if defined(_MSC_VER) || defined(__MINGW32__) - typedef void (__cdecl * sighandler_t)(int); --#elif defined( __APPLE__ ) || defined (__FreeBSD__) -+#elif defined( __APPLE__ ) || defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - typedef sig_t sighandler_t; - #endif - diff --git a/freeradius2/DESCR b/freeradius2/DESCR deleted file mode 100644 index 0c9d4b6a0b..0000000000 --- a/freeradius2/DESCR +++ /dev/null @@ -1,23 +0,0 @@ - All code in this server was written from scratch. - - The server is mostly compatible with livingston radiusd-2.01 - (no menus or s/key support though) but with more feautures, such as: - - o Can limit max. number of simultaneous logins on a per-user basis! - o Multiple DEFAULT entries, that can optionally fall-through. - o In fact, every entry can fall-through - o Deny/permit access based on huntgroup users dials into - o Set certain parameters (such as static IP address) based on huntgroup - o Extra "hints" file that can select SLIP/PPP/rlogin based on - username pattern (Puser or user.ppp is PPP, plain "user" is rlogin etc). - o Can execute an external program when user has authenticated (for example - to run a sendmail queue). - o Can use `$INCLUDE filename' in radiusd.conf, users, and dictionary files - o Can act as a proxy server, relaying requests to a remote server - o Supports Vendor-Specific attributes - o No good documentation at all, just like the original radiusd 1.16! - - Then of course for general RADIUS questions, especially if you are using - Livingston / Lucent RABU equipment, there is the portmaster-radius mailing - list. Send mail to portmaster-radius-request@livingston.com to find - out how to subscribe. diff --git a/freeradius2/MESSAGE b/freeradius2/MESSAGE deleted file mode 100644 index 59377a4b68..0000000000 --- a/freeradius2/MESSAGE +++ /dev/null @@ -1,17 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ - -Note to users who have been running radiusd as root before: - -As radiusd now runs unprivileged by default (as ${RADIUS_USER}:${RADIUS_GROUP}), -you'll have to adapt some permissions: - - ${CHOWN} -R ${RADIUS_USER}:${RADIUS_GROUP} ${VARBASE}/run/radiusd - ${CHOWN} -R ${RADIUS_USER}:${RADIUS_GROUP} ${PKG_SYSCONFDIR} - ${FIND} ${PKG_SYSCONFDIR} -type d | ${XARGS} ${CHMOD} 0750 - ${FIND} ${PKG_SYSCONFDIR} -type f | ${XARGS} ${CHMOD} 0640 - -In addition to this the base logging directory has now been moved from -${VARBASE}/log to ${VARBASE}/log/radiusd. - -=========================================================================== diff --git a/freeradius2/MESSAGE.pam b/freeradius2/MESSAGE.pam deleted file mode 100644 index a1b0508352..0000000000 --- a/freeradius2/MESSAGE.pam +++ /dev/null @@ -1,21 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.pam,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ - -Certain PAM modules require that radiusd run as root in order to -perform privileged operations. However, other PAM modules (e.g. pam-dbm), -will work with with radiusd running as non-root if the non-root user is -given the permissions necessary. - -If you will be using a PAM module that requires radiusd to run as root -you can set the following in /etc/mk.conf: - - RADIUS_USER=root - RADIUS_GROUP=wheel - -And then re-install freeradius. Alternatively, you can just change the -following settings in your ${PKG_SYSCONFDIR}/radiusd.conf - - user = root - group = wheel - -=========================================================================== diff --git a/freeradius2/Makefile b/freeradius2/Makefile deleted file mode 100644 index 6cc7b2cdff..0000000000 --- a/freeradius2/Makefile +++ /dev/null @@ -1,165 +0,0 @@ -# $NetBSD: Makefile,v 1.40 2015/06/12 10:50:41 wiz Exp $ - -DISTNAME= freeradius-server-${RADVER} -PKGNAME= ${DISTNAME:S/-server//} -CATEGORIES= net -MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://freeradius.org/ -COMMENT= Free RADIUS server implementation -LICENSE= gnu-gpl-v2 - -CONFLICTS+= radiusd-cistron-[0-9]* -CONFLICTS+= freeradius<2.0 -USE_TOOLS+= gmake perl:run -USE_LANGUAGES+= c c++ #fortran -USE_LIBTOOL= yes -USE_OLD_DES_API= yes -MAKE_JOBS_SAFE= no - -.include "../../mk/bsd.prefs.mk" - -BUILD_DEFS+= VARBASE -FILES_SUBST+= RADIUS_USER=${RADIUS_USER} -FILES_SUBST+= RADIUS_GROUP=${RADIUS_GROUP} -PLIST_SUBST+= RADVER=${RADVER} -PLIST_SUBST+= RADVERALT=${RADVERALT} -MESSAGE_SRC+= ${PKGDIR}/MESSAGE -MESSAGE_SUBST+= CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} VARBASE=${VARBASE} -MESSAGE_SUBST+= RADIUS_USER=${RADIUS_USER} XARGS=${XARGS:Q} -MESSAGE_SUBST+= RADIUS_GROUP=${RADIUS_GROUP} FIND=${FIND:Q} - -PKG_SYSCONFSUBDIR= raddb -RCD_SCRIPTS= radiusd -RADIUS_USER?= radius -RADIUS_GROUP?= radius -PKG_GROUPS= ${RADIUS_USER} -PKG_USERS= ${RADIUS_USER}:${RADIUS_GROUP} -PKG_GROUPS_VARS+= RADIUS_GROUP -PKG_USERS_VARS= RADIUS_USER -OWN_DIRS_PERMS+= ${VARBASE}/run/radiusd \ - ${RADIUS_USER} ${RADIUS_GROUP} 0750 -OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd \ - ${RADIUS_USER} ${RADIUS_GROUP} 0750 -OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd/radacct \ - ${RADIUS_USER} ${RADIUS_GROUP} 0750 - -RADVER= 2.2.9 -RADVERALT= 020209 -EGDIR= ${PREFIX}/share/examples/freeradius - -BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --quiet -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} -CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log/radiusd -CONFIGURE_ARGS+= --with-system-libltdl -CONFIGURE_ARGS+= --with-system-libtool -CONFIGURE_ARGS+= --without-rlm_python -CONFIGURE_ARGS+= --without-rlm_smb -CONFIGURE_ARGS+= --without-rlm_sql_oracle -CONFIGURE_ARGS+= --without-rlm_sql_unixodbc -MAKE_ENV+= R=${DESTDIR} - -REPLACE_PERL= src/modules/rlm_counter/rad_counter -REPLACE_PERL+= scripts/radsqlrelay - -SUBST_CLASSES+= make -SUBST_STAGE.make= post-patch -SUBST_FILES.make= src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in -SUBST_SED.make+= -e "s|RLM_SQL_LIBS =|RLM_SQL_LIBS = \ - -L${PREFIX}/lib|g" -SUBST_MESSAGE.make= Fixing Makefiles. - -SUBST_CLASSES+= config -SUBST_STAGE.config= post-patch -SUBST_FILES.config= raddb/radiusd.conf.in -SUBST_SED.config= -e "s|@@RADIUS_USER@@|${RADIUS_USER}|g" -SUBST_SED.config+= -e "s|@@RADIUS_GROUP@@|${RADIUS_GROUP}|g" -SUBST_MESSAGE.config= Fixing configuration files. - -.include "options.mk" - -EGFILES= acct_users attrs attrs.access_reject attrs.accounting_response \ - attrs.pre-proxy certs/README certs/bootstrap certs/ca.cnf \ - certs/client.cnf certs/demoCA/cacert.pem certs/server.cnf \ - certs/xpextensions clients.conf dictionary eap.conf experimental.conf \ - hints huntgroups ldap.attrmap modules/acct_unique modules/always \ - modules/attr_filter modules/attr_rewrite modules/chap modules/checkval \ - modules/counter modules/detail modules/detail.example.com \ - modules/detail.log modules/digest modules/echo modules/etc_group \ - modules/exec modules/expiration modules/expr modules/files \ - modules/inner-eap modules/ippool modules/krb5 modules/ldap \ - modules/linelog modules/logintime modules/mac2ip modules/mac2vlan \ - modules/mschap modules/otp modules/pam modules/pap modules/passwd \ - modules/perl modules/policy modules/preprocess modules/radutmp \ - modules/realm modules/smbpasswd modules/smsotp modules/sql_log \ - modules/sqlcounter_expire_on_login modules/sradutmp modules/unix \ - modules/wimax policy.conf policy.txt preproxy_users proxy.conf \ - radiusd.conf sites-available/README sites-available/buffered-sql \ - sites-available/control-socket \ - sites-available/copy-acct-to-home-server \ - sites-available/decoupled-accounting sites-available/default \ - sites-available/dhcp sites-available/dynamic-clients \ - sites-available/example sites-available/inner-tunnel \ - sites-available/originate-coa sites-available/proxy-inner-tunnel \ - sites-available/robust-proxy-accounting sites-available/status \ - sites-available/virtual.example.com sites-available/vmps sql.conf \ - sql/mssql/dialup.conf sql/mssql/schema.sql sql/mysql/admin.sql \ - sql/mysql/counter.conf sql/mysql/dialup.conf sql/mysql/ippool.conf \ - sql/mysql/ippool.sql sql/mysql/nas.sql sql/mysql/schema.sql \ - sql/mysql/wimax.conf sql/mysql/wimax.sql sql/oracle/dialup.conf \ - sql/oracle/ippool.conf sql/oracle/ippool.sql sql/oracle/msqlippool.txt \ - sql/oracle/nas.sql sql/oracle/schema.sql sql/postgresql/admin.sql \ - sql/postgresql/cisco_h323_db_schema.sql sql/postgresql/counter.conf \ - sql/postgresql/dialup.conf sql/postgresql/ippool.conf \ - sql/postgresql/ippool.sql sql/postgresql/nas.sql \ - sql/postgresql/schema.sql \ - sql/postgresql/update_radacct_group_trigger.sql \ - sql/postgresql/voip-postpaid.conf sqlippool.conf templates.conf users -EGDIRS= certs certs/demoCA modules sql sql/mssql sql/mysql sql/oracle \ - sql/postgresql sites-available sites-enabled - -.for f in ${EGFILES} -CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \ - ${RADIUS_USER} ${RADIUS_GROUP} 0640 -.endfor - -.for d in ${EGDIRS} -INSTALLATION_DIRS+= ${EGDIR}/${d} -OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${d} ${RADIUS_USER} \ - ${RADIUS_GROUP} 750 -.endfor - -.include "../../mk/pthread.buildlink3.mk" - -.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" -CONFIGURE_ARGS+= --without-threads -.endif - -.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth" -.include "../../devel/pthread-sem/buildlink3.mk" -SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \ - ${PTHREAD_LDFLAGS:M*:Q} ${PTHREAD_LIBS:M*:Q} -lsemaphore|g' -.endif - -.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native" -SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \ - ${PTHREAD_LDFLAGS:M*:Q} ${PTHREAD_LIBS:M*:Q}|g' -.endif - -post-install: -.for f in ${EGFILES} - ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${DESTDIR}${EGDIR}/${f} -.endfor - ${INSTALL_DATA} ${WRKSRC}/src/modules/rlm_perl/example.pl ${DESTDIR}${EGDIR} - -.include "../../devel/libltdl/buildlink3.mk" -.include "../../devel/libexecinfo/buildlink3.mk" -.include "../../net/libpcap/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/freeradius2/PLIST b/freeradius2/PLIST deleted file mode 100644 index bcb5cc04c8..0000000000 --- a/freeradius2/PLIST +++ /dev/null @@ -1,628 +0,0 @@ -@comment $NetBSD: PLIST,v 1.16 2014/03/11 14:05:08 jperkin Exp $ -bin/rad_counter -bin/radclient -bin/radconf2xml -bin/radcrypt -bin/radeapclient -bin/radlast -bin/radsniff -bin/radsqlrelay -bin/radtest -bin/radwho -bin/radzap -${PLIST.dbm}bin/rlm_dbm_cat -${PLIST.dbm}bin/rlm_dbm_parser -bin/rlm_ippool_tool -bin/smbencrypt -include/freeradius/autoconf.h -include/freeradius/base64.h -include/freeradius/conf.h -include/freeradius/conffile.h -include/freeradius/detail.h -include/freeradius/dhcp.h -include/freeradius/event.h -include/freeradius/hash.h -include/freeradius/heap.h -include/freeradius/ident.h -include/freeradius/libradius.h -include/freeradius/md4.h -include/freeradius/md5.h -include/freeradius/missing.h -include/freeradius/modcall.h -include/freeradius/modules.h -include/freeradius/packet.h -include/freeradius/rad_assert.h -include/freeradius/radius.h -include/freeradius/radiusd.h -include/freeradius/radpaths.h -include/freeradius/radutmp.h -include/freeradius/realms.h -include/freeradius/sha1.h -include/freeradius/stats.h -include/freeradius/sysutmp.h -include/freeradius/threads.h -include/freeradius/token.h -include/freeradius/udpfromto.h -include/freeradius/vmps.h -include/freeradius/vqp.h -lib/libfreeradius-eap-${RADVER}.la -lib/libfreeradius-eap.la -lib/libfreeradius-radius-${RADVERALT}.la -lib/libfreeradius-radius.la -lib/rlm_acct_unique-${RADVER}.la -lib/rlm_acct_unique.la -lib/rlm_acctlog-${RADVER}.la -lib/rlm_acctlog.la -lib/rlm_always-${RADVER}.la -lib/rlm_always.la -lib/rlm_attr_filter-${RADVER}.la -lib/rlm_attr_filter.la -lib/rlm_attr_rewrite-${RADVER}.la -lib/rlm_attr_rewrite.la -lib/rlm_cache-${RADVER}.la -lib/rlm_cache.la -lib/rlm_chap-${RADVER}.la -lib/rlm_chap.la -lib/rlm_checkval-${RADVER}.la -lib/rlm_checkval.la -lib/rlm_copy_packet-${RADVER}.la -lib/rlm_copy_packet.la -${PLIST.gdbm}lib/rlm_counter-${RADVER}.la -${PLIST.gdbm}lib/rlm_counter.la -${PLIST.dbm}lib/rlm_dbm-${RADVER}.la -${PLIST.dbm}lib/rlm_dbm.la -lib/rlm_detail-${RADVER}.la -lib/rlm_detail.la -lib/rlm_digest-${RADVER}.la -lib/rlm_digest.la -lib/rlm_dynamic_clients-${RADVER}.la -lib/rlm_dynamic_clients.la -lib/rlm_eap-${RADVER}.la -lib/rlm_eap.la -lib/rlm_eap_gtc-${RADVER}.la -lib/rlm_eap_gtc.la -lib/rlm_eap_leap-${RADVER}.la -lib/rlm_eap_leap.la -lib/rlm_eap_md5-${RADVER}.la -lib/rlm_eap_md5.la -lib/rlm_eap_mschapv2-${RADVER}.la -lib/rlm_eap_mschapv2.la -lib/rlm_eap_peap-${RADVER}.la -lib/rlm_eap_peap.la -lib/rlm_eap_sim-${RADVER}.la -lib/rlm_eap_sim.la -lib/rlm_eap_tls-${RADVER}.la -lib/rlm_eap_tls.la -lib/rlm_eap_ttls-${RADVER}.la -lib/rlm_eap_ttls.la -lib/rlm_exec-${RADVER}.la -lib/rlm_exec.la -lib/rlm_expiration-${RADVER}.la -lib/rlm_expiration.la -lib/rlm_expr-${RADVER}.la -lib/rlm_expr.la -lib/rlm_fastusers-${RADVER}.la -lib/rlm_fastusers.la -lib/rlm_files-${RADVER}.la -lib/rlm_files.la -lib/rlm_ippool-${RADVER}.la -lib/rlm_ippool.la -${PLIST.kerberos}lib/rlm_krb5-${RADVER}.la -${PLIST.kerberos}lib/rlm_krb5.la -${PLIST.ldap}lib/rlm_ldap-${RADVER}.la -${PLIST.ldap}lib/rlm_ldap.la -lib/rlm_linelog-${RADVER}.la -lib/rlm_linelog.la -lib/rlm_logintime-${RADVER}.la -lib/rlm_logintime.la -lib/rlm_mschap-${RADVER}.la -lib/rlm_mschap.la -lib/rlm_otp-${RADVER}.la -lib/rlm_otp.la -${PLIST.pam}lib/rlm_pam-${RADVER}.la -${PLIST.pam}lib/rlm_pam.la -lib/rlm_pap-${RADVER}.la -lib/rlm_pap.la -lib/rlm_passwd-${RADVER}.la -lib/rlm_passwd.la -${PLIST.perl}lib/rlm_perl-${RADVER}.la -${PLIST.perl}lib/rlm_perl.la -${PLIST.pgsql}lib/rlm_sql_postgresql-${RADVER}.la -${PLIST.pgsql}lib/rlm_sql_postgresql.la -lib/rlm_policy-${RADVER}.la -lib/rlm_policy.la -lib/rlm_preprocess-${RADVER}.la -lib/rlm_preprocess.la -lib/rlm_radutmp-${RADVER}.la -lib/rlm_radutmp.la -lib/rlm_realm-${RADVER}.la -lib/rlm_realm.la -lib/rlm_replicate-${RADVER}.la -lib/rlm_replicate.la -lib/rlm_soh-${RADVER}.la -lib/rlm_soh.la -lib/rlm_sql-${RADVER}.la -lib/rlm_sql.la -${PLIST.iodbc}lib/rlm_sql_iodbc-${RADVER}.la -${PLIST.iodbc}lib/rlm_sql_iodbc.la -lib/rlm_sql_log-${RADVER}.la -lib/rlm_sql_log.la -${PLIST.mysql}lib/rlm_sql_mysql-${RADVER}.la -${PLIST.mysql}lib/rlm_sql_mysql.la -${PLIST.unixodbc}lib/rlm_sql_unixodbc-${RADVER}.la -${PLIST.unixodbc}lib/rlm_sql_unixodbc.la -lib/rlm_sqlcounter-${RADVER}.la -lib/rlm_sqlcounter.la -lib/rlm_sqlippool-${RADVER}.la -lib/rlm_sqlippool.la -lib/rlm_unix-${RADVER}.la -lib/rlm_unix.la -lib/rlm_wimax-${RADVER}.la -lib/rlm_wimax.la -man/man1/radclient.1 -man/man1/radeapclient.1 -man/man1/radlast.1 -man/man1/radtest.1 -man/man1/radwho.1 -man/man1/radzap.1 -man/man1/smbencrypt.1 -man/man5/acct_users.5 -man/man5/checkrad.5 -man/man5/clients.conf.5 -man/man5/dictionary.5 -man/man5/radiusd.conf.5 -man/man5/radrelay.conf.5 -man/man5/rlm_acct_unique.5 -man/man5/rlm_always.5 -man/man5/rlm_attr_filter.5 -man/man5/rlm_attr_rewrite.5 -man/man5/rlm_chap.5 -man/man5/rlm_counter.5 -man/man5/rlm_detail.5 -man/man5/rlm_digest.5 -man/man5/rlm_expr.5 -man/man5/rlm_files.5 -man/man5/rlm_mschap.5 -man/man5/rlm_pap.5 -man/man5/rlm_passwd.5 -man/man5/rlm_policy.5 -man/man5/rlm_realm.5 -man/man5/rlm_sql.5 -man/man5/rlm_sql_log.5 -man/man5/rlm_unix.5 -man/man5/unlang.5 -man/man5/users.5 -man/man8/radconf2xml.8 -man/man8/radcrypt.8 -man/man8/raddebug.8 -man/man8/radiusd.8 -man/man8/radmin.8 -man/man8/radrelay.8 -man/man8/radsniff.8 -man/man8/radsqlrelay.8 -man/man8/radwatch.8 -man/man8/rlm_dbm_cat.8 -man/man8/rlm_dbm_parser.8 -man/man8/rlm_ippool_tool.8 -sbin/checkrad -sbin/raddebug -sbin/radiusd -sbin/radmin -sbin/radwatch -sbin/rc.radiusd -share/doc/freeradius/Acct-Type.rst -share/doc/freeradius/Autz-Type.rst -share/doc/freeradius/CYGWIN.rst -share/doc/freeradius/ChangeLog -share/doc/freeradius/DIFFS.rst -share/doc/freeradius/MACOSX -share/doc/freeradius/Makefile.sphinx -share/doc/freeradius/OS2 -share/doc/freeradius/Post-Auth-Type -share/doc/freeradius/RADIUS-LDAP-eDirectory -share/doc/freeradius/RADIUS-SQL.schema -share/doc/freeradius/README -share/doc/freeradius/Session-Type -share/doc/freeradius/Simultaneous-Use -share/doc/freeradius/SoH.txt -share/doc/freeradius/aaa.rst -share/doc/freeradius/ascend -share/doc/freeradius/bay -share/doc/freeradius/bugs -share/doc/freeradius/cisco.rst -share/doc/freeradius/coding-methods.rst -share/doc/freeradius/configurable_failover.rst -share/doc/freeradius/examples/iplanet.ldif -share/doc/freeradius/examples/iplanet.schema -share/doc/freeradius/examples/openldap.schema -share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql -share/doc/freeradius/index.rst -share/doc/freeradius/ldap_howto.rst -share/doc/freeradius/load-balance.rst -share/doc/freeradius/misc-nas.rst -share/doc/freeradius/module_interface.rst -share/doc/freeradius/mssql -share/doc/freeradius/performance-testing -share/doc/freeradius/processing_users_file.rst -share/doc/freeradius/proxy.rst -share/doc/freeradius/release-method.rst -share/doc/freeradius/rfc/attributes.html -share/doc/freeradius/rfc/draft-kamath-pppext-eap-mschapv2-00.txt -share/doc/freeradius/rfc/draft-sterman-aaa-sip-00.txt -share/doc/freeradius/rfc/leap.txt -share/doc/freeradius/rfc/pppext-eap-sim-12.txt -share/doc/freeradius/rfc/rfc1157.txt -share/doc/freeradius/rfc/rfc1227.txt -share/doc/freeradius/rfc/rfc1448.txt -share/doc/freeradius/rfc/rfc1901.txt -share/doc/freeradius/rfc/rfc1905.txt -share/doc/freeradius/rfc/rfc2243.txt -share/doc/freeradius/rfc/rfc2284.txt -share/doc/freeradius/rfc/rfc2289.txt -share/doc/freeradius/rfc/rfc2433.txt -share/doc/freeradius/rfc/rfc2548.txt -share/doc/freeradius/rfc/rfc2607.txt -share/doc/freeradius/rfc/rfc2618.txt -share/doc/freeradius/rfc/rfc2619.txt -share/doc/freeradius/rfc/rfc2620.txt -share/doc/freeradius/rfc/rfc2621.txt -share/doc/freeradius/rfc/rfc2716.txt -share/doc/freeradius/rfc/rfc2759.txt -share/doc/freeradius/rfc/rfc2809.txt -share/doc/freeradius/rfc/rfc2865.txt -share/doc/freeradius/rfc/rfc2866.txt -share/doc/freeradius/rfc/rfc2867.txt -share/doc/freeradius/rfc/rfc2868.txt -share/doc/freeradius/rfc/rfc2869.txt -share/doc/freeradius/rfc/rfc2924.txt -share/doc/freeradius/rfc/rfc3079.txt -share/doc/freeradius/rfc/rfc3162.txt -share/doc/freeradius/rfc/rfc3575.txt -share/doc/freeradius/rfc/rfc3576.txt -share/doc/freeradius/rfc/rfc3579.txt -share/doc/freeradius/rfc/rfc3580.txt -share/doc/freeradius/rfc/rfc3748.txt -share/doc/freeradius/rfc/rfc4282.txt -share/doc/freeradius/rfc/rfc4372.txt -share/doc/freeradius/rfc/rfc4590.txt -share/doc/freeradius/rfc/rfc4668.txt -share/doc/freeradius/rfc/rfc4669.txt -share/doc/freeradius/rfc/rfc4670.txt -share/doc/freeradius/rfc/rfc4671.txt -share/doc/freeradius/rfc/rfc4672.txt -share/doc/freeradius/rfc/rfc4673.txt -share/doc/freeradius/rfc/rfc4675.txt -share/doc/freeradius/rfc/rfc4679.txt -share/doc/freeradius/rfc/rfc4818.txt -share/doc/freeradius/rfc/rfc4849.txt -share/doc/freeradius/rfc/rfc5080.txt -share/doc/freeradius/rfc/rfc5090.txt -share/doc/freeradius/rfc/rfc5176.txt -share/doc/freeradius/rfc/rfc5247.txt -share/doc/freeradius/rfc/rfc5281.txt -share/doc/freeradius/rfc/rfc5580.txt -share/doc/freeradius/rfc/rfc5607.txt -share/doc/freeradius/rfc/rfc5904.txt -share/doc/freeradius/rfc/rfc5997.txt -share/doc/freeradius/rfc/rfc6158.txt -share/doc/freeradius/rfc/rfc6519.txt -share/doc/freeradius/rfc/rfc6572.txt -share/doc/freeradius/rfc/rfc6677.txt -share/doc/freeradius/rfc/rfc6911.txt -share/doc/freeradius/rfc/rfc6929.txt -share/doc/freeradius/rfc/rfc6930.txt -share/doc/freeradius/rlm_dbm -share/doc/freeradius/rlm_eap -share/doc/freeradius/rlm_expiration -share/doc/freeradius/rlm_fastusers -share/doc/freeradius/rlm_jradius -share/doc/freeradius/rlm_krb5 -share/doc/freeradius/rlm_ldap -share/doc/freeradius/rlm_pam -share/doc/freeradius/rlm_passwd -share/doc/freeradius/rlm_python -share/doc/freeradius/rlm_sim_triplets -share/doc/freeradius/rlm_sql -share/doc/freeradius/rlm_sqlcounter -share/doc/freeradius/rlm_sqlippool -share/doc/freeradius/snmp -share/doc/freeradius/supervise-radiusd.rst -share/doc/freeradius/tuning_guide -share/doc/freeradius/variables.rst -share/examples/freeradius/acct_users -share/examples/freeradius/attrs -share/examples/freeradius/attrs.access_reject -share/examples/freeradius/attrs.accounting_response -share/examples/freeradius/attrs.pre-proxy -share/examples/freeradius/certs/README -share/examples/freeradius/certs/bootstrap -share/examples/freeradius/certs/ca.cnf -share/examples/freeradius/certs/client.cnf -share/examples/freeradius/certs/demoCA/cacert.pem -share/examples/freeradius/certs/server.cnf -share/examples/freeradius/certs/xpextensions -share/examples/freeradius/clients.conf -share/examples/freeradius/dictionary -share/examples/freeradius/eap.conf -share/examples/freeradius/example.pl -share/examples/freeradius/experimental.conf -share/examples/freeradius/hints -share/examples/freeradius/huntgroups -share/examples/freeradius/ldap.attrmap -share/examples/freeradius/modules/acct_unique -share/examples/freeradius/modules/always -share/examples/freeradius/modules/attr_filter -share/examples/freeradius/modules/attr_rewrite -share/examples/freeradius/modules/chap -share/examples/freeradius/modules/checkval -share/examples/freeradius/modules/counter -share/examples/freeradius/modules/detail -share/examples/freeradius/modules/detail.example.com -share/examples/freeradius/modules/detail.log -share/examples/freeradius/modules/digest -share/examples/freeradius/modules/echo -share/examples/freeradius/modules/etc_group -share/examples/freeradius/modules/exec -share/examples/freeradius/modules/expiration -share/examples/freeradius/modules/expr -share/examples/freeradius/modules/files -share/examples/freeradius/modules/inner-eap -share/examples/freeradius/modules/ippool -share/examples/freeradius/modules/krb5 -share/examples/freeradius/modules/ldap -share/examples/freeradius/modules/linelog -share/examples/freeradius/modules/logintime -share/examples/freeradius/modules/mac2ip -share/examples/freeradius/modules/mac2vlan -share/examples/freeradius/modules/mschap -share/examples/freeradius/modules/otp -share/examples/freeradius/modules/pam -share/examples/freeradius/modules/pap -share/examples/freeradius/modules/passwd -share/examples/freeradius/modules/perl -share/examples/freeradius/modules/policy -share/examples/freeradius/modules/preprocess -share/examples/freeradius/modules/radutmp -share/examples/freeradius/modules/realm -share/examples/freeradius/modules/smbpasswd -share/examples/freeradius/modules/smsotp -share/examples/freeradius/modules/sql_log -share/examples/freeradius/modules/sqlcounter_expire_on_login -share/examples/freeradius/modules/sradutmp -share/examples/freeradius/modules/unix -share/examples/freeradius/modules/wimax -share/examples/freeradius/policy.conf -share/examples/freeradius/policy.txt -share/examples/freeradius/preproxy_users -share/examples/freeradius/proxy.conf -share/examples/freeradius/radiusd.conf -share/examples/freeradius/sites-available/README -share/examples/freeradius/sites-available/buffered-sql -share/examples/freeradius/sites-available/control-socket -share/examples/freeradius/sites-available/copy-acct-to-home-server -share/examples/freeradius/sites-available/decoupled-accounting -share/examples/freeradius/sites-available/default -share/examples/freeradius/sites-available/dhcp -share/examples/freeradius/sites-available/dynamic-clients -share/examples/freeradius/sites-available/example -share/examples/freeradius/sites-available/inner-tunnel -share/examples/freeradius/sites-available/originate-coa -share/examples/freeradius/sites-available/proxy-inner-tunnel -share/examples/freeradius/sites-available/robust-proxy-accounting -share/examples/freeradius/sites-available/status -share/examples/freeradius/sites-available/virtual.example.com -share/examples/freeradius/sites-available/vmps -share/examples/freeradius/sql.conf -share/examples/freeradius/sql/mssql/dialup.conf -share/examples/freeradius/sql/mssql/schema.sql -share/examples/freeradius/sql/mysql/admin.sql -share/examples/freeradius/sql/mysql/counter.conf -share/examples/freeradius/sql/mysql/dialup.conf -share/examples/freeradius/sql/mysql/ippool.conf -share/examples/freeradius/sql/mysql/ippool.sql -share/examples/freeradius/sql/mysql/nas.sql -share/examples/freeradius/sql/mysql/schema.sql -share/examples/freeradius/sql/mysql/wimax.conf -share/examples/freeradius/sql/mysql/wimax.sql -share/examples/freeradius/sql/oracle/dialup.conf -share/examples/freeradius/sql/oracle/ippool.conf -share/examples/freeradius/sql/oracle/ippool.sql -share/examples/freeradius/sql/oracle/msqlippool.txt -share/examples/freeradius/sql/oracle/nas.sql -share/examples/freeradius/sql/oracle/schema.sql -share/examples/freeradius/sql/postgresql/admin.sql -share/examples/freeradius/sql/postgresql/cisco_h323_db_schema.sql -share/examples/freeradius/sql/postgresql/counter.conf -share/examples/freeradius/sql/postgresql/dialup.conf -share/examples/freeradius/sql/postgresql/ippool.conf -share/examples/freeradius/sql/postgresql/ippool.sql -share/examples/freeradius/sql/postgresql/nas.sql -share/examples/freeradius/sql/postgresql/schema.sql -share/examples/freeradius/sql/postgresql/update_radacct_group_trigger.sql -share/examples/freeradius/sql/postgresql/voip-postpaid.conf -share/examples/freeradius/sqlippool.conf -share/examples/freeradius/templates.conf -share/examples/freeradius/users -share/freeradius/dictionary -share/freeradius/dictionary.3com -share/freeradius/dictionary.3gpp -share/freeradius/dictionary.3gpp2 -share/freeradius/dictionary.acc -share/freeradius/dictionary.acme -share/freeradius/dictionary.aerohive -share/freeradius/dictionary.airespace -share/freeradius/dictionary.alcatel -share/freeradius/dictionary.alcatel-lucent.aaa -share/freeradius/dictionary.alcatel.esam -share/freeradius/dictionary.alcatel.sr -share/freeradius/dictionary.alteon -share/freeradius/dictionary.altiga -share/freeradius/dictionary.alvarion -share/freeradius/dictionary.apc -share/freeradius/dictionary.aptis -share/freeradius/dictionary.aruba -share/freeradius/dictionary.ascend -share/freeradius/dictionary.ascend.illegal -share/freeradius/dictionary.asn -share/freeradius/dictionary.audiocodes -share/freeradius/dictionary.avaya -share/freeradius/dictionary.azaire -share/freeradius/dictionary.bay -share/freeradius/dictionary.bintec -share/freeradius/dictionary.bluecoat -share/freeradius/dictionary.bristol -share/freeradius/dictionary.broadsoft -share/freeradius/dictionary.brocade -share/freeradius/dictionary.bskyb -share/freeradius/dictionary.bt -share/freeradius/dictionary.cablelabs -share/freeradius/dictionary.cabletron -share/freeradius/dictionary.camiant -share/freeradius/dictionary.chillispot -share/freeradius/dictionary.cisco -share/freeradius/dictionary.cisco.bbsm -share/freeradius/dictionary.cisco.vpn3000 -share/freeradius/dictionary.cisco.vpn5000 -share/freeradius/dictionary.citrix -share/freeradius/dictionary.clavister -share/freeradius/dictionary.colubris -share/freeradius/dictionary.columbia_university -share/freeradius/dictionary.compat -share/freeradius/dictionary.compatible -share/freeradius/dictionary.cosine -share/freeradius/dictionary.dante -share/freeradius/dictionary.dhcp -share/freeradius/dictionary.digium -share/freeradius/dictionary.dlink -share/freeradius/dictionary.dragonwave -share/freeradius/dictionary.efficientip -share/freeradius/dictionary.eltex -share/freeradius/dictionary.epygi -share/freeradius/dictionary.ericsson -share/freeradius/dictionary.ericsson.packet.core.networks -share/freeradius/dictionary.erx -share/freeradius/dictionary.extreme -share/freeradius/dictionary.f5 -share/freeradius/dictionary.fdxtended -share/freeradius/dictionary.fortinet -share/freeradius/dictionary.foundry -share/freeradius/dictionary.freeradius -share/freeradius/dictionary.freeradius.internal -share/freeradius/dictionary.freeswitch -share/freeradius/dictionary.gandalf -share/freeradius/dictionary.garderos -share/freeradius/dictionary.gemtek -share/freeradius/dictionary.h3c -share/freeradius/dictionary.hp -share/freeradius/dictionary.huawei -share/freeradius/dictionary.iea -share/freeradius/dictionary.infonet -share/freeradius/dictionary.ipunplugged -share/freeradius/dictionary.issanni -share/freeradius/dictionary.itk -share/freeradius/dictionary.jradius -share/freeradius/dictionary.juniper -share/freeradius/dictionary.karlnet -share/freeradius/dictionary.kineto -share/freeradius/dictionary.lancom -share/freeradius/dictionary.livingston -share/freeradius/dictionary.localweb -share/freeradius/dictionary.lucent -share/freeradius/dictionary.manzara -share/freeradius/dictionary.merit -share/freeradius/dictionary.meru -share/freeradius/dictionary.microsoft -share/freeradius/dictionary.mikrotik -share/freeradius/dictionary.motorola -share/freeradius/dictionary.motorola.illegal -share/freeradius/dictionary.motorola.wimax -share/freeradius/dictionary.navini -share/freeradius/dictionary.netscreen -share/freeradius/dictionary.networkphysics -share/freeradius/dictionary.nexans -share/freeradius/dictionary.nokia -share/freeradius/dictionary.nokia.conflict -share/freeradius/dictionary.nomadix -share/freeradius/dictionary.nortel -share/freeradius/dictionary.ntua -share/freeradius/dictionary.openser -share/freeradius/dictionary.packeteer -share/freeradius/dictionary.paloalto -share/freeradius/dictionary.patton -share/freeradius/dictionary.propel -share/freeradius/dictionary.prosoft -share/freeradius/dictionary.proxim -share/freeradius/dictionary.purewave -share/freeradius/dictionary.quiconnect -share/freeradius/dictionary.quintum -share/freeradius/dictionary.redback -share/freeradius/dictionary.redcreek -share/freeradius/dictionary.rfc2865 -share/freeradius/dictionary.rfc2866 -share/freeradius/dictionary.rfc2867 -share/freeradius/dictionary.rfc2868 -share/freeradius/dictionary.rfc2869 -share/freeradius/dictionary.rfc3162 -share/freeradius/dictionary.rfc3576 -share/freeradius/dictionary.rfc3580 -share/freeradius/dictionary.rfc4072 -share/freeradius/dictionary.rfc4372 -share/freeradius/dictionary.rfc4603 -share/freeradius/dictionary.rfc4675 -share/freeradius/dictionary.rfc4679 -share/freeradius/dictionary.rfc4818 -share/freeradius/dictionary.rfc4849 -share/freeradius/dictionary.rfc5090 -share/freeradius/dictionary.rfc5176 -share/freeradius/dictionary.rfc5447 -share/freeradius/dictionary.rfc5580 -share/freeradius/dictionary.rfc5607 -share/freeradius/dictionary.rfc5904 -share/freeradius/dictionary.rfc6519 -share/freeradius/dictionary.rfc6572 -share/freeradius/dictionary.rfc6677 -share/freeradius/dictionary.rfc6911 -share/freeradius/dictionary.rfc6930 -share/freeradius/dictionary.rfc7055 -share/freeradius/dictionary.rfc7268 -share/freeradius/dictionary.riverbed -share/freeradius/dictionary.riverstone -share/freeradius/dictionary.roaringpenguin -share/freeradius/dictionary.ruckus -share/freeradius/dictionary.sg -share/freeradius/dictionary.shasta -share/freeradius/dictionary.shiva -share/freeradius/dictionary.siemens -share/freeradius/dictionary.slipstream -share/freeradius/dictionary.sofaware -share/freeradius/dictionary.sonicwall -share/freeradius/dictionary.springtide -share/freeradius/dictionary.starent -share/freeradius/dictionary.starent.vsa1 -share/freeradius/dictionary.symbol -share/freeradius/dictionary.t_systems_nova -share/freeradius/dictionary.telebit -share/freeradius/dictionary.telkom -share/freeradius/dictionary.terena -share/freeradius/dictionary.trapeze -share/freeradius/dictionary.tropos -share/freeradius/dictionary.ukerna -share/freeradius/dictionary.unix -share/freeradius/dictionary.usr -share/freeradius/dictionary.usr.illegal -share/freeradius/dictionary.utstarcom -share/freeradius/dictionary.valemount -share/freeradius/dictionary.versanet -share/freeradius/dictionary.vqp -share/freeradius/dictionary.walabi -share/freeradius/dictionary.waverider -share/freeradius/dictionary.wichorus -share/freeradius/dictionary.wimax -share/freeradius/dictionary.wimax.wichorus -share/freeradius/dictionary.wispr -share/freeradius/dictionary.xedia -share/freeradius/dictionary.xylan -share/freeradius/dictionary.zeus -share/freeradius/dictionary.zte -share/freeradius/dictionary.zyxel -@pkgdir share/examples/freeradius/sites-enabled diff --git a/freeradius2/distinfo b/freeradius2/distinfo deleted file mode 100644 index 58a272e814..0000000000 --- a/freeradius2/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.16 2014/04/27 12:10:55 he Exp $ - -SHA1 (freeradius-server-2.2.9.tar.bz2) = 730a5b681b375800a85c935cc2f34c5ba3aa951b -RMD160 (freeradius-server-2.2.9.tar.bz2) = 4d3097e5d193a2268e81e3bde7cb6b75aed739c5 -Size (freeradius-server-2.2.9.tar.bz2) = 2793005 bytes -SHA1 (patch-aa) = 07f28084b9d159a52014e31b5314827baaf07716 -SHA1 (patch-ab) = 306ee49b886d38341c2a94159ae033d2cff9c577 -SHA1 (patch-ac) = 689de3193b34f6ff169287a2512bda9691de6899 -SHA1 (patch-ae) = 98be5272791935ed6823165ff53893b352fd6974 -SHA1 (patch-ai) = c224f984167747894506e806a5a9775318b47d96 -SHA1 (patch-aj) = 99f62341e36932270ea0bce38bca8778a2125624 -SHA1 (patch-ak) = 898cc417449e9e5d5513a5d53b538ed320b923a2 -SHA1 (patch-al) = e553795702f48c26c41fa00a7fd59c48413c1423 -SHA1 (patch-configure.in) = e0fc20374d8600694d7a34e1ecef8e1f03b5816d -SHA1 (patch-man_man5_dictionary.5) = 01242a57f7a2bd6b84313ec578b4650c525b72b8 diff --git a/freeradius2/files/radiusd.sh b/freeradius2/files/radiusd.sh deleted file mode 100644 index 2f4f3316e3..0000000000 --- a/freeradius2/files/radiusd.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: radiusd.sh,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ -# -# PROVIDE: radiusd -# REQUIRE: network -# - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="radiusd" -rcvar=${name} -command="@PREFIX@/sbin/radiusd" -pidfile="@VARBASE@/run/radiusd/radiusd.pid" -start_precmd="radiusd_precmd" - -radiusd_precmd() -{ - if [ ! -d @VARBASE@/run/radiusd ]; then - @MKDIR@ @VARBASE@/run/radiusd - @CHMOD@ 0750 @VARBASE@/run/radiusd - @CHOWN@ @RADIUS_USER@:@RADIUS_GROUP@ @VARBASE@/run/radiusd - fi -} - -if [ -f /etc/rc.subr ] -then - load_rc_config $name - run_rc_command "$1" -else - echo -n ' ${name}' - exec ${command} ${radiusd_flags} ${command_args} -fi diff --git a/freeradius2/options.mk b/freeradius2/options.mk deleted file mode 100644 index 67b85496e0..0000000000 --- a/freeradius2/options.mk +++ /dev/null @@ -1,147 +0,0 @@ -# $NetBSD: options.mk,v 1.5 2014/11/02 05:55:43 obache Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius -PKG_SUPPORTED_OPTIONS= freeradius-simul-use kerberos ldap mysql -PKG_SUPPORTED_OPTIONS+= pam perl pgsql snmp -PKG_OPTIONS_OPTIONAL_GROUPS= dbm odbc -PKG_OPTIONS_GROUP.dbm= bdb gdbm -PKG_OPTIONS_GROUP.odbc= iodbc unixodbc -PKG_SUGGESTED_OPTIONS= freeradius-simul-use gdbm - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= dbm gdbm iodbc ldap kerberos mysql pam pgsql unixodbc perl - -### -### GDBM or Berkeley DB 1.x support -### -.if !empty(PKG_OPTIONS:Mgdbm) -. include "../../databases/gdbm/buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_dbm -PLIST.dbm= yes -PLIST.gdbm= yes -.elif !empty(PKG_OPTIONS:Mbdb) && exists(/usr/include/ndbm.h) -BDB_ACCEPTED= db1 -. include "../../mk/bdb.buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_dbm -PLIST.dbm= yes -.else -CONFIGURE_ARGS+= --without-rlm_dbm -.endif - -### -### PERL support -### -.if !empty(PKG_OPTIONS:Mperl) -. include "../../lang/perl5/buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_perl -PLIST.perl= yes -.else -CONFIGURE_ARGS+= --without-rlm_perl -.endif - -### -### OpenLDAP support -### -.if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap-client/buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_ldap -PLIST.ldap= yes -.else -CONFIGURE_ARGS+= --without-rlm_ldap -.endif - -### -### IODBC support -### -.if !empty(PKG_OPTIONS:Miodbc) -. include "../../databases/iodbc/buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_sql_iodbc -PLIST.iodbc= yes -.else -CONFIGURE_ARGS+= --without-rlm_sql_iodbc -.endif - -### -### UnixDBC support -### -.if !empty(PKG_OPTIONS:Munixodbc) -. include "../../databases/unixodbc/buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_sql_unixodbc -PLIST.unixodbc= yes -.else -CONFIGURE_ARGS+= --without-rlm_sql_unixodbc -.endif - -### -### PostgreSQL support -### -.if !empty(PKG_OPTIONS:Mpgsql) -. include "../../mk/pgsql.buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_sql_postgresql -PLIST.pgsql= yes -.else -CONFIGURE_ARGS+= --without-rlm_sql_postgresql -.endif - -### -### MySQL support -### -.if !empty(PKG_OPTIONS:Mmysql) -. include "../../mk/mysql.buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_sql_mysql -PLIST.mysql= yes -.else -CONFIGURE_ARGS+= --without-rlm_sql_mysql -.endif - -### -### SNMP support -### -### Please note that snmp support is limited. Freeradius looks like it's -### after the old ucd-snmp (v4.x) headers and ucd-snmp isn't in pkgsrc any -### more. Compatability mode on the current net-snmp (v5.x) does not seem -### to work either. So it will find a few snmp utilites but other than that -### it's limited, at best. -### -.if !empty(PKG_OPTIONS:Msnmp) -. include "../../net/net-snmp/buildlink3.mk" -CONFIGURE_ARGS+= --with-snmp -.else -CONFIGURE_ARGS+= --without-snmp -.endif - -### -### Kerberos 5 support -### -.if !empty(PKG_OPTIONS:Mkerberos) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --with-rlm_krb5 -. if defined(KRB5_TYPE) && ${KRB5_TYPE} == "heimdal" -CONFIGURE_ARGS+= --enable-heimdal-krb5 -. endif -PLIST.kerberos= yes -.else -CONFIGURE_ARGS+= --without-rlm_krb5 -.endif - -### -### Enable Simultaneous-Use which needs snmpwalk and snmpget -### -.if !empty(PKG_OPTIONS:Mfreeradius-simul-use) -. include "../../net/net-snmp/buildlink3.mk" -.else -CONFIGURE_ENV+= ac_cv_path_SNMPGET="" -CONFIGURE_ENV+= ac_cv_path_SNMPWALK="" -.endif - -### -### PAM support -### -.if !empty(PKG_OPTIONS:Mpam) -CONFIGURE_ARGS+= --with-rlm_pam -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam -PLIST.pam= yes -.else -CONFIGURE_ARGS+= --without-rlm_pam -.endif diff --git a/freeradius2/patches/patch-aa b/freeradius2/patches/patch-aa deleted file mode 100644 index 46aff8c4db..0000000000 --- a/freeradius2/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2008/10/12 13:57:27 adrianp Exp $ - ---- src/lib/log.c.orig 2015-09-30 20:37:13.000000000 +0000 -+++ src/lib/log.c -@@ -52,10 +52,10 @@ RCSID("$Id: 73c46d7d3d460adfb424ef70ee4b - * Use pthread keys if we have pthreads. For MAC, which should - * be very fast. - */ -+#endif - #ifdef HAVE_PTHREAD_H - #define USE_PTHREAD_FOR_TLS (1) - #endif --#endif - - #ifndef USE_PTHREAD_FOR_TLS - /* diff --git a/freeradius2/patches/patch-ab b/freeradius2/patches/patch-ab deleted file mode 100644 index 8f74881f5f..0000000000 --- a/freeradius2/patches/patch-ab +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ - ---- src/modules/rlm_perl/Makefile.in.orig 2015-09-30 20:37:13.000000000 +0000 -+++ src/modules/rlm_perl/Makefile.in -@@ -15,4 +15,3 @@ include ../rules.mak - $(LT_OBJS): $(HEADERS) - - install-scripts: -- $(INSTALL) -m 755 example.pl $(R)$(raddbdir) diff --git a/freeradius2/patches/patch-ac b/freeradius2/patches/patch-ac deleted file mode 100644 index abba6e3686..0000000000 --- a/freeradius2/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2013/04/12 13:45:47 joerg Exp $ - ---- src/main/modules.c.orig 2015-09-30 20:37:13.000000000 +0000 -+++ src/main/modules.c -@@ -1408,9 +1408,6 @@ int setup_modules(int reload, CONF_SECTI - * It's like libtool and libltdl are some kind - * of sick joke. - */ --#ifdef IE_LIBTOOL_DIE --#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols --#endif - - /* - * Set the default list of preloaded symbols. diff --git a/freeradius2/patches/patch-ae b/freeradius2/patches/patch-ae deleted file mode 100644 index 1e26b240e2..0000000000 --- a/freeradius2/patches/patch-ae +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2009/10/11 09:18:25 adam Exp $ - ---- Makefile.orig 2015-09-30 20:37:13.000000000 +0000 -+++ Makefile -@@ -11,7 +11,7 @@ include Make.inc - - .PHONY: all clean install - --SUBDIRS = $(LTDL_SUBDIRS) $(wildcard src raddb scripts doc) -+SUBDIRS = $(LTDL_SUBDIRS) $(wildcard src scripts doc) - WHAT_TO_MAKE = all - - all: -@@ -47,9 +47,7 @@ export DESTDIR := $(R) - install: - $(INSTALL) -d -m 755 $(R)$(sbindir) - $(INSTALL) -d -m 755 $(R)$(bindir) -- $(INSTALL) -d -m 755 $(R)$(raddbdir) - $(INSTALL) -d -m 755 $(R)$(mandir) -- $(INSTALL) -d -m 755 $(R)$(RUNDIR) - $(INSTALL) -d -m 700 $(R)$(logdir) - $(INSTALL) -d -m 700 $(R)$(radacctdir) - $(INSTALL) -d -m 755 $(R)$(datadir) diff --git a/freeradius2/patches/patch-ai b/freeradius2/patches/patch-ai deleted file mode 100644 index 1698bc78f0..0000000000 --- a/freeradius2/patches/patch-ai +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD$ - ---- configure.orig 2015-09-30 20:37:13.000000000 +0000 -+++ configure -@@ -20177,13 +20177,13 @@ fi - done - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 --$as_echo_n "checking for pthread_create in -lpthread... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 -+$as_echo_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; } - if ${ac_cv_lib_pthread_pthread_create+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" -+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -20215,7 +20215,7 @@ fi - $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } - if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : - CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" -- LIBS="-lpthread $LIBS" -+ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5 - $as_echo_n "checking for pthread_create in -lc_r... " >&6; } -@@ -20525,7 +20525,7 @@ if ${ac_cv_lib_ssl_SSL_new+:} false; the - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lssl $LIBS" -+LIBS="-lssl -lcrypto $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -22529,7 +22529,7 @@ gethostbyaddrrstyle="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyaddr_r() syntax" >&5 - $as_echo_n "checking gethostbyaddr_r() syntax... " >&6; } - case "$host" in --*-freebsd*) -+*-freebsd* | *-dragonfly*) - ac_fn_c_check_decl "$LINENO" "gethostbyaddr_r" "ac_cv_have_decl_gethostbyaddr_r" " - #ifdef HAVE_NETDB_H - #include diff --git a/freeradius2/patches/patch-aj b/freeradius2/patches/patch-aj deleted file mode 100644 index ea8948daca..0000000000 --- a/freeradius2/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2010/07/20 08:41:21 adam Exp $ - ---- Make.inc.in.orig 2015-09-30 20:37:13.000000000 +0000 -+++ Make.inc.in -@@ -47,6 +47,7 @@ INSTALLSTRIP = @INSTALLSTRIP@ - LCRYPT = @CRYPTLIB@ - LIBS = @LIBS@ - LDFLAGS = @LDFLAGS@ -+RLM_LIBS += -lcrypto -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib - - LOGDIR = ${logdir} - RADDBDIR = ${raddbdir} diff --git a/freeradius2/patches/patch-ak b/freeradius2/patches/patch-ak deleted file mode 100644 index 198a248b02..0000000000 --- a/freeradius2/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD$ - ---- raddb/radiusd.conf.in.orig 2015-09-30 20:37:13.000000000 +0000 -+++ raddb/radiusd.conf.in -@@ -166,6 +166,8 @@ pidfile = ${run_dir}/${name}.pid - # - #user = radius - #group = radius -+user = radius -+group = radius - - # panic_action: Command to execute if the server dies unexpectedly. - # diff --git a/freeradius2/patches/patch-al b/freeradius2/patches/patch-al deleted file mode 100644 index 94698d5dd5..0000000000 --- a/freeradius2/patches/patch-al +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-al,v 1.3 2010/07/20 08:41:21 adam Exp $ - ---- src/modules/rlm_preprocess/rlm_preprocess.c.orig 2015-09-30 20:37:13.000000000 +0000 -+++ src/modules/rlm_preprocess/rlm_preprocess.c -@@ -128,7 +128,7 @@ static void cisco_vsa_hack(VALUE_PAIR *v - /* - * No weird packing. Ignore it. - */ -- ptr = strchr(vp->vp_strvalue, '='); /* find an '=' */ -+ ptr = strchr((char *)vp->vp_strvalue, '='); /* find an '=' */ - if (!ptr) continue; - - /* -@@ -146,7 +146,7 @@ static void cisco_vsa_hack(VALUE_PAIR *v - const char *p; - DICT_ATTR *dattr; - -- p = vp->vp_strvalue; -+ p = (char *)vp->vp_strvalue; - gettoken(&p, newattr, sizeof(newattr)); - - if ((dattr = dict_attrbyname(newattr)) != NULL) { -@@ -231,10 +231,10 @@ static void rad_mangle(rlm_preprocess_t - * - * FIXME: should we handle this as a REALM ? - */ -- if ((ptr = strchr(namepair->vp_strvalue, '\\')) != NULL) { -+ if ((ptr = strchr((char *)namepair->vp_strvalue, '\\')) != NULL) { - strlcpy(newname, ptr + 1, sizeof(newname)); - /* Same size */ -- strcpy(namepair->vp_strvalue, newname); -+ strcpy((char *)namepair->vp_strvalue, newname); - namepair->length = strlen(newname); - } - } -@@ -415,9 +415,9 @@ static int huntgroup_access(REQUEST *req - &request->packet->vps, - PW_HUNTGROUP_NAME, - PW_TYPE_STRING); -- strlcpy(vp->vp_strvalue, i->name, -+ strlcpy((char *)vp->vp_strvalue, i->name, - sizeof(vp->vp_strvalue)); -- vp->length = strlen(vp->vp_strvalue); -+ vp->length = strlen((char *)vp->vp_strvalue); - } - r = RLM_MODULE_OK; - } -@@ -597,7 +597,7 @@ static int preprocess_authorize(void *in - data->huntgroups)) != RLM_MODULE_OK) { - char buf[1024]; - radlog_request(L_AUTH, 0, request, "No huntgroup access: [%s] (%s)", -- request->username ? request->username->vp_strvalue : "", -+ request->username ? (char *)request->username->vp_strvalue : "", - auth_name(buf, sizeof(buf), request, 1)); - return r; - } -@@ -648,7 +648,7 @@ static int preprocess_preaccounting(void - data->huntgroups)) != RLM_MODULE_OK) { - char buf[1024]; - radlog_request(L_INFO, 0, request, "No huntgroup access: [%s] (%s)", -- request->username ? request->username->vp_strvalue : "", -+ request->username ? (char *)request->username->vp_strvalue : "", - auth_name(buf, sizeof(buf), request, 1)); - return r; - } diff --git a/freeradius2/patches/patch-configure.in b/freeradius2/patches/patch-configure.in deleted file mode 100644 index be9248bf52..0000000000 --- a/freeradius2/patches/patch-configure.in +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD$ - ---- configure.in.orig 2015-09-30 20:37:13.000000000 +0000 -+++ configure.in -@@ -659,7 +659,6 @@ AC_CHECK_HEADERS( \ - unistd.h \ - crypt.h \ - errno.h \ -- execinfo.h \ - resource.h \ - sys/resource.h \ - getopt.h \ diff --git a/freeradius2/patches/patch-man_man5_dictionary.5 b/freeradius2/patches/patch-man_man5_dictionary.5 deleted file mode 100644 index 8ce45dbe85..0000000000 --- a/freeradius2/patches/patch-man_man5_dictionary.5 +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-man_man5_dictionary.5,v 1.1 2012/03/12 21:54:13 joerg Exp $ - ---- man/man5/dictionary.5.orig 2015-09-30 20:37:13.000000000 +0000 -+++ man/man5/dictionary.5 -@@ -60,7 +60,6 @@ given, the attribute is defined to be a - Alternately, the options may be the a comma-separated list of the - following options: - --.TP 0.5i - .DS - encrypt=[1-3] - .DE diff --git a/mpi-ch/DESCR b/mpi-ch/DESCR deleted file mode 100644 index bf19395291..0000000000 --- a/mpi-ch/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -MPICH is a freely available, portable implementation of MPI, MPI-2, -and MPI-3 standard message-passing interface. - -Documentation on installing and using MPICH is available, as well as -manual pages for the routines and commands. diff --git a/mpi-ch/Makefile b/mpi-ch/Makefile deleted file mode 100644 index 5184901e35..0000000000 --- a/mpi-ch/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# $NetBSD: Makefile,v 1.41 2013/03/08 05:49:23 asau Exp $ - -DISTNAME= mpich-3.0.1 -CATEGORIES= parallel -MASTER_SITES= http://www.mpich.org/static/tarballs/$(PKGVERSION_NOREV)/ - -MAINTAINER= asau@inbox.ru -HOMEPAGE= http://www.mpich.org/ -COMMENT= Open source MPI, MPI-2, and MPI-3 implementation from Univ. of Chicago - -DEPENDS+= bash-[0-9]*:../../shells/bash - -MAKE_JOBS_SAFE= no - -MPI_SUBPREFIX= mpich -MPI_PREFIX= $(LOCALBASE)/$(MPI_SUBPREFIX) - -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_LANGUAGES= c c++ fortran77 - -PKG_SYSCONFSUBDIR= mpich - -GNU_CONFIGURE_PREFIX= $(MPI_PREFIX) -CONFIGURE_ARGS+= --datadir=$(MPI_PREFIX)/share/$(PKGBASE) -CONFIGURE_ARGS+= --sysconfdir=$(PKG_SYSCONFDIR) -CONFIGURE_ARGS+= --docdir=$(MPI_PREFIX)/share/doc/$(PKGBASE) -CONFIGURE_ARGS+= --htmldir=$(MPI_PREFIX)/share/doc/$(PKGBASE)/html - -CONFIGURE_ARGS+= --with-pm=hydra:gforker -CONFIGURE_ARGS+= --disable-fc # problems? -CONFIGURE_ARGS+= --with-openpa-prefix=$(BUILDLINK_PREFIX.openpa:Q) # reuse it -CONFIGURE_ARGS+= --with-hwloc-prefix=$(BUILDLINK_PREFIX.hwloc:Q) # reuse it - -USE_TOOLS+= perl:run - -BUILDLINK_PASSTHRU_RPATHDIRS+= $(MPI_PREFIX)/lib - -CONF_FILES+= ${MPI_SUBPREFIX}/share/$(PKGBASE)/examples/mpicc.conf \ - $(PKG_SYSCONFDIR)/mpicc.conf -CONF_FILES+= ${MPI_SUBPREFIX}/share/$(PKGBASE)/examples/mpicxx.conf \ - $(PKG_SYSCONFDIR)/mpicxx.conf -CONF_FILES+= ${MPI_SUBPREFIX}/share/$(PKGBASE)/examples/mpif77.conf \ - $(PKG_SYSCONFDIR)/mpif77.conf - -# FreeBSD 6 hack: -.include "../../mk/bsd.prefs.mk" -.if $(OPSYS) == "FreeBSD" || $(OPSYS) == "DragonFly" -BUILDLINK_TRANSFORM+= rm:-lrt -.endif - -.include "options.mk" - -TEST_TARGET= check - -.include "../../parallel/hwloc/buildlink3.mk" -.include "../../parallel/openpa/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/mpi-ch/PLIST b/mpi-ch/PLIST deleted file mode 100644 index c2c9dcab0b..0000000000 --- a/mpi-ch/PLIST +++ /dev/null @@ -1,424 +0,0 @@ -@comment $NetBSD: PLIST,v 1.19 2013/03/07 19:05:41 asau Exp $ -mpich/bin/hydra_nameserver -mpich/bin/hydra_persist -mpich/bin/hydra_pmi_proxy -mpich/bin/mpic++ -mpich/bin/mpicc -mpich/bin/mpichversion -mpich/bin/mpicxx -mpich/bin/mpiexec -mpich/bin/mpiexec.gforker -mpich/bin/mpiexec.hydra -mpich/bin/mpif77 -mpich/bin/mpirun -mpich/bin/parkill -mpich/include/mpi.h -mpich/include/mpicxx.h -mpich/include/mpif.h -mpich/include/mpio.h -mpich/include/mpiof.h -mpich/lib/libfmpich.la -mpich/lib/libmpich.la -mpich/lib/libmpichcxx.la -mpich/lib/libmpl.la -mpich/lib/pkgconfig/mpich.pc -mpich/man/man1/mpicc.1 -mpich/man/man1/mpicxx.1 -mpich/man/man1/mpiexec.1 -mpich/man/man1/mpif77.1 -mpich/man/man1/mpif90.1 -mpich/man/man3/MPIX_Comm_group_failed.3 -mpich/man/man3/MPIX_Comm_reenable_anysource.3 -mpich/man/man3/MPIX_Comm_remote_group_failed.3 -mpich/man/man3/MPI_Abort.3 -mpich/man/man3/MPI_Accumulate.3 -mpich/man/man3/MPI_Add_error_class.3 -mpich/man/man3/MPI_Add_error_code.3 -mpich/man/man3/MPI_Add_error_string.3 -mpich/man/man3/MPI_Address.3 -mpich/man/man3/MPI_Allgather.3 -mpich/man/man3/MPI_Allgatherv.3 -mpich/man/man3/MPI_Alloc_mem.3 -mpich/man/man3/MPI_Allreduce.3 -mpich/man/man3/MPI_Alltoall.3 -mpich/man/man3/MPI_Alltoallv.3 -mpich/man/man3/MPI_Alltoallw.3 -mpich/man/man3/MPI_Attr_delete.3 -mpich/man/man3/MPI_Attr_get.3 -mpich/man/man3/MPI_Attr_put.3 -mpich/man/man3/MPI_Barrier.3 -mpich/man/man3/MPI_Bcast.3 -mpich/man/man3/MPI_Bsend.3 -mpich/man/man3/MPI_Bsend_init.3 -mpich/man/man3/MPI_Buffer_attach.3 -mpich/man/man3/MPI_Buffer_detach.3 -mpich/man/man3/MPI_Cancel.3 -mpich/man/man3/MPI_Cart_coords.3 -mpich/man/man3/MPI_Cart_create.3 -mpich/man/man3/MPI_Cart_get.3 -mpich/man/man3/MPI_Cart_map.3 -mpich/man/man3/MPI_Cart_rank.3 -mpich/man/man3/MPI_Cart_shift.3 -mpich/man/man3/MPI_Cart_sub.3 -mpich/man/man3/MPI_Cartdim_get.3 -mpich/man/man3/MPI_Close_port.3 -mpich/man/man3/MPI_Comm_accept.3 -mpich/man/man3/MPI_Comm_call_errhandler.3 -mpich/man/man3/MPI_Comm_compare.3 -mpich/man/man3/MPI_Comm_connect.3 -mpich/man/man3/MPI_Comm_create.3 -mpich/man/man3/MPI_Comm_create_errhandler.3 -mpich/man/man3/MPI_Comm_create_group.3 -mpich/man/man3/MPI_Comm_create_keyval.3 -mpich/man/man3/MPI_Comm_delete_attr.3 -mpich/man/man3/MPI_Comm_disconnect.3 -mpich/man/man3/MPI_Comm_dup.3 -mpich/man/man3/MPI_Comm_dup_with_info.3 -mpich/man/man3/MPI_Comm_free.3 -mpich/man/man3/MPI_Comm_free_keyval.3 -mpich/man/man3/MPI_Comm_get_attr.3 -mpich/man/man3/MPI_Comm_get_errhandler.3 -mpich/man/man3/MPI_Comm_get_info.3 -mpich/man/man3/MPI_Comm_get_name.3 -mpich/man/man3/MPI_Comm_get_parent.3 -mpich/man/man3/MPI_Comm_group.3 -mpich/man/man3/MPI_Comm_idup.3 -mpich/man/man3/MPI_Comm_join.3 -mpich/man/man3/MPI_Comm_rank.3 -mpich/man/man3/MPI_Comm_remote_group.3 -mpich/man/man3/MPI_Comm_remote_size.3 -mpich/man/man3/MPI_Comm_set_attr.3 -mpich/man/man3/MPI_Comm_set_errhandler.3 -mpich/man/man3/MPI_Comm_set_info.3 -mpich/man/man3/MPI_Comm_set_name.3 -mpich/man/man3/MPI_Comm_size.3 -mpich/man/man3/MPI_Comm_spawn.3 -mpich/man/man3/MPI_Comm_spawn_multiple.3 -mpich/man/man3/MPI_Comm_split.3 -mpich/man/man3/MPI_Comm_split_type.3 -mpich/man/man3/MPI_Comm_test_inter.3 -mpich/man/man3/MPI_Compare_and_swap.3 -mpich/man/man3/MPI_Dims_create.3 -mpich/man/man3/MPI_Dist_graph_create.3 -mpich/man/man3/MPI_Dist_graph_create_adjacent.3 -mpich/man/man3/MPI_Dist_graph_neighbors.3 -mpich/man/man3/MPI_Dist_graph_neighbors_count.3 -mpich/man/man3/MPI_Errhandler_create.3 -mpich/man/man3/MPI_Errhandler_free.3 -mpich/man/man3/MPI_Errhandler_get.3 -mpich/man/man3/MPI_Errhandler_set.3 -mpich/man/man3/MPI_Error_class.3 -mpich/man/man3/MPI_Error_string.3 -mpich/man/man3/MPI_Exscan.3 -mpich/man/man3/MPI_Fetch_and_op.3 -mpich/man/man3/MPI_File_c2f.3 -mpich/man/man3/MPI_File_call_errhandler.3 -mpich/man/man3/MPI_File_close.3 -mpich/man/man3/MPI_File_create_errhandler.3 -mpich/man/man3/MPI_File_delete.3 -mpich/man/man3/MPI_File_f2c.3 -mpich/man/man3/MPI_File_get_amode.3 -mpich/man/man3/MPI_File_get_atomicity.3 -mpich/man/man3/MPI_File_get_byte_offset.3 -mpich/man/man3/MPI_File_get_errhandler.3 -mpich/man/man3/MPI_File_get_group.3 -mpich/man/man3/MPI_File_get_info.3 -mpich/man/man3/MPI_File_get_position.3 -mpich/man/man3/MPI_File_get_position_shared.3 -mpich/man/man3/MPI_File_get_size.3 -mpich/man/man3/MPI_File_get_type_extent.3 -mpich/man/man3/MPI_File_get_view.3 -mpich/man/man3/MPI_File_iread.3 -mpich/man/man3/MPI_File_iread_at.3 -mpich/man/man3/MPI_File_iread_shared.3 -mpich/man/man3/MPI_File_iwrite.3 -mpich/man/man3/MPI_File_iwrite_at.3 -mpich/man/man3/MPI_File_iwrite_shared.3 -mpich/man/man3/MPI_File_open.3 -mpich/man/man3/MPI_File_preallocate.3 -mpich/man/man3/MPI_File_read.3 -mpich/man/man3/MPI_File_read_all.3 -mpich/man/man3/MPI_File_read_all_begin.3 -mpich/man/man3/MPI_File_read_all_end.3 -mpich/man/man3/MPI_File_read_at.3 -mpich/man/man3/MPI_File_read_at_all.3 -mpich/man/man3/MPI_File_read_at_all_begin.3 -mpich/man/man3/MPI_File_read_at_all_end.3 -mpich/man/man3/MPI_File_read_ordered.3 -mpich/man/man3/MPI_File_read_ordered_begin.3 -mpich/man/man3/MPI_File_read_ordered_end.3 -mpich/man/man3/MPI_File_read_shared.3 -mpich/man/man3/MPI_File_seek.3 -mpich/man/man3/MPI_File_seek_shared.3 -mpich/man/man3/MPI_File_set_atomicity.3 -mpich/man/man3/MPI_File_set_errhandler.3 -mpich/man/man3/MPI_File_set_info.3 -mpich/man/man3/MPI_File_set_size.3 -mpich/man/man3/MPI_File_set_view.3 -mpich/man/man3/MPI_File_sync.3 -mpich/man/man3/MPI_File_write.3 -mpich/man/man3/MPI_File_write_all.3 -mpich/man/man3/MPI_File_write_all_begin.3 -mpich/man/man3/MPI_File_write_all_end.3 -mpich/man/man3/MPI_File_write_at.3 -mpich/man/man3/MPI_File_write_at_all.3 -mpich/man/man3/MPI_File_write_at_all_begin.3 -mpich/man/man3/MPI_File_write_at_all_end.3 -mpich/man/man3/MPI_File_write_ordered.3 -mpich/man/man3/MPI_File_write_ordered_begin.3 -mpich/man/man3/MPI_File_write_ordered_end.3 -mpich/man/man3/MPI_File_write_shared.3 -mpich/man/man3/MPI_Finalize.3 -mpich/man/man3/MPI_Finalized.3 -mpich/man/man3/MPI_Free_mem.3 -mpich/man/man3/MPI_Gather.3 -mpich/man/man3/MPI_Gatherv.3 -mpich/man/man3/MPI_Get.3 -mpich/man/man3/MPI_Get_accumulate.3 -mpich/man/man3/MPI_Get_address.3 -mpich/man/man3/MPI_Get_count.3 -mpich/man/man3/MPI_Get_elements.3 -mpich/man/man3/MPI_Get_elements_x.3 -mpich/man/man3/MPI_Get_library_version.3 -mpich/man/man3/MPI_Get_processor_name.3 -mpich/man/man3/MPI_Get_version.3 -mpich/man/man3/MPI_Graph_create.3 -mpich/man/man3/MPI_Graph_get.3 -mpich/man/man3/MPI_Graph_map.3 -mpich/man/man3/MPI_Graph_neighbors.3 -mpich/man/man3/MPI_Graph_neighbors_count.3 -mpich/man/man3/MPI_Graphdims_get.3 -mpich/man/man3/MPI_Grequest_complete.3 -mpich/man/man3/MPI_Grequest_start.3 -mpich/man/man3/MPI_Group_compare.3 -mpich/man/man3/MPI_Group_difference.3 -mpich/man/man3/MPI_Group_excl.3 -mpich/man/man3/MPI_Group_free.3 -mpich/man/man3/MPI_Group_incl.3 -mpich/man/man3/MPI_Group_intersection.3 -mpich/man/man3/MPI_Group_range_excl.3 -mpich/man/man3/MPI_Group_range_incl.3 -mpich/man/man3/MPI_Group_rank.3 -mpich/man/man3/MPI_Group_size.3 -mpich/man/man3/MPI_Group_translate_ranks.3 -mpich/man/man3/MPI_Group_union.3 -mpich/man/man3/MPI_Iallgather.3 -mpich/man/man3/MPI_Iallgatherv.3 -mpich/man/man3/MPI_Iallreduce.3 -mpich/man/man3/MPI_Ialltoall.3 -mpich/man/man3/MPI_Ialltoallv.3 -mpich/man/man3/MPI_Ialltoallw.3 -mpich/man/man3/MPI_Ibarrier.3 -mpich/man/man3/MPI_Ibcast.3 -mpich/man/man3/MPI_Ibsend.3 -mpich/man/man3/MPI_Iexscan.3 -mpich/man/man3/MPI_Igather.3 -mpich/man/man3/MPI_Igatherv.3 -mpich/man/man3/MPI_Improbe.3 -mpich/man/man3/MPI_Imrecv.3 -mpich/man/man3/MPI_Ineighbor_allgather.3 -mpich/man/man3/MPI_Ineighbor_allgatherv.3 -mpich/man/man3/MPI_Ineighbor_alltoall.3 -mpich/man/man3/MPI_Ineighbor_alltoallv.3 -mpich/man/man3/MPI_Ineighbor_alltoallw.3 -mpich/man/man3/MPI_Info_create.3 -mpich/man/man3/MPI_Info_delete.3 -mpich/man/man3/MPI_Info_dup.3 -mpich/man/man3/MPI_Info_free.3 -mpich/man/man3/MPI_Info_get.3 -mpich/man/man3/MPI_Info_get_nkeys.3 -mpich/man/man3/MPI_Info_get_nthkey.3 -mpich/man/man3/MPI_Info_get_valuelen.3 -mpich/man/man3/MPI_Info_set.3 -mpich/man/man3/MPI_Init.3 -mpich/man/man3/MPI_Init_thread.3 -mpich/man/man3/MPI_Initialized.3 -mpich/man/man3/MPI_Intercomm_create.3 -mpich/man/man3/MPI_Intercomm_merge.3 -mpich/man/man3/MPI_Iprobe.3 -mpich/man/man3/MPI_Irecv.3 -mpich/man/man3/MPI_Ireduce.3 -mpich/man/man3/MPI_Ireduce_scatter.3 -mpich/man/man3/MPI_Ireduce_scatter_block.3 -mpich/man/man3/MPI_Irsend.3 -mpich/man/man3/MPI_Is_thread_main.3 -mpich/man/man3/MPI_Iscan.3 -mpich/man/man3/MPI_Iscatter.3 -mpich/man/man3/MPI_Iscatterv.3 -mpich/man/man3/MPI_Isend.3 -mpich/man/man3/MPI_Issend.3 -mpich/man/man3/MPI_Keyval_create.3 -mpich/man/man3/MPI_Keyval_free.3 -mpich/man/man3/MPI_Lookup_name.3 -mpich/man/man3/MPI_Mprobe.3 -mpich/man/man3/MPI_Mrecv.3 -mpich/man/man3/MPI_Neighbor_allgather.3 -mpich/man/man3/MPI_Neighbor_allgatherv.3 -mpich/man/man3/MPI_Neighbor_alltoall.3 -mpich/man/man3/MPI_Neighbor_alltoallv.3 -mpich/man/man3/MPI_Neighbor_alltoallw.3 -mpich/man/man3/MPI_Op_commute.3 -mpich/man/man3/MPI_Op_create.3 -mpich/man/man3/MPI_Op_free.3 -mpich/man/man3/MPI_Open_port.3 -mpich/man/man3/MPI_Pack.3 -mpich/man/man3/MPI_Pack_external.3 -mpich/man/man3/MPI_Pack_external_size.3 -mpich/man/man3/MPI_Pack_size.3 -mpich/man/man3/MPI_Pcontrol.3 -mpich/man/man3/MPI_Probe.3 -mpich/man/man3/MPI_Publish_name.3 -mpich/man/man3/MPI_Put.3 -mpich/man/man3/MPI_Query_thread.3 -mpich/man/man3/MPI_Raccumulate.3 -mpich/man/man3/MPI_Recv.3 -mpich/man/man3/MPI_Recv_init.3 -mpich/man/man3/MPI_Reduce.3 -mpich/man/man3/MPI_Reduce_local.3 -mpich/man/man3/MPI_Reduce_scatter.3 -mpich/man/man3/MPI_Reduce_scatter_block.3 -mpich/man/man3/MPI_Register_datarep.3 -mpich/man/man3/MPI_Request_free.3 -mpich/man/man3/MPI_Request_get_status.3 -mpich/man/man3/MPI_Rget.3 -mpich/man/man3/MPI_Rget_accumulate.3 -mpich/man/man3/MPI_Rput.3 -mpich/man/man3/MPI_Rsend.3 -mpich/man/man3/MPI_Rsend_init.3 -mpich/man/man3/MPI_Scan.3 -mpich/man/man3/MPI_Scatter.3 -mpich/man/man3/MPI_Scatterv.3 -mpich/man/man3/MPI_Send.3 -mpich/man/man3/MPI_Send_init.3 -mpich/man/man3/MPI_Sendrecv.3 -mpich/man/man3/MPI_Sendrecv_replace.3 -mpich/man/man3/MPI_Ssend.3 -mpich/man/man3/MPI_Ssend_init.3 -mpich/man/man3/MPI_Start.3 -mpich/man/man3/MPI_Startall.3 -mpich/man/man3/MPI_Status_set_cancelled.3 -mpich/man/man3/MPI_Status_set_elements.3 -mpich/man/man3/MPI_Status_set_elements_x.3 -mpich/man/man3/MPI_T_category_changed.3 -mpich/man/man3/MPI_T_category_get_categories.3 -mpich/man/man3/MPI_T_category_get_cvars.3 -mpich/man/man3/MPI_T_category_get_info.3 -mpich/man/man3/MPI_T_category_get_num.3 -mpich/man/man3/MPI_T_category_get_pvars.3 -mpich/man/man3/MPI_T_cvar_get_info.3 -mpich/man/man3/MPI_T_cvar_get_num.3 -mpich/man/man3/MPI_T_cvar_handle_alloc.3 -mpich/man/man3/MPI_T_cvar_handle_free.3 -mpich/man/man3/MPI_T_cvar_read.3 -mpich/man/man3/MPI_T_cvar_write.3 -mpich/man/man3/MPI_T_enum_get_info.3 -mpich/man/man3/MPI_T_enum_get_item.3 -mpich/man/man3/MPI_T_finalize.3 -mpich/man/man3/MPI_T_init_thread.3 -mpich/man/man3/MPI_T_pvar_get_info.3 -mpich/man/man3/MPI_T_pvar_get_num.3 -mpich/man/man3/MPI_T_pvar_handle_alloc.3 -mpich/man/man3/MPI_T_pvar_handle_free.3 -mpich/man/man3/MPI_T_pvar_read.3 -mpich/man/man3/MPI_T_pvar_readreset.3 -mpich/man/man3/MPI_T_pvar_reset.3 -mpich/man/man3/MPI_T_pvar_session_create.3 -mpich/man/man3/MPI_T_pvar_session_free.3 -mpich/man/man3/MPI_T_pvar_start.3 -mpich/man/man3/MPI_T_pvar_stop.3 -mpich/man/man3/MPI_T_pvar_write.3 -mpich/man/man3/MPI_Test.3 -mpich/man/man3/MPI_Test_cancelled.3 -mpich/man/man3/MPI_Testall.3 -mpich/man/man3/MPI_Testany.3 -mpich/man/man3/MPI_Testsome.3 -mpich/man/man3/MPI_Topo_test.3 -mpich/man/man3/MPI_Type_commit.3 -mpich/man/man3/MPI_Type_contiguous.3 -mpich/man/man3/MPI_Type_create_darray.3 -mpich/man/man3/MPI_Type_create_hindexed.3 -mpich/man/man3/MPI_Type_create_hindexed_block.3 -mpich/man/man3/MPI_Type_create_hvector.3 -mpich/man/man3/MPI_Type_create_indexed_block.3 -mpich/man/man3/MPI_Type_create_keyval.3 -mpich/man/man3/MPI_Type_create_resized.3 -mpich/man/man3/MPI_Type_create_struct.3 -mpich/man/man3/MPI_Type_create_subarray.3 -mpich/man/man3/MPI_Type_delete_attr.3 -mpich/man/man3/MPI_Type_dup.3 -mpich/man/man3/MPI_Type_extent.3 -mpich/man/man3/MPI_Type_free.3 -mpich/man/man3/MPI_Type_free_keyval.3 -mpich/man/man3/MPI_Type_get_attr.3 -mpich/man/man3/MPI_Type_get_contents.3 -mpich/man/man3/MPI_Type_get_envelope.3 -mpich/man/man3/MPI_Type_get_extent.3 -mpich/man/man3/MPI_Type_get_extent_x.3 -mpich/man/man3/MPI_Type_get_name.3 -mpich/man/man3/MPI_Type_get_true_extent.3 -mpich/man/man3/MPI_Type_get_true_extent_x.3 -mpich/man/man3/MPI_Type_hindexed.3 -mpich/man/man3/MPI_Type_hvector.3 -mpich/man/man3/MPI_Type_indexed.3 -mpich/man/man3/MPI_Type_lb.3 -mpich/man/man3/MPI_Type_match_size.3 -mpich/man/man3/MPI_Type_set_attr.3 -mpich/man/man3/MPI_Type_set_name.3 -mpich/man/man3/MPI_Type_size.3 -mpich/man/man3/MPI_Type_size_x.3 -mpich/man/man3/MPI_Type_struct.3 -mpich/man/man3/MPI_Type_ub.3 -mpich/man/man3/MPI_Type_vector.3 -mpich/man/man3/MPI_Unpack.3 -mpich/man/man3/MPI_Unpack_external.3 -mpich/man/man3/MPI_Unpublish_name.3 -mpich/man/man3/MPI_Wait.3 -mpich/man/man3/MPI_Waitall.3 -mpich/man/man3/MPI_Waitany.3 -mpich/man/man3/MPI_Waitsome.3 -mpich/man/man3/MPI_Win_allocate.3 -mpich/man/man3/MPI_Win_allocate_shared.3 -mpich/man/man3/MPI_Win_attach.3 -mpich/man/man3/MPI_Win_call_errhandler.3 -mpich/man/man3/MPI_Win_complete.3 -mpich/man/man3/MPI_Win_create.3 -mpich/man/man3/MPI_Win_create_dynamic.3 -mpich/man/man3/MPI_Win_create_errhandler.3 -mpich/man/man3/MPI_Win_create_keyval.3 -mpich/man/man3/MPI_Win_delete_attr.3 -mpich/man/man3/MPI_Win_detach.3 -mpich/man/man3/MPI_Win_fence.3 -mpich/man/man3/MPI_Win_flush.3 -mpich/man/man3/MPI_Win_flush_all.3 -mpich/man/man3/MPI_Win_flush_local.3 -mpich/man/man3/MPI_Win_flush_local_all.3 -mpich/man/man3/MPI_Win_free.3 -mpich/man/man3/MPI_Win_free_keyval.3 -mpich/man/man3/MPI_Win_get_attr.3 -mpich/man/man3/MPI_Win_get_errhandler.3 -mpich/man/man3/MPI_Win_get_group.3 -mpich/man/man3/MPI_Win_get_info.3 -mpich/man/man3/MPI_Win_get_name.3 -mpich/man/man3/MPI_Win_lock.3 -mpich/man/man3/MPI_Win_lock_all.3 -mpich/man/man3/MPI_Win_post.3 -mpich/man/man3/MPI_Win_set_attr.3 -mpich/man/man3/MPI_Win_set_errhandler.3 -mpich/man/man3/MPI_Win_set_info.3 -mpich/man/man3/MPI_Win_set_name.3 -mpich/man/man3/MPI_Win_shared_query.3 -mpich/man/man3/MPI_Win_start.3 -mpich/man/man3/MPI_Win_sync.3 -mpich/man/man3/MPI_Win_test.3 -mpich/man/man3/MPI_Win_unlock.3 -mpich/man/man3/MPI_Win_unlock_all.3 -mpich/man/man3/MPI_Win_wait.3 -mpich/man/man3/MPI_Wtick.3 -mpich/man/man3/MPI_Wtime.3 -mpich/share/doc/mpich/install.pdf -mpich/share/doc/mpich/logging.pdf -mpich/share/doc/mpich/smpd_pmi.pdf -mpich/share/doc/mpich/user.pdf -mpich/share/mpich/examples/mpicc.conf -mpich/share/mpich/examples/mpicxx.conf -mpich/share/mpich/examples/mpif77.conf diff --git a/mpi-ch/PLIST.mpd b/mpi-ch/PLIST.mpd deleted file mode 100644 index 56459f3f49..0000000000 --- a/mpi-ch/PLIST.mpd +++ /dev/null @@ -1,30 +0,0 @@ -bin/mpd -bin/mpd.py -bin/mpdallexit -bin/mpdallexit.py -bin/mpdboot -bin/mpdboot.py -bin/mpdcheck -bin/mpdcheck.py -bin/mpdchkpyver.py -bin/mpdcleanup -bin/mpdcleanup.py -bin/mpdexit -bin/mpdexit.py -bin/mpdgdbdrv.py -bin/mpdhelp -bin/mpdhelp.py -bin/mpdkilljob -bin/mpdkilljob.py -bin/mpdlib.py -bin/mpdlistjobs -bin/mpdlistjobs.py -bin/mpdman.py -bin/mpdringtest -bin/mpdringtest.py -bin/mpdrun -bin/mpdsigjob -bin/mpdsigjob.py -bin/mpdtrace -bin/mpdtrace.py -bin/mpiexec.mpd diff --git a/mpi-ch/buildlink3.mk b/mpi-ch/buildlink3.mk deleted file mode 100644 index 32a3dec471..0000000000 --- a/mpi-ch/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.10 2013/03/07 19:08:45 asau Exp $ - -BUILDLINK_TREE+= mpich - -.if !defined(MPICH_BUILDLINK3_MK) -MPICH_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.mpich+= mpich>=3 -BUILDLINK_PKGSRCDIR.mpich?= ../../wip/mpi-ch -BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/mpich/lib -BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/mpich/lib - -.include "../../parallel/openpa/buildlink3.mk" -.endif # MPICH_BUILDLINK3_MK - -BUILDLINK_TREE+= -mpich diff --git a/mpi-ch/distinfo b/mpi-ch/distinfo deleted file mode 100644 index ad44e40d88..0000000000 --- a/mpi-ch/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.23 2013/02/24 19:15:53 asau Exp $ - -SHA1 (mpich-3.0.1.tar.gz) = 61ed0b9fac26e1d102d93503bd8e1ac73f246b5a -RMD160 (mpich-3.0.1.tar.gz) = a30aa14f9360b9cf2e88f9cd4f06b24b8800c55d -Size (mpich-3.0.1.tar.gz) = 10934260 bytes -SHA1 (patch-Makefile.in) = 32a78a384ecb94a30631a8a756e746edbe6e0060 -SHA1 (patch-src_pm_hydra_configure) = c8d25676499386e4a2616db5ab2d86443f29b1f7 diff --git a/mpi-ch/options.mk b/mpi-ch/options.mk deleted file mode 100644 index d6fbca28ad..0000000000 --- a/mpi-ch/options.mk +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: options.mk,v 1.2 2010/12/17 03:07:46 asau Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.mpich -PKG_SUPPORTED_OPTIONS= debug mpich-mpd threads -PKG_SUGGESTED_OPTIONS= threads - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-g=debug # problems -INSTALL_UNSTRIPPED= yes -.endif - -.if !empty(PKG_OPTIONS:Mthreads) -CONFIGURE_ARGS+= --with-thread-package=posix # aka pthreads -.include "../../mk/pthread.buildlink3.mk" -.endif - -# Allow coexistance of MPICH2 and musicpd by disabling MPICH2 parts: -.if !empty(PKG_OPTIONS:Mmpich-mpd) -CONFLICTS+= musicpd-[0-9]* # installs bin/mpd -REPLACE_PYTHON+= src/pm/mpd/*.py src/pm/mpd/test/*.py -CONFIGURE_ARGS+= --with-pm=hydra:mpd:gforker -PLIST_SRC+= PLIST.mpd -.include "../../lang/python/application.mk" -.endif - -PLIST_SRC+= PLIST diff --git a/mpi-ch/patches/patch-Makefile.in b/mpi-ch/patches/patch-Makefile.in deleted file mode 100644 index 3020e7a2ec..0000000000 --- a/mpi-ch/patches/patch-Makefile.in +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2013/02/24 19:15:53 asau Exp $ - ---- Makefile.in.orig 2012-12-20 21:29:15.000000000 +0100 -+++ Makefile.in 2013-01-24 16:33:41.164187741 +0100 -@@ -5985,6 +5985,7 @@ - srcdir = @srcdir@ - subdirs = @subdirs@ - sysconfdir = @sysconfdir@ -+sysconfexampledir = ${datadir}/examples - target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ -@@ -6163,9 +6164,9 @@ - src/mpid/ch3/errnames.txt $(am__append_52) \ - src/mpid/common/sock/errnames.txt $(am__append_87) \ - src/pmi/errnames.txt --external_subdirs = src/mpl src/openpa -+external_subdirs = src/mpl # src/openpa - # FIXME how/where does external_libs/ldflags get used? --external_ldflags = -L$(top_builddir)/src/mpl -L$(top_builddir)/src/openpa/src -+external_ldflags = -L$(top_builddir)/src/mpl # -L$(top_builddir)/src/openpa/src - external_libs = -lmpl -lopa $(am__append_12) $(am__append_13) - - # NOTE on our semi-unconventional usage of DIST_SUBDIRS: -@@ -23542,25 +23543,25 @@ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) - install-sysconfDATA: $(sysconf_DATA) - @$(NORMAL_INSTALL) -- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ -+ @list='$(sysconf_DATA)'; test -n "$(sysconfexampledir)" || list=; \ - if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(sysconfexampledir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(sysconfexampledir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfexampledir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfexampledir)" || exit $$?; \ - done - - uninstall-sysconfDATA: - @$(NORMAL_UNINSTALL) -- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ -+ @list='$(sysconf_DATA)'; test -n "$(sysconfexampledir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) -+ dir='$(DESTDIR)$(sysconfexampledir)'; $(am__uninstall_files_from_dir) - install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ diff --git a/mpi-ch/patches/patch-src_pm_hydra_configure b/mpi-ch/patches/patch-src_pm_hydra_configure deleted file mode 100644 index c30f5cb04c..0000000000 --- a/mpi-ch/patches/patch-src_pm_hydra_configure +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_pm_hydra_configure,v 1.1 2013/02/24 19:15:54 asau Exp $ - ---- src/pm/hydra/configure.orig 2012-12-20 21:28:12.000000000 +0100 -+++ src/pm/hydra/configure 2013-01-24 15:36:08.260189221 +0100 -@@ -14373,7 +14373,7 @@ - - - cat >>confdefs.h <<_ACEOF --#define HYDRA_CONFIGURE_ARGS_CLEAN "`echo $ac_configure_args`" -+#define HYDRA_CONFIGURE_ARGS_CLEAN "`echo -n $ac_configure_args`" - _ACEOF - - diff --git a/munge/DESCR b/munge/DESCR deleted file mode 100644 index fc10b79dd5..0000000000 --- a/munge/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -MUNGE (MUNGE Uid 'N' Gid Emporium) is an authentication service -for creating and validating credentials. It is designed to be -highly scalable for use in an HPC cluster environment. It allows -a process to authenticate the UID and GID of another local or -remote process within a group of hosts having common users and -groups. These hosts form a security realm that is defined by a -shared cryptographic key. Clients within this security realm can -create and validate credentials without the use of root -privileges, reserved ports, or platform-specific methods. diff --git a/munge/Makefile b/munge/Makefile deleted file mode 100644 index bb3f2e8321..0000000000 --- a/munge/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# $NetBSD: Makefile,v 1.18 2018/02/28 09:20:29 wiz Exp $ - -DISTNAME= munge-0.5.13 -CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_GITHUB:=dun/} -GITHUB_RELEASE= ${DISTNAME} -EXTRACT_SUFX= .tar.xz -LICENSE= gnu-gpl-v3 AND gnu-lgpl-v3 - -MAINTAINER= bacon@NetBSD.org -HOMEPAGE= https://dun.github.io/munge/ -COMMENT= Authentication service for creating and validating credentials - -USE_TOOLS+= perl pkg-config -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -INSTALLATION_DIRS+= lib/pkgconfig - -OWN_DIRS= ${VARBASE}/lib/munge -OWN_DIRS+= ${VARBASE}/log/munge -OWN_DIRS+= ${VARBASE}/run/munge -OWN_DIRS+= etc/munge - -BUILD_DEFS+= VARBASE - -RCD_SCRIPTS+= munge - -SUBST_CLASSES+= init -SUBST_STAGE.init= post-build -SUBST_FILES.init= ${WRKSRC}/src/etc/munge.init -SUBST_FILES.init+= ${WRKSRC}/src/etc/munge.sysconfig -SUBST_SED.init= -e 's|USER="munge"|USER="daemon"|g' -SUBST_SED.init+= -e 's|GROUP="munge"|GROUP="daemon"|g' - -.include "../../archivers/bzip2/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../security/libgcrypt/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/munge/PLIST b/munge/PLIST deleted file mode 100644 index a2b9435f34..0000000000 --- a/munge/PLIST +++ /dev/null @@ -1,33 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2018/02/28 09:20:29 wiz Exp $ -bin/munge -bin/remunge -bin/unmunge -include/munge.h -lib/libmunge.la -lib/pkgconfig/munge.pc -lib/systemd/system/munge.service -lib/tmpfiles.d/munge.conf -man/man1/munge.1 -man/man1/remunge.1 -man/man1/unmunge.1 -man/man3/munge.3 -man/man3/munge_ctx.3 -man/man3/munge_ctx_copy.3 -man/man3/munge_ctx_create.3 -man/man3/munge_ctx_destroy.3 -man/man3/munge_ctx_get.3 -man/man3/munge_ctx_set.3 -man/man3/munge_ctx_strerror.3 -man/man3/munge_decode.3 -man/man3/munge_encode.3 -man/man3/munge_enum.3 -man/man3/munge_enum_int_to_str.3 -man/man3/munge_enum_is_valid.3 -man/man3/munge_enum_str_to_int.3 -man/man3/munge_strerror.3 -man/man7/munge.7 -man/man8/munged.8 -sbin/munged -@pkgdir var/run/munge -@pkgdir var/log/munge -@pkgdir var/lib/munge diff --git a/munge/PLIST.FreeBSD b/munge/PLIST.FreeBSD deleted file mode 100644 index ceea024399..0000000000 --- a/munge/PLIST.FreeBSD +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.FreeBSD,v 1.4 2018/01/01 22:29:54 rillig Exp $ -share/examples/munge/default/munge -share/examples/munge/init.d/munge diff --git a/munge/PLIST.Linux b/munge/PLIST.Linux deleted file mode 100644 index 80af7734e6..0000000000 --- a/munge/PLIST.Linux +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.Linux,v 1.3 2015/12/29 04:04:31 dholland Exp $ -share/examples/munge/rc.d/init.d/munge -share/examples/munge/sysconfig/munge diff --git a/munge/PLIST.NetBSD b/munge/PLIST.NetBSD deleted file mode 100644 index dac8c0048a..0000000000 --- a/munge/PLIST.NetBSD +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.NetBSD,v 1.5 2018/02/28 09:20:29 wiz Exp $ -share/examples/munge/default/munge -share/examples/munge/init.d/munge diff --git a/munge/buildlink3.mk b/munge/buildlink3.mk deleted file mode 100644 index 9a20f1e2fb..0000000000 --- a/munge/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/02/19 03:51:17 asau Exp $ - -BUILDLINK_TREE+= munge - -.if !defined(MUNGE_BUILDLINK3_MK) -MUNGE_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.munge+= munge>=0.5.10 -BUILDLINK_PKGSRCDIR.munge?= ../../security/munge - -.endif # MUNGE_BUILDLINK3_MK - -BUILDLINK_TREE+= -munge diff --git a/munge/distinfo b/munge/distinfo deleted file mode 100644 index 8a813550b2..0000000000 --- a/munge/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.5 2018/02/28 09:20:29 wiz Exp $ - -SHA1 (munge-0.5.13.tar.xz) = bcb0b89e44c5c0ec21f4bcfaacb4493b82aace61 -RMD160 (munge-0.5.13.tar.xz) = 77c6e9df935ddc1ffe6cd481e015f59e2f74e1b7 -SHA512 (munge-0.5.13.tar.xz) = 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002 -Size (munge-0.5.13.tar.xz) = 389952 bytes -SHA1 (patch-src_etc_Makefile.in) = 2133f8cf5e718d786bf2ec86c2f7fd3e2a4cdfee diff --git a/munge/files/munge.sh b/munge/files/munge.sh deleted file mode 100644 index eab070367f..0000000000 --- a/munge/files/munge.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# $NetBSD: munge.sh,v 1.1 2014/09/11 16:11:46 asau Exp $ -# -# PROVIDE: munge -# REQUIRE: DAEMON -# KEYWORD: shutdown - -. /etc/rc.subr - -name="munge" -rcvar=${name} -command="@PREFIX@/sbin/munged" - -load_rc_config $name -run_rc_command "$1" diff --git a/munge/patches/patch-src_etc_Makefile.in b/munge/patches/patch-src_etc_Makefile.in deleted file mode 100644 index 14b3bcdbab..0000000000 --- a/munge/patches/patch-src_etc_Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-src_etc_Makefile.in,v 1.4 2018/02/28 09:20:29 wiz Exp $ - -Install configuration into example directory. - ---- src/etc/Makefile.in.orig 2017-09-26 21:57:53.000000000 +0000 -+++ src/etc/Makefile.in -@@ -298,6 +298,7 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+sysconfexampledir = $(prefix)/share/examples/munge - target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ -@@ -581,15 +582,15 @@ munge.tmpfiles.conf: munge.tmpfiles.conf - - install-data-local: - test -d "/etc/rc.d/init.d" \ -- && INITDIR="$(sysconfdir)/rc.d/init.d" \ -- || INITDIR="$(sysconfdir)/init.d"; \ -+ && INITDIR="$(sysconfexampledir)/rc.d/init.d" \ -+ || INITDIR="$(sysconfexampledir)/init.d"; \ - $(INSTALL) -m 0755 -d "$(DESTDIR)$${INITDIR}"; \ - $(INSTALL) -m 0755 \ - "$(builddir)/munge.init" "$(DESTDIR)$${INITDIR}/munge" - : - test -d "/etc/sysconfig" \ -- && CONFDIR="$(sysconfdir)/sysconfig" \ -- || CONFDIR="$(sysconfdir)/default"; \ -+ && CONFDIR="$(sysconfexampledir)/sysconfig" \ -+ || CONFDIR="$(sysconfexampledir)/default"; \ - $(INSTALL) -m 0755 -d "$(DESTDIR)$${CONFDIR}"; \ - $(INSTALL) -m 0644 \ - "$(builddir)/munge.sysconfig" "$(DESTDIR)$${CONFDIR}/munge" -@@ -610,8 +611,8 @@ install-data-local: - "$(builddir)/munge.tmpfiles.conf" \ - "$(DESTDIR)$${TMPFILESDIR}/munge.conf" - : -- $(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfdir)" -- $(INSTALL) -m 0700 -d "$(DESTDIR)$(sysconfdir)/munge" -+ $(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfexampledir)" -+ $(INSTALL) -m 0700 -d "$(DESTDIR)$(sysconfexampledir)/munge" - $(INSTALL) -m 0755 -d "$(DESTDIR)$(localstatedir)" - $(INSTALL) -m 0755 -d "$(DESTDIR)$(localstatedir)/lib" - $(INSTALL) -m 0711 -d "$(DESTDIR)$(localstatedir)/lib/munge" diff --git a/openmpi/DESCR b/openmpi/DESCR deleted file mode 100644 index df10ebe8f5..0000000000 --- a/openmpi/DESCR +++ /dev/null @@ -1,28 +0,0 @@ -The Open MPI Project is an open source MPI-2 implementation -that is developed and maintained by a consortium of academic, -research, and industry partners. Open MPI is therefore able to -combine the expertise, technologies, and resources from all -across the High Performance Computing community in order to -build the best MPI library available. Open MPI offers advantages -for system and software vendors, application developers and -computer science researchers. - -Features implemented or in short-term development for Open MPI -include: - - - Full MPI-2 standards conformance - - Thread safety and concurrency - - Dynamic process spawning - - Network and process fault tolerance - - Support network heterogeneity - - Single library supports all networks - - Run-time instrumentation - - Many job schedulers supported - - Many OS's supported (32 and 64 bit) - - Production quality software - - High performance on all platforms - - Portable and maintainable - - Tunable by installers and end-users - - Component-based design, documented APIs - - Active, responsive mailing list - - Open source license based on the BSD license diff --git a/openmpi/Makefile b/openmpi/Makefile deleted file mode 100644 index 563bda1b96..0000000000 --- a/openmpi/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -# $NetBSD: Makefile,v 1.73 2013/11/05 22:34:15 asau Exp $ - -DISTNAME= openmpi-1.7.4a1r29587 -PKGNAME= openmpi-1.7.3.99.29587 -CATEGORIES= parallel -MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.7/downloads/ \ - http://www.open-mpi.org/nightly/v1.7/ -EXTRACT_SUFX= .tar.bz2 -LICENSE= modified-bsd - -MAINTAINER= asau@inbox.ru -HOMEPAGE= http://www.open-mpi.org/ -COMMENT= Open source MPI-2 implementation - -MPI_SUBPREFIX= openmpi -MPI_PREFIX= $(LOCALBASE)/$(MPI_SUBPREFIX) -#MPI_PREFIX= $(LOCALBASE) - -.include "../../mk/bsd.prefs.mk" - -GNU_CONFIGURE= yes -.if ${OPSYS} == Darwin || ${OPSYS} == Linux -USE_LANGUAGES= c c++ fortran -# Fix for: -# The Open MPI wrapper compiler was unable to find the specified compiler -# f77 in your PATH. -FC= gfortran -.else -USE_LANGUAGES= c c++ fortran77 -.endif -USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool \ - ${WRKSRC}/ompi/contrib/vt/vt/extlib/otf/libtool \ - ${WRKSRC}/ompi/contrib/vt/vt/libtool \ - ${WRKSRC}/ompi/mca/io/romio/romio/libtool -SHLIBTOOL_OVERRIDE= ${WRKSRC}/config/libtool.m4 \ - ${WRKSRC}/opal/libltdl/m4/libtool.m4 - -GNU_CONFIGURE_PREFIX= $(MPI_PREFIX) -.if ${OPSYS} != Darwin && ${OPSYS} != Linux -CONFIGURE_ARGS+= --disable-mpi-fortran -# http://www.open-mpi.org/community/lists/users/2013/04/21752.php -# Still doesn't compile on RHEL 5, but for different reason -# CONFIGURE_ARGS+= --disable-openib-connectx-xrc -.endif -CONFIGURE_ARGS+= --without-sge -CONFIGURE_ARGS+= --without-slurm -CONFIGURE_ARGS+= --enable-contrib-no-build=vt # in separate package -CONFIGURE_ARGS+= --with-libltdl=external # use our libltdl -CONFIGURE_ARGS+= --with-hwloc=$(BUILDLINK_PREFIX.hwloc:Q) #external -CONFIGURE_ARGS+= --with-wrapper-ldflags="-L$(MPI_PREFIX)/lib $(COMPILER_RPATH_FLAG)$(MPI_PREFIX)/lib" -CONFIGURE_ENV+= ompi_cv_f77_have_INTEGERp8=no # no "INTEGER*8"?? -CONFIGURE_ARGS+= OPAL_HAVE_LTDL_ADVISE=0 -# Suppress regeneration: -CONFIGURE_ENV+= ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: - -# Prevent detection of OpenMP support in order to make PLIST consistent: -BUILDLINK_TRANSFORM= rm:-fopenmp - -BUILDLINK_PASSTHRU_RPATHDIRS+= ${MPI_PREFIX}/lib - -USE_TOOLS+= perl:run -REPLACE_PERL+= ompi/tools/wrappers/mpijavac.pl.in - -.include "options.mk" - -TEST_TARGET= check - -# Debug -#BUILD_MAKE_FLAGS= V=1 - -## Just in case you'll need it... -# USE_TOOLS+= aclocal autoconf automake bash perl -# REPLACE_PERL= autogen.sh - -# pre-configure: replace-interpreter -# cd $(WRKSRC) && $(PERL5) autogen.sh - -post-install: - ${MKDIR} ${DESTDIR}${MPI_PREFIX}/share/examples/openmpi - ${SED} -e "s|%%MPI_PREFIX%%|${MPI_PREFIX}|g" \ - files/shrc > ${DESTDIR}${MPI_PREFIX}/share/examples/openmpi/shrc - ${SED} -e "s|%%MPI_PREFIX%%|${MPI_PREFIX}|g" \ - files/cshrc > ${DESTDIR}${MPI_PREFIX}/share/examples/openmpi/cshrc - -LIBLTDL_CONVENIENCE_SUBDIR= opal/libltdl -.include "../../devel/libltdl/convenience.mk" # for "test" target to work -.include "../../devel/libltdl/buildlink3.mk" -.include "../../parallel/hwloc/buildlink3.mk" -# Build failed with "cannot find libxml2" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/openmpi/PLIST b/openmpi/PLIST deleted file mode 100644 index b20befe75e..0000000000 --- a/openmpi/PLIST +++ /dev/null @@ -1,649 +0,0 @@ -@comment $NetBSD: PLIST,v 1.26 2013/11/05 22:34:15 asau Exp $ -openmpi/bin/mpic++ -openmpi/bin/mpicc -openmpi/bin/mpicxx -openmpi/bin/mpiexec -openmpi/bin/mpif77 -openmpi/bin/mpif90 -openmpi/bin/mpifort -openmpi/bin/mpirun -openmpi/bin/ompi-clean -openmpi/bin/ompi-ps -openmpi/bin/ompi-server -openmpi/bin/ompi-top -openmpi/bin/ompi_info -openmpi/bin/opal_wrapper -openmpi/bin/orte-clean -openmpi/bin/orte-info -openmpi/bin/orte-ps -openmpi/bin/orte-server -openmpi/bin/orte-top -openmpi/bin/ortec++ -openmpi/bin/ortecc -openmpi/bin/orted -openmpi/bin/orterun -openmpi/include/event2/buffer.h -openmpi/include/event2/buffer_compat.h -openmpi/include/event2/bufferevent.h -openmpi/include/event2/bufferevent_compat.h -openmpi/include/event2/bufferevent_ssl.h -openmpi/include/event2/bufferevent_struct.h -openmpi/include/event2/dns.h -openmpi/include/event2/dns_compat.h -openmpi/include/event2/dns_struct.h -openmpi/include/event2/event-config.h -openmpi/include/event2/event.h -openmpi/include/event2/event_compat.h -openmpi/include/event2/event_struct.h -openmpi/include/event2/http.h -openmpi/include/event2/http_compat.h -openmpi/include/event2/http_struct.h -openmpi/include/event2/keyvalq_struct.h -openmpi/include/event2/listener.h -openmpi/include/event2/rpc.h -openmpi/include/event2/rpc_compat.h -openmpi/include/event2/rpc_struct.h -openmpi/include/event2/tag.h -openmpi/include/event2/tag_compat.h -openmpi/include/event2/thread.h -openmpi/include/event2/util.h -openmpi/include/mpi-ext.h -openmpi/include/mpi.h -openmpi/include/mpi_portable_platform.h -openmpi/include/mpif-ext.h -openmpi/include/openmpi/ompi/mpi/cxx/comm.h -openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/constants.h -openmpi/include/openmpi/ompi/mpi/cxx/datatype.h -openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h -openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/exception.h -openmpi/include/openmpi/ompi/mpi/cxx/file.h -openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/functions.h -openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/group.h -openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/info.h -openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h -openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h -openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h -openmpi/include/openmpi/ompi/mpi/cxx/op.h -openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/request.h -openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/status.h -openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/topology.h -openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h -openmpi/include/openmpi/ompi/mpi/cxx/win.h -openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h -openmpi/lib/libmca_common_sm.la -openmpi/lib/libmpi.la -openmpi/lib/libmpi_cxx.la -openmpi/lib/libompitrace.la -openmpi/lib/libopen-pal.la -openmpi/lib/libopen-rte.la -openmpi/lib/openmpi/libompi_dbg_msgq.la -openmpi/lib/openmpi/mca_allocator_basic.la -openmpi/lib/openmpi/mca_allocator_bucket.la -openmpi/lib/openmpi/mca_bcol_basesmuma.la -openmpi/lib/openmpi/mca_bcol_ptpcoll.la -openmpi/lib/openmpi/mca_bml_r2.la -openmpi/lib/openmpi/mca_btl_self.la -openmpi/lib/openmpi/mca_btl_sm.la -openmpi/lib/openmpi/mca_btl_tcp.la -openmpi/lib/openmpi/mca_coll_basic.la -openmpi/lib/openmpi/mca_coll_hierarch.la -openmpi/lib/openmpi/mca_coll_inter.la -openmpi/lib/openmpi/mca_coll_libnbc.la -openmpi/lib/openmpi/mca_coll_ml.la -openmpi/lib/openmpi/mca_coll_self.la -openmpi/lib/openmpi/mca_coll_sm.la -openmpi/lib/openmpi/mca_coll_tuned.la -openmpi/lib/openmpi/mca_compress_bzip.la -openmpi/lib/openmpi/mca_compress_gzip.la -openmpi/lib/openmpi/mca_crs_none.la -openmpi/lib/openmpi/mca_db_hash.la -openmpi/lib/openmpi/mca_db_print.la -openmpi/lib/openmpi/mca_dfs_app.la -openmpi/lib/openmpi/mca_dfs_orted.la -openmpi/lib/openmpi/mca_dfs_test.la -openmpi/lib/openmpi/mca_dpm_orte.la -openmpi/lib/openmpi/mca_errmgr_default_app.la -openmpi/lib/openmpi/mca_errmgr_default_hnp.la -openmpi/lib/openmpi/mca_errmgr_default_orted.la -openmpi/lib/openmpi/mca_ess_env.la -openmpi/lib/openmpi/mca_ess_hnp.la -openmpi/lib/openmpi/mca_ess_singleton.la -openmpi/lib/openmpi/mca_ess_tool.la -openmpi/lib/openmpi/mca_fbtl_posix.la -openmpi/lib/openmpi/mca_fcoll_dynamic.la -openmpi/lib/openmpi/mca_fcoll_individual.la -openmpi/lib/openmpi/mca_fcoll_static.la -openmpi/lib/openmpi/mca_fcoll_two_phase.la -openmpi/lib/openmpi/mca_fcoll_ylib.la -openmpi/lib/openmpi/mca_filem_raw.la -openmpi/lib/openmpi/mca_fs_ufs.la -openmpi/lib/openmpi/mca_grpcomm_bad.la -openmpi/lib/openmpi/mca_io_ompio.la -openmpi/lib/openmpi/mca_io_romio.la -openmpi/lib/openmpi/mca_iof_hnp.la -openmpi/lib/openmpi/mca_iof_mr_hnp.la -openmpi/lib/openmpi/mca_iof_mr_orted.la -openmpi/lib/openmpi/mca_iof_orted.la -openmpi/lib/openmpi/mca_iof_tool.la -openmpi/lib/openmpi/mca_mpool_grdma.la -openmpi/lib/openmpi/mca_mpool_sm.la -openmpi/lib/openmpi/mca_odls_default.la -openmpi/lib/openmpi/mca_oob_tcp.la -openmpi/lib/openmpi/mca_osc_pt2pt.la -openmpi/lib/openmpi/mca_osc_rdma.la -openmpi/lib/openmpi/mca_plm_rsh.la -openmpi/lib/openmpi/mca_pml_bfo.la -openmpi/lib/openmpi/mca_pml_cm.la -openmpi/lib/openmpi/mca_pml_ob1.la -openmpi/lib/openmpi/mca_pstat_test.la -openmpi/lib/openmpi/mca_pubsub_orte.la -openmpi/lib/openmpi/mca_ras_simulator.la -openmpi/lib/openmpi/mca_rcache_vma.la -openmpi/lib/openmpi/mca_rmaps_lama.la -openmpi/lib/openmpi/mca_rmaps_mindist.la -openmpi/lib/openmpi/mca_rmaps_ppr.la -openmpi/lib/openmpi/mca_rmaps_rank_file.la -openmpi/lib/openmpi/mca_rmaps_resilient.la -openmpi/lib/openmpi/mca_rmaps_round_robin.la -openmpi/lib/openmpi/mca_rmaps_seq.la -openmpi/lib/openmpi/mca_rmaps_staged.la -openmpi/lib/openmpi/mca_rml_oob.la -openmpi/lib/openmpi/mca_routed_binomial.la -openmpi/lib/openmpi/mca_routed_debruijn.la -openmpi/lib/openmpi/mca_routed_direct.la -openmpi/lib/openmpi/mca_routed_radix.la -openmpi/lib/openmpi/mca_sbgp_basesmsocket.la -openmpi/lib/openmpi/mca_sbgp_basesmuma.la -openmpi/lib/openmpi/mca_sbgp_p2p.la -openmpi/lib/openmpi/mca_sharedfp_dummy.la -openmpi/lib/openmpi/mca_shmem_mmap.la -openmpi/lib/openmpi/mca_shmem_sysv.la -openmpi/lib/openmpi/mca_state_app.la -openmpi/lib/openmpi/mca_state_hnp.la -openmpi/lib/openmpi/mca_state_novm.la -openmpi/lib/openmpi/mca_state_orted.la -openmpi/lib/openmpi/mca_state_staged_hnp.la -openmpi/lib/openmpi/mca_state_staged_orted.la -openmpi/lib/openmpi/mca_topo_basic.la -openmpi/lib/openmpi/mca_vprotocol_pessimist.la -openmpi/lib/pkgconfig/ompi-c.pc -openmpi/lib/pkgconfig/ompi-cxx.pc -openmpi/lib/pkgconfig/ompi-f77.pc -openmpi/lib/pkgconfig/ompi-f90.pc -openmpi/lib/pkgconfig/ompi-fort.pc -openmpi/lib/pkgconfig/ompi.pc -openmpi/lib/pkgconfig/orte.pc -openmpi/man/man1/mpic++.1 -openmpi/man/man1/mpicc.1 -openmpi/man/man1/mpicxx.1 -openmpi/man/man1/mpiexec.1 -openmpi/man/man1/mpif77.1 -openmpi/man/man1/mpif90.1 -openmpi/man/man1/mpifort.1 -openmpi/man/man1/mpirun.1 -openmpi/man/man1/ompi-clean.1 -openmpi/man/man1/ompi-ps.1 -openmpi/man/man1/ompi-server.1 -openmpi/man/man1/ompi-top.1 -openmpi/man/man1/ompi_info.1 -openmpi/man/man1/opal_wrapper.1 -openmpi/man/man1/orte-clean.1 -openmpi/man/man1/orte-info.1 -openmpi/man/man1/orte-ps.1 -openmpi/man/man1/orte-server.1 -openmpi/man/man1/orte-top.1 -openmpi/man/man1/orted.1 -openmpi/man/man1/orterun.1 -openmpi/man/man3/MPI.3 -openmpi/man/man3/MPI_Abort.3 -openmpi/man/man3/MPI_Accumulate.3 -openmpi/man/man3/MPI_Add_error_class.3 -openmpi/man/man3/MPI_Add_error_code.3 -openmpi/man/man3/MPI_Add_error_string.3 -openmpi/man/man3/MPI_Address.3 -openmpi/man/man3/MPI_Allgather.3 -openmpi/man/man3/MPI_Allgatherv.3 -openmpi/man/man3/MPI_Alloc_mem.3 -openmpi/man/man3/MPI_Allreduce.3 -openmpi/man/man3/MPI_Alltoall.3 -openmpi/man/man3/MPI_Alltoallv.3 -openmpi/man/man3/MPI_Alltoallw.3 -openmpi/man/man3/MPI_Attr_delete.3 -openmpi/man/man3/MPI_Attr_get.3 -openmpi/man/man3/MPI_Attr_put.3 -openmpi/man/man3/MPI_Barrier.3 -openmpi/man/man3/MPI_Bcast.3 -openmpi/man/man3/MPI_Bsend.3 -openmpi/man/man3/MPI_Bsend_init.3 -openmpi/man/man3/MPI_Buffer_attach.3 -openmpi/man/man3/MPI_Buffer_detach.3 -openmpi/man/man3/MPI_Cancel.3 -openmpi/man/man3/MPI_Cart_coords.3 -openmpi/man/man3/MPI_Cart_create.3 -openmpi/man/man3/MPI_Cart_get.3 -openmpi/man/man3/MPI_Cart_map.3 -openmpi/man/man3/MPI_Cart_rank.3 -openmpi/man/man3/MPI_Cart_shift.3 -openmpi/man/man3/MPI_Cart_sub.3 -openmpi/man/man3/MPI_Cartdim_get.3 -openmpi/man/man3/MPI_Close_port.3 -openmpi/man/man3/MPI_Comm_accept.3 -openmpi/man/man3/MPI_Comm_c2f.3 -openmpi/man/man3/MPI_Comm_call_errhandler.3 -openmpi/man/man3/MPI_Comm_compare.3 -openmpi/man/man3/MPI_Comm_connect.3 -openmpi/man/man3/MPI_Comm_create.3 -openmpi/man/man3/MPI_Comm_create_errhandler.3 -openmpi/man/man3/MPI_Comm_create_group.3 -openmpi/man/man3/MPI_Comm_create_keyval.3 -openmpi/man/man3/MPI_Comm_delete_attr.3 -openmpi/man/man3/MPI_Comm_disconnect.3 -openmpi/man/man3/MPI_Comm_dup.3 -openmpi/man/man3/MPI_Comm_dup_with_info.3 -openmpi/man/man3/MPI_Comm_f2c.3 -openmpi/man/man3/MPI_Comm_free.3 -openmpi/man/man3/MPI_Comm_free_keyval.3 -openmpi/man/man3/MPI_Comm_get_attr.3 -openmpi/man/man3/MPI_Comm_get_errhandler.3 -openmpi/man/man3/MPI_Comm_get_name.3 -openmpi/man/man3/MPI_Comm_get_parent.3 -openmpi/man/man3/MPI_Comm_group.3 -openmpi/man/man3/MPI_Comm_idup.3 -openmpi/man/man3/MPI_Comm_join.3 -openmpi/man/man3/MPI_Comm_rank.3 -openmpi/man/man3/MPI_Comm_remote_group.3 -openmpi/man/man3/MPI_Comm_remote_size.3 -openmpi/man/man3/MPI_Comm_set_attr.3 -openmpi/man/man3/MPI_Comm_set_errhandler.3 -openmpi/man/man3/MPI_Comm_set_name.3 -openmpi/man/man3/MPI_Comm_size.3 -openmpi/man/man3/MPI_Comm_spawn.3 -openmpi/man/man3/MPI_Comm_spawn_multiple.3 -openmpi/man/man3/MPI_Comm_split.3 -openmpi/man/man3/MPI_Comm_split_type.3 -openmpi/man/man3/MPI_Comm_test_inter.3 -openmpi/man/man3/MPI_Dims_create.3 -openmpi/man/man3/MPI_Dist_graph_create.3 -openmpi/man/man3/MPI_Dist_graph_create_adjacent.3 -openmpi/man/man3/MPI_Dist_graph_neighbors.3 -openmpi/man/man3/MPI_Dist_graph_neighbors_count.3 -openmpi/man/man3/MPI_Errhandler_create.3 -openmpi/man/man3/MPI_Errhandler_free.3 -openmpi/man/man3/MPI_Errhandler_get.3 -openmpi/man/man3/MPI_Errhandler_set.3 -openmpi/man/man3/MPI_Error_class.3 -openmpi/man/man3/MPI_Error_string.3 -openmpi/man/man3/MPI_Exscan.3 -openmpi/man/man3/MPI_File_c2f.3 -openmpi/man/man3/MPI_File_call_errhandler.3 -openmpi/man/man3/MPI_File_close.3 -openmpi/man/man3/MPI_File_create_errhandler.3 -openmpi/man/man3/MPI_File_delete.3 -openmpi/man/man3/MPI_File_f2c.3 -openmpi/man/man3/MPI_File_get_amode.3 -openmpi/man/man3/MPI_File_get_atomicity.3 -openmpi/man/man3/MPI_File_get_byte_offset.3 -openmpi/man/man3/MPI_File_get_errhandler.3 -openmpi/man/man3/MPI_File_get_group.3 -openmpi/man/man3/MPI_File_get_info.3 -openmpi/man/man3/MPI_File_get_position.3 -openmpi/man/man3/MPI_File_get_position_shared.3 -openmpi/man/man3/MPI_File_get_size.3 -openmpi/man/man3/MPI_File_get_type_extent.3 -openmpi/man/man3/MPI_File_get_view.3 -openmpi/man/man3/MPI_File_iread.3 -openmpi/man/man3/MPI_File_iread_at.3 -openmpi/man/man3/MPI_File_iread_shared.3 -openmpi/man/man3/MPI_File_iwrite.3 -openmpi/man/man3/MPI_File_iwrite_at.3 -openmpi/man/man3/MPI_File_iwrite_shared.3 -openmpi/man/man3/MPI_File_open.3 -openmpi/man/man3/MPI_File_preallocate.3 -openmpi/man/man3/MPI_File_read.3 -openmpi/man/man3/MPI_File_read_all.3 -openmpi/man/man3/MPI_File_read_all_begin.3 -openmpi/man/man3/MPI_File_read_all_end.3 -openmpi/man/man3/MPI_File_read_at.3 -openmpi/man/man3/MPI_File_read_at_all.3 -openmpi/man/man3/MPI_File_read_at_all_begin.3 -openmpi/man/man3/MPI_File_read_at_all_end.3 -openmpi/man/man3/MPI_File_read_ordered.3 -openmpi/man/man3/MPI_File_read_ordered_begin.3 -openmpi/man/man3/MPI_File_read_ordered_end.3 -openmpi/man/man3/MPI_File_read_shared.3 -openmpi/man/man3/MPI_File_seek.3 -openmpi/man/man3/MPI_File_seek_shared.3 -openmpi/man/man3/MPI_File_set_atomicity.3 -openmpi/man/man3/MPI_File_set_errhandler.3 -openmpi/man/man3/MPI_File_set_info.3 -openmpi/man/man3/MPI_File_set_size.3 -openmpi/man/man3/MPI_File_set_view.3 -openmpi/man/man3/MPI_File_sync.3 -openmpi/man/man3/MPI_File_write.3 -openmpi/man/man3/MPI_File_write_all.3 -openmpi/man/man3/MPI_File_write_all_begin.3 -openmpi/man/man3/MPI_File_write_all_end.3 -openmpi/man/man3/MPI_File_write_at.3 -openmpi/man/man3/MPI_File_write_at_all.3 -openmpi/man/man3/MPI_File_write_at_all_begin.3 -openmpi/man/man3/MPI_File_write_at_all_end.3 -openmpi/man/man3/MPI_File_write_ordered.3 -openmpi/man/man3/MPI_File_write_ordered_begin.3 -openmpi/man/man3/MPI_File_write_ordered_end.3 -openmpi/man/man3/MPI_File_write_shared.3 -openmpi/man/man3/MPI_Finalize.3 -openmpi/man/man3/MPI_Finalized.3 -openmpi/man/man3/MPI_Free_mem.3 -openmpi/man/man3/MPI_Gather.3 -openmpi/man/man3/MPI_Gatherv.3 -openmpi/man/man3/MPI_Get.3 -openmpi/man/man3/MPI_Get_address.3 -openmpi/man/man3/MPI_Get_count.3 -openmpi/man/man3/MPI_Get_elements.3 -openmpi/man/man3/MPI_Get_elements_x.3 -openmpi/man/man3/MPI_Get_library_version.3 -openmpi/man/man3/MPI_Get_processor_name.3 -openmpi/man/man3/MPI_Get_version.3 -openmpi/man/man3/MPI_Graph_create.3 -openmpi/man/man3/MPI_Graph_get.3 -openmpi/man/man3/MPI_Graph_map.3 -openmpi/man/man3/MPI_Graph_neighbors.3 -openmpi/man/man3/MPI_Graph_neighbors_count.3 -openmpi/man/man3/MPI_Graphdims_get.3 -openmpi/man/man3/MPI_Grequest_complete.3 -openmpi/man/man3/MPI_Grequest_start.3 -openmpi/man/man3/MPI_Group_c2f.3 -openmpi/man/man3/MPI_Group_compare.3 -openmpi/man/man3/MPI_Group_difference.3 -openmpi/man/man3/MPI_Group_excl.3 -openmpi/man/man3/MPI_Group_f2c.3 -openmpi/man/man3/MPI_Group_free.3 -openmpi/man/man3/MPI_Group_incl.3 -openmpi/man/man3/MPI_Group_intersection.3 -openmpi/man/man3/MPI_Group_range_excl.3 -openmpi/man/man3/MPI_Group_range_incl.3 -openmpi/man/man3/MPI_Group_rank.3 -openmpi/man/man3/MPI_Group_size.3 -openmpi/man/man3/MPI_Group_translate_ranks.3 -openmpi/man/man3/MPI_Group_union.3 -openmpi/man/man3/MPI_Iallgather.3 -openmpi/man/man3/MPI_Iallgatherv.3 -openmpi/man/man3/MPI_Iallreduce.3 -openmpi/man/man3/MPI_Ialltoall.3 -openmpi/man/man3/MPI_Ialltoallv.3 -openmpi/man/man3/MPI_Ialltoallw.3 -openmpi/man/man3/MPI_Ibcast.3 -openmpi/man/man3/MPI_Ibsend.3 -openmpi/man/man3/MPI_Iexscan.3 -openmpi/man/man3/MPI_Igather.3 -openmpi/man/man3/MPI_Igatherv.3 -openmpi/man/man3/MPI_Improbe.3 -openmpi/man/man3/MPI_Imrecv.3 -openmpi/man/man3/MPI_Ineighbor_allgather.3 -openmpi/man/man3/MPI_Ineighbor_allgatherv.3 -openmpi/man/man3/MPI_Ineighbor_alltoall.3 -openmpi/man/man3/MPI_Ineighbor_alltoallv.3 -openmpi/man/man3/MPI_Ineighbor_alltoallw.3 -openmpi/man/man3/MPI_Info_c2f.3 -openmpi/man/man3/MPI_Info_create.3 -openmpi/man/man3/MPI_Info_delete.3 -openmpi/man/man3/MPI_Info_dup.3 -openmpi/man/man3/MPI_Info_env.3 -openmpi/man/man3/MPI_Info_f2c.3 -openmpi/man/man3/MPI_Info_free.3 -openmpi/man/man3/MPI_Info_get.3 -openmpi/man/man3/MPI_Info_get_nkeys.3 -openmpi/man/man3/MPI_Info_get_nthkey.3 -openmpi/man/man3/MPI_Info_get_valuelen.3 -openmpi/man/man3/MPI_Info_set.3 -openmpi/man/man3/MPI_Init.3 -openmpi/man/man3/MPI_Init_thread.3 -openmpi/man/man3/MPI_Initialized.3 -openmpi/man/man3/MPI_Intercomm_create.3 -openmpi/man/man3/MPI_Intercomm_merge.3 -openmpi/man/man3/MPI_Iprobe.3 -openmpi/man/man3/MPI_Irecv.3 -openmpi/man/man3/MPI_Ireduce.3 -openmpi/man/man3/MPI_Ireduce_scatter.3 -openmpi/man/man3/MPI_Ireduce_scatter_block.3 -openmpi/man/man3/MPI_Irsend.3 -openmpi/man/man3/MPI_Is_thread_main.3 -openmpi/man/man3/MPI_Iscan.3 -openmpi/man/man3/MPI_Iscatter.3 -openmpi/man/man3/MPI_Iscatterv.3 -openmpi/man/man3/MPI_Isend.3 -openmpi/man/man3/MPI_Issend.3 -openmpi/man/man3/MPI_Keyval_create.3 -openmpi/man/man3/MPI_Keyval_free.3 -openmpi/man/man3/MPI_Lookup_name.3 -openmpi/man/man3/MPI_Mprobe.3 -openmpi/man/man3/MPI_Mrecv.3 -openmpi/man/man3/MPI_Neighbor_allgather.3 -openmpi/man/man3/MPI_Neighbor_allgatherv.3 -openmpi/man/man3/MPI_Neighbor_alltoall.3 -openmpi/man/man3/MPI_Neighbor_alltoallv.3 -openmpi/man/man3/MPI_Neighbor_alltoallw.3 -openmpi/man/man3/MPI_Op_c2f.3 -openmpi/man/man3/MPI_Op_create.3 -openmpi/man/man3/MPI_Op_f2c.3 -openmpi/man/man3/MPI_Op_free.3 -openmpi/man/man3/MPI_Open_port.3 -openmpi/man/man3/MPI_Pack.3 -openmpi/man/man3/MPI_Pack_external.3 -openmpi/man/man3/MPI_Pack_external_size.3 -openmpi/man/man3/MPI_Pack_size.3 -openmpi/man/man3/MPI_Pcontrol.3 -openmpi/man/man3/MPI_Probe.3 -openmpi/man/man3/MPI_Publish_name.3 -openmpi/man/man3/MPI_Put.3 -openmpi/man/man3/MPI_Query_thread.3 -openmpi/man/man3/MPI_Recv.3 -openmpi/man/man3/MPI_Recv_init.3 -openmpi/man/man3/MPI_Reduce.3 -openmpi/man/man3/MPI_Reduce_local.3 -openmpi/man/man3/MPI_Reduce_scatter.3 -openmpi/man/man3/MPI_Reduce_scatter_block.3 -openmpi/man/man3/MPI_Register_datarep.3 -openmpi/man/man3/MPI_Request_c2f.3 -openmpi/man/man3/MPI_Request_f2c.3 -openmpi/man/man3/MPI_Request_free.3 -openmpi/man/man3/MPI_Request_get_status.3 -openmpi/man/man3/MPI_Rsend.3 -openmpi/man/man3/MPI_Rsend_init.3 -openmpi/man/man3/MPI_Scan.3 -openmpi/man/man3/MPI_Scatter.3 -openmpi/man/man3/MPI_Scatterv.3 -openmpi/man/man3/MPI_Send.3 -openmpi/man/man3/MPI_Send_init.3 -openmpi/man/man3/MPI_Sendrecv.3 -openmpi/man/man3/MPI_Sendrecv_replace.3 -openmpi/man/man3/MPI_Sizeof.3 -openmpi/man/man3/MPI_Ssend.3 -openmpi/man/man3/MPI_Ssend_init.3 -openmpi/man/man3/MPI_Start.3 -openmpi/man/man3/MPI_Startall.3 -openmpi/man/man3/MPI_Status_c2f.3 -openmpi/man/man3/MPI_Status_f2c.3 -openmpi/man/man3/MPI_Status_set_cancelled.3 -openmpi/man/man3/MPI_Status_set_elements.3 -openmpi/man/man3/MPI_Status_set_elements_x.3 -openmpi/man/man3/MPI_Test.3 -openmpi/man/man3/MPI_Test_cancelled.3 -openmpi/man/man3/MPI_Testall.3 -openmpi/man/man3/MPI_Testany.3 -openmpi/man/man3/MPI_Testsome.3 -openmpi/man/man3/MPI_Topo_test.3 -openmpi/man/man3/MPI_Type_c2f.3 -openmpi/man/man3/MPI_Type_commit.3 -openmpi/man/man3/MPI_Type_contiguous.3 -openmpi/man/man3/MPI_Type_create_darray.3 -openmpi/man/man3/MPI_Type_create_f90_complex.3 -openmpi/man/man3/MPI_Type_create_f90_integer.3 -openmpi/man/man3/MPI_Type_create_f90_real.3 -openmpi/man/man3/MPI_Type_create_hindexed.3 -openmpi/man/man3/MPI_Type_create_hindexed_block.3 -openmpi/man/man3/MPI_Type_create_hvector.3 -openmpi/man/man3/MPI_Type_create_indexed_block.3 -openmpi/man/man3/MPI_Type_create_keyval.3 -openmpi/man/man3/MPI_Type_create_resized.3 -openmpi/man/man3/MPI_Type_create_struct.3 -openmpi/man/man3/MPI_Type_create_subarray.3 -openmpi/man/man3/MPI_Type_delete_attr.3 -openmpi/man/man3/MPI_Type_dup.3 -openmpi/man/man3/MPI_Type_extent.3 -openmpi/man/man3/MPI_Type_f2c.3 -openmpi/man/man3/MPI_Type_free.3 -openmpi/man/man3/MPI_Type_free_keyval.3 -openmpi/man/man3/MPI_Type_get_attr.3 -openmpi/man/man3/MPI_Type_get_contents.3 -openmpi/man/man3/MPI_Type_get_envelope.3 -openmpi/man/man3/MPI_Type_get_extent.3 -openmpi/man/man3/MPI_Type_get_extent_x.3 -openmpi/man/man3/MPI_Type_get_name.3 -openmpi/man/man3/MPI_Type_get_true_extent.3 -openmpi/man/man3/MPI_Type_get_true_extent_x.3 -openmpi/man/man3/MPI_Type_hindexed.3 -openmpi/man/man3/MPI_Type_hvector.3 -openmpi/man/man3/MPI_Type_indexed.3 -openmpi/man/man3/MPI_Type_lb.3 -openmpi/man/man3/MPI_Type_match_size.3 -openmpi/man/man3/MPI_Type_set_attr.3 -openmpi/man/man3/MPI_Type_set_name.3 -openmpi/man/man3/MPI_Type_size.3 -openmpi/man/man3/MPI_Type_size_x.3 -openmpi/man/man3/MPI_Type_struct.3 -openmpi/man/man3/MPI_Type_ub.3 -openmpi/man/man3/MPI_Type_vector.3 -openmpi/man/man3/MPI_Unpack.3 -openmpi/man/man3/MPI_Unpack_external.3 -openmpi/man/man3/MPI_Unpublish_name.3 -openmpi/man/man3/MPI_Wait.3 -openmpi/man/man3/MPI_Waitall.3 -openmpi/man/man3/MPI_Waitany.3 -openmpi/man/man3/MPI_Waitsome.3 -openmpi/man/man3/MPI_Win_c2f.3 -openmpi/man/man3/MPI_Win_call_errhandler.3 -openmpi/man/man3/MPI_Win_complete.3 -openmpi/man/man3/MPI_Win_create.3 -openmpi/man/man3/MPI_Win_create_errhandler.3 -openmpi/man/man3/MPI_Win_create_keyval.3 -openmpi/man/man3/MPI_Win_delete_attr.3 -openmpi/man/man3/MPI_Win_f2c.3 -openmpi/man/man3/MPI_Win_fence.3 -openmpi/man/man3/MPI_Win_free.3 -openmpi/man/man3/MPI_Win_free_keyval.3 -openmpi/man/man3/MPI_Win_get_attr.3 -openmpi/man/man3/MPI_Win_get_errhandler.3 -openmpi/man/man3/MPI_Win_get_group.3 -openmpi/man/man3/MPI_Win_get_name.3 -openmpi/man/man3/MPI_Win_lock.3 -openmpi/man/man3/MPI_Win_post.3 -openmpi/man/man3/MPI_Win_set_attr.3 -openmpi/man/man3/MPI_Win_set_errhandler.3 -openmpi/man/man3/MPI_Win_set_name.3 -openmpi/man/man3/MPI_Win_start.3 -openmpi/man/man3/MPI_Win_test.3 -openmpi/man/man3/MPI_Win_unlock.3 -openmpi/man/man3/MPI_Win_wait.3 -openmpi/man/man3/MPI_Wtick.3 -openmpi/man/man3/MPI_Wtime.3 -openmpi/man/man3/OpenMPI.3 -openmpi/man/man7/ompi_crcp.7 -openmpi/man/man7/opal_crs.7 -openmpi/man/man7/orte_filem.7 -openmpi/man/man7/orte_hosts.7 -openmpi/man/man7/orte_snapc.7 -openmpi/man/man7/orte_sstore.7 -openmpi/share/examples/openmpi/cshrc -openmpi/share/examples/openmpi/shrc -openmpi/share/openmpi/amca-param-sets/example.conf -openmpi/share/openmpi/examples/openmpi-default-hostfile -openmpi/share/openmpi/examples/openmpi-mca-params.conf -openmpi/share/openmpi/examples/openmpi-totalview.tcl -openmpi/share/openmpi/help-dash-host.txt -openmpi/share/openmpi/help-db-base.txt -openmpi/share/openmpi/help-errmgr-base.txt -openmpi/share/openmpi/help-ess-base.txt -openmpi/share/openmpi/help-hostfile.txt -openmpi/share/openmpi/help-mca-base.txt -openmpi/share/openmpi/help-mca-bml-r2.txt -openmpi/share/openmpi/help-mca-coll-base.txt -openmpi/share/openmpi/help-mca-op-base.txt -openmpi/share/openmpi/help-mca-var.txt -openmpi/share/openmpi/help-mpi-api.txt -openmpi/share/openmpi/help-mpi-btl-base.txt -openmpi/share/openmpi/help-mpi-btl-sm.txt -openmpi/share/openmpi/help-mpi-btl-tcp.txt -openmpi/share/openmpi/help-mpi-coll-sm.txt -openmpi/share/openmpi/help-mpi-common-sm.txt -openmpi/share/openmpi/help-mpi-errors.txt -openmpi/share/openmpi/help-mpi-pml-bfo.txt -openmpi/share/openmpi/help-mpi-pml-ob1.txt -openmpi/share/openmpi/help-mpi-runtime.txt -openmpi/share/openmpi/help-mpool-base.txt -openmpi/share/openmpi/help-ompi-crcp-base.txt -openmpi/share/openmpi/help-ompi-dpm-base.txt -openmpi/share/openmpi/help-ompi-dpm-orte.txt -openmpi/share/openmpi/help-ompi-pubsub-orte.txt -openmpi/share/openmpi/help-opal-compress-base.txt -openmpi/share/openmpi/help-opal-compress-bzip.txt -openmpi/share/openmpi/help-opal-compress-gzip.txt -openmpi/share/openmpi/help-opal-crs-base.txt -openmpi/share/openmpi/help-opal-crs-none.txt -openmpi/share/openmpi/help-opal-hwloc-base.txt -openmpi/share/openmpi/help-opal-runtime.txt -openmpi/share/openmpi/help-opal-shmem-mmap.txt -openmpi/share/openmpi/help-opal-shmem-sysv.txt -openmpi/share/openmpi/help-opal-util.txt -openmpi/share/openmpi/help-opal-wrapper.txt -openmpi/share/openmpi/help-opal_info.txt -openmpi/share/openmpi/help-orte-clean.txt -openmpi/share/openmpi/help-orte-filem-base.txt -openmpi/share/openmpi/help-orte-filem-raw.txt -openmpi/share/openmpi/help-orte-info.txt -openmpi/share/openmpi/help-orte-odls-base.txt -openmpi/share/openmpi/help-orte-odls-default.txt -openmpi/share/openmpi/help-orte-ps.txt -openmpi/share/openmpi/help-orte-rmaps-base.txt -openmpi/share/openmpi/help-orte-rmaps-lama.txt -openmpi/share/openmpi/help-orte-rmaps-md.txt -openmpi/share/openmpi/help-orte-rmaps-ppr.txt -openmpi/share/openmpi/help-orte-rmaps-resilient.txt -openmpi/share/openmpi/help-orte-rmaps-rr.txt -openmpi/share/openmpi/help-orte-rmaps-seq.txt -openmpi/share/openmpi/help-orte-runtime.txt -openmpi/share/openmpi/help-orte-server.txt -openmpi/share/openmpi/help-orte-snapc-base.txt -openmpi/share/openmpi/help-orte-sstore-base.txt -openmpi/share/openmpi/help-orte-top.txt -openmpi/share/openmpi/help-orted.txt -openmpi/share/openmpi/help-orterun.txt -openmpi/share/openmpi/help-plm-base.txt -openmpi/share/openmpi/help-plm-rsh.txt -openmpi/share/openmpi/help-ras-base.txt -openmpi/share/openmpi/help-ras-simulator.txt -openmpi/share/openmpi/help-regex.txt -openmpi/share/openmpi/help-rmaps_rank_file.txt -openmpi/share/openmpi/help-state-staged-hnp.txt -openmpi/share/openmpi/mca-coll-ml.config -openmpi/share/openmpi/mpic++-wrapper-data.txt -openmpi/share/openmpi/mpicc-wrapper-data.txt -openmpi/share/openmpi/mpicxx-wrapper-data.txt -openmpi/share/openmpi/mpif77-wrapper-data.txt -openmpi/share/openmpi/mpif90-wrapper-data.txt -openmpi/share/openmpi/mpifort-wrapper-data.txt -openmpi/share/openmpi/openmpi-valgrind.supp -openmpi/share/openmpi/ortec++-wrapper-data.txt -openmpi/share/openmpi/ortecc-wrapper-data.txt diff --git a/openmpi/PLIST.Darwin b/openmpi/PLIST.Darwin deleted file mode 100644 index 7b25949a88..0000000000 --- a/openmpi/PLIST.Darwin +++ /dev/null @@ -1,24 +0,0 @@ -include/mpif-config.h -include/mpif-constants.h -include/mpif-externals.h -include/mpif.h -include/mpif-handles.h -include/mpif-io-constants.h -include/mpif-io-handles.h -include/mpif-sentinels.h -lib/libmpi_mpifh.la -lib/libmpi_usempi.la -lib/mpi.mod -lib/openmpi/mca_pstat_${LOWER_OPSYS}.la -lib/openmpi/mca_ras_loadleveler.la -lib/openmpi/mca_shmem_posix.la -share/openmpi/doc/COPYRIGHT-ptmalloc2.txt -share/openmpi/help-opal-memory-${LOWER_OPSYS}.txt -share/openmpi/help-opal-shmem-posix.txt - -pkg_create: can't stat `/Users/bacon/Pkgsrc/pkgsrc-1/jb-wip/openmpi171/work/.destdir/Users/bacon/Pkgsrc/pkg-1/openmpi/lib/openmpi/mca_pstat_darwin.la' -pkg_create: can't stat `/Users/bacon/Pkgsrc/pkgsrc-1/jb-wip/openmpi171/work/.destdir/Users/bacon/Pkgsrc/pkg-1/openmpi/lib/openmpi/mca_ras_loadleveler.la' -pkg_create: can't stat `/Users/bacon/Pkgsrc/pkgsrc-1/jb-wip/openmpi171/work/.destdir/Users/bacon/Pkgsrc/pkg-1/openmpi/share/openmpi/doc/COPYRIGHT-ptmalloc2.txt' -pkg_create: can't stat `/Users/bacon/Pkgsrc/pkgsrc-1/jb-wip/openmpi171/work/.destdir/Users/bacon/Pkgsrc/pkg-1/openmpi/share/openmpi/help-opal-memory-darwin.txt' -pkg_create: lstat failed for file lib/openmpi/mca_pstat_darwin.la: No such file or directory - diff --git a/openmpi/PLIST.Linux b/openmpi/PLIST.Linux deleted file mode 100644 index 1c48d3c80e..0000000000 --- a/openmpi/PLIST.Linux +++ /dev/null @@ -1,23 +0,0 @@ -include/mpif-config.h -include/mpif-constants.h -include/mpif-externals.h -include/mpif.h -include/mpif-handles.h -include/mpif-io-constants.h -include/mpif-io-handles.h -include/mpif-sentinels.h -lib/libmpi_mpifh.la -lib/libmpi_usempi.la -lib/mpi.mod -lib/openmpi/mca_pstat_${LOWER_OPSYS}.la -lib/openmpi/mca_ras_loadleveler.la -lib/openmpi/mca_shmem_posix.la -share/openmpi/doc/COPYRIGHT-ptmalloc2.txt -share/openmpi/help-opal-memory-${LOWER_OPSYS}.txt -share/openmpi/help-opal-shmem-posix.txt -bin/mpiCC -bin/orteCC -man/man1/mpiCC.1 -man/man1/orteCC.1 -share/openmpi/mpiCC-wrapper-data.txt -share/openmpi/orteCC-wrapper-data.txt diff --git a/openmpi/PLIST.NetBSD b/openmpi/PLIST.NetBSD deleted file mode 100644 index 782a06f4a6..0000000000 --- a/openmpi/PLIST.NetBSD +++ /dev/null @@ -1,7 +0,0 @@ -bin/mpiCC -bin/orteCC -lib/openmpi/mca_pstat_test.la -man/man1/mpiCC.1 -man/man1/orteCC.1 -share/openmpi/mpiCC-wrapper-data.txt -share/openmpi/orteCC-wrapper-data.txt diff --git a/openmpi/TODO b/openmpi/TODO deleted file mode 100644 index 2d4cbebb76..0000000000 --- a/openmpi/TODO +++ /dev/null @@ -1,5 +0,0 @@ - -Regenerate PLIST.Darwin and update PLIST. - -Currently derived from PLIST.Linux by removing *CC*, -which cannot exist on case-insensitive filesystems. diff --git a/openmpi/buildlink3.mk b/openmpi/buildlink3.mk deleted file mode 100644 index 831cc6caa3..0000000000 --- a/openmpi/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.7 2013/06/21 17:07:52 outpaddling Exp $ - -BUILDLINK_TREE+= openmpi - -.if !defined(OPENMPI_BUILDLINK3_MK) -OPENMPI_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.openmpi+= openmpi>=1.5.1 -BUILDLINK_PKGSRCDIR.openmpi?= ../../wip/openmpi -BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/openmpi/lib -BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/openmpi/lib - -.include "../../parallel/hwloc/buildlink3.mk" -.endif # OPENMPI_BUILDLINK3_MK - -BUILDLINK_TREE+= -openmpi diff --git a/openmpi/distinfo b/openmpi/distinfo deleted file mode 100644 index 24ea1cd48e..0000000000 --- a/openmpi/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.54 2013/11/05 22:34:15 asau Exp $ - -SHA1 (openmpi-1.7.4a1r29587.tar.bz2) = 39da3b2642ea8076b910607359fef8ff141e99e4 -RMD160 (openmpi-1.7.4a1r29587.tar.bz2) = 2ca81838e9bef058e1fd51600d0db978b1f57ab9 -Size (openmpi-1.7.4a1r29587.tar.bz2) = 12734398 bytes -SHA1 (patch-ai) = 7625e594e1967f1d1a6667109d366d2b775bc1f8 -SHA1 (patch-aj) = 547fa12b56bd5fe4c4b58d3558d78773bd9dc5c2 -SHA1 (patch-ak) = f79e69fc02510de8da3834729f471799e175bb9c -SHA1 (patch-opal_mca_if_if.h) = 1a0abc9b771e57b305d144111f941f4e50d86b1a -SHA1 (patch-opal_util_if.h) = 74025521f25f5fb2a3ab818b5f48dd5e2a4fc3af diff --git a/openmpi/files/cshrc b/openmpi/files/cshrc deleted file mode 100644 index 5d4c0e6aa2..0000000000 --- a/openmpi/files/cshrc +++ /dev/null @@ -1,8 +0,0 @@ -# Generated by openmpi package -echo $PATH | fgrep -q %%MPI_PREFIX%% -if ( $status != 0 ) then - setenv MPI_PREFIX %%MPI_PREFIX%% - setenv PATH $MPI_PREFIX/bin:$PATH - setenv MANPATH $MPI_PREFIX/man:$MANPATH -endif - diff --git a/openmpi/files/module.in b/openmpi/files/module.in deleted file mode 100644 index a3428471b8..0000000000 --- a/openmpi/files/module.in +++ /dev/null @@ -1,21 +0,0 @@ -#%Module1.0##################################################################### -proc ModulesHelp { } { - puts stdout "\n\tAll software installed via the pkgsrc package management" - puts stdout "\tsystem. This module prepends the pkgsrc directories to" - puts stdout "\tthe following environment variable(s):" - puts stdout "\n\tPATH\n\tMANPATH\n\tLD_LIBRARY_PATH" -} - -module-whatis "All software installed via pkgsrc" - -set version 1 -set install_prefix /Users/bacon/Pkgsrc/pkg-1 - -prepend-path PATH $install_prefix/bin -prepend-path PATH $install_prefix/sbin -prepend-path MANPATH $install_prefix/man -prepend-path LD_LIBRARY_PATH $install_prefix/lib -setenv PKGSRC $install_prefix -setenv PKGSRC_INCLUDE $install_prefix/include -setenv PKGSRC_LIB $install_prefix/lib -setenv MPI_PREFIX $install_prefix diff --git a/openmpi/files/shrc b/openmpi/files/shrc deleted file mode 100644 index 3659c2fef9..0000000000 --- a/openmpi/files/shrc +++ /dev/null @@ -1,10 +0,0 @@ -# Generated by openmpi package -if ! echo $PATH | fgrep -q %%MPI_PREFIX%%; then - MPI_PREFIX=%%MPI_PREFIX%% - export MPI_PREFIX - PATH=$MPI_PREFIX/bin:$MPI_PREFIX/sbin:$PATH - export PATH - MANPATH=$MPI_PREFIX/man:$MANPATH - export MANPATH -fi - diff --git a/openmpi/options.mk b/openmpi/options.mk deleted file mode 100644 index 9a595da980..0000000000 --- a/openmpi/options.mk +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: options.mk,v 1.6 2013/01/25 03:22:09 asau Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.openmpi -PKG_SUPPORTED_OPTIONS= debug - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug -.endif diff --git a/openmpi/patches/patch-ai b/openmpi/patches/patch-ai deleted file mode 100644 index 0b0839b7b8..0000000000 --- a/openmpi/patches/patch-ai +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ai,v 1.6 2013/01/25 03:22:09 asau Exp $ - -Install configuration files into example directory. - ---- orte/etc/Makefile.in.orig 2013-01-15 14:44:04.000000000 +0100 -+++ orte/etc/Makefile.in 2013-01-24 12:33:12.118712233 +0100 -@@ -1320,6 +1320,7 @@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ -+sysconfexampledir = $(pkgdatadir)/examples - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ -@@ -1536,19 +1537,19 @@ - # details why the mkdir is in install-data-local. - - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir) -+ $(MKDIR_P) $(DESTDIR)$(sysconfexampledir) - @ p="$(orte_config_files)"; \ - for file in $$p; do \ -- if test -f $(DESTDIR)$(sysconfdir)/$$file; then \ -+ if test -f $(DESTDIR)$(sysconfexampledir)/$$file; then \ - echo "******************************* WARNING ************************************"; \ - echo "*** Not installing new $$file over existing file in:"; \ -- echo "*** $(DESTDIR)$(sysconfdir)/$$file"; \ -+ echo "*** $(DESTDIR)$(sysconfexampledir)/$$file"; \ - echo "******************************* WARNING ************************************"; \ - else \ - if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$file | sed -e 's|^.*/||'`"; \ -- echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \ -- $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \ -+ echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f"; \ -+ $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f; \ - fi; \ - done - -@@ -1559,11 +1560,11 @@ - uninstall-local: - @ p="$(orte_config_files)"; \ - for file in $$p; do \ -- if test -f "$(DESTDIR)$(sysconfdir)/$$file"; then \ -+ if test -f "$(DESTDIR)$(sysconfexampledir)/$$file"; then \ - if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \ -- if diff "$(DESTDIR)$(sysconfdir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \ -- echo "rm -f $(DESTDIR)$(sysconfdir)/$$file" ; \ -- rm -f "$(DESTDIR)$(sysconfdir)/$$file" ; \ -+ if diff "$(DESTDIR)$(sysconfexampledir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \ -+ echo "rm -f $(DESTDIR)$(sysconfexampledir)/$$file" ; \ -+ rm -f "$(DESTDIR)$(sysconfexampledir)/$$file" ; \ - fi ; \ - fi ; \ - done diff --git a/openmpi/patches/patch-aj b/openmpi/patches/patch-aj deleted file mode 100644 index 63c8b21b82..0000000000 --- a/openmpi/patches/patch-aj +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-aj,v 1.7 2013/01/25 03:22:09 asau Exp $ - -Install configuration files into example directory. - ---- opal/etc/Makefile.in.orig 2013-01-15 14:43:13.000000000 +0100 -+++ opal/etc/Makefile.in 2013-01-24 12:34:41.090709828 +0100 -@@ -51,6 +51,7 @@ - test $$am__dry = yes; \ - } - pkgdatadir = $(datadir)/@PACKAGE@ -+sysconfexampledir = $(pkgdatadir)/examples - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ -@@ -1535,24 +1536,24 @@ - # details why the mkdir is in install-data-local. - - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir) -+ $(MKDIR_P) $(DESTDIR)$(sysconfexampledir) - @ p="$(opal_config_files)"; \ - if test "$(opal_file_from_platform)" = "yes"; then \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/openmpi-mca-params.conf"; \ -- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/openmpi-mca-params.conf; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfexampledir)/openmpi-mca-params.conf"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfexampledir)/openmpi-mca-params.conf; \ - else \ - for file in $$p; do \ -- if test -f $(DESTDIR)$(sysconfdir)/openmpi-mca-params.conf; then \ -+ if test -f $(DESTDIR)$(sysconfexampledir)/openmpi-mca-params.conf; then \ - echo "******************************* WARNING ************************************"; \ - echo "*** Not installing new $$file over existing file in:"; \ -- echo "*** $(DESTDIR)$(sysconfdir)/$$file"; \ -+ echo "*** $(DESTDIR)$(sysconfexampledir)/$$file"; \ - echo "******************************* WARNING ************************************"; \ - else \ - if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$file | sed -e 's|^.*/||'`"; \ -- echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \ -- $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \ -+ echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f"; \ -+ $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f; \ - fi; \ - done \ - fi; -@@ -1564,11 +1565,11 @@ - uninstall-local: - @ p="$(opal_config_files)"; \ - for file in $$p; do \ -- if test -f "$(DESTDIR)$(sysconfdir)/$$file"; then \ -+ if test -f "$(DESTDIR)$(sysconfexampledir)/$$file"; then \ - if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \ -- if diff "$(DESTDIR)$(sysconfdir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \ -- echo "rm -f $(DESTDIR)$(sysconfdir)/$$file" ; \ -- rm -f "$(DESTDIR)$(sysconfdir)/$$file" ; \ -+ if diff "$(DESTDIR)$(sysconfexampledir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \ -+ echo "rm -f $(DESTDIR)$(sysconfexampledir)/$$file" ; \ -+ rm -f "$(DESTDIR)$(sysconfexampledir)/$$file" ; \ - fi ; \ - fi ; \ - done diff --git a/openmpi/patches/patch-ak b/openmpi/patches/patch-ak deleted file mode 100644 index 8c799e742c..0000000000 --- a/openmpi/patches/patch-ak +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ak,v 1.7 2013/01/25 03:22:09 asau Exp $ - -Install configuration files into example directory. - ---- ompi/etc/Makefile.in.orig 2013-01-15 14:41:30.000000000 +0100 -+++ ompi/etc/Makefile.in 2013-01-24 12:36:01.150707935 +0100 -@@ -51,6 +51,7 @@ - test $$am__dry = yes; \ - } - pkgdatadir = $(datadir)/@PACKAGE@ -+sysconfexampledir = $(pkgdatadir)/examples - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ -@@ -1536,19 +1537,19 @@ - # details why the mkdir is in install-data-local. - - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir) -+ $(MKDIR_P) $(DESTDIR)$(sysconfexampledir) - @ p="$(ompi_config_files)"; \ - for file in $$p; do \ -- if test -f $(DESTDIR)$(sysconfdir)/$$file; then \ -+ if test -f $(DESTDIR)$(sysconfexampledir)/$$file; then \ - echo "******************************* WARNING ************************************"; \ - echo "*** Not installing new $$file over existing file in:"; \ -- echo "*** $(DESTDIR)$(sysconfdir)/$$file"; \ -+ echo "*** $(DESTDIR)$(sysconfexampledir)/$$file"; \ - echo "******************************* WARNING ************************************"; \ - else \ - if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$file | sed -e 's|^.*/||'`"; \ -- echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \ -- $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \ -+ echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f"; \ -+ $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f; \ - fi; \ - done - -@@ -1559,11 +1560,11 @@ - uninstall-local: - @ p="$(ompi_config_files)"; \ - for file in $$p; do \ -- if test -f "$(DESTDIR)$(sysconfdir)/$$file"; then \ -+ if test -f "$(DESTDIR)$(sysconfexampledir)/$$file"; then \ - if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \ -- if diff "$(DESTDIR)$(sysconfdir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \ -- echo "rm -f $(DESTDIR)$(sysconfdir)/$$file" ; \ -- rm -f "$(DESTDIR)$(sysconfdir)/$$file" ; \ -+ if diff "$(DESTDIR)$(sysconfexampledir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \ -+ echo "rm -f $(DESTDIR)$(sysconfexampledir)/$$file" ; \ -+ rm -f "$(DESTDIR)$(sysconfexampledir)/$$file" ; \ - fi ; \ - fi ; \ - done diff --git a/openmpi/patches/patch-opal_mca_if_if.h b/openmpi/patches/patch-opal_mca_if_if.h deleted file mode 100644 index 3d78dd6f43..0000000000 --- a/openmpi/patches/patch-opal_mca_if_if.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-opal_mca_if_if.h,v 1.1 2013/11/05 22:34:15 asau Exp $ - ---- opal/mca/if/if.h.orig 2013-11-03 20:33:11.000000000 +0000 -+++ opal/mca/if/if.h -@@ -82,6 +82,9 @@ BEGIN_C_DECLS - #define DEFAULT_NUMBER_INTERFACES 10 - #define MAX_IFCONF_SIZE 10 * 1024 * 1024 - -+#ifdef if_mtu -+#undef if_mtu -+#endif - - typedef struct opal_if_t { - opal_list_item_t super; diff --git a/openmpi/patches/patch-opal_util_if.h b/openmpi/patches/patch-opal_util_if.h deleted file mode 100644 index c4d7e6d971..0000000000 --- a/openmpi/patches/patch-opal_util_if.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-opal_util_if.h,v 1.1 2013/11/05 22:34:16 asau Exp $ - ---- opal/util/if.h.orig 2013-11-03 20:33:13.000000000 +0000 -+++ opal/util/if.h -@@ -179,7 +179,7 @@ OPAL_DECLSPEC int opal_ifindextomac(int - * @param if_index (IN) Interface index - * @param if_mtu (OUT) Interface's MTU - */ --OPAL_DECLSPEC int opal_ifindextomtu(int if_index, int *if_mtu); -+OPAL_DECLSPEC int opal_ifindextomtu(int if_index, int *ompi_if_mtu); - - /** - * Lookup an interface by index and return its flags. diff --git a/openmw/Makefile b/openmw/Makefile index ac062e85bc..c8a714f2d4 100644 --- a/openmw/Makefile +++ b/openmw/Makefile @@ -15,7 +15,7 @@ USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config DEPENDS+= bullet>=2.83:../../wip/bullet -DEPENDS+= osg>=3.3.4:../../wip/osg +DEPENDS+= osg>=3.3.4:../../graphics/osg .include "options.mk" .include "../../archivers/unshield/buildlink3.mk" diff --git a/opensc/DESCR b/opensc/DESCR deleted file mode 100644 index d110dd2cbf..0000000000 --- a/opensc/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -OpenSC provides a set of libraries and utilities to access smart cards. -Its main focus is on cards that support cryptographic operations, and -facilitate their use in security applications such as mail encryption, -authentication, and digital signature. OpenSC implements the PKCS#11 API -so applications supporting this API such as Mozilla Firefox and Thunderbird -can use it. OpenSC implements the PKCS#15 standard and aims to be compatible -with every software that does so, too. diff --git a/opensc/Makefile b/opensc/Makefile deleted file mode 100644 index 783d2dc597..0000000000 --- a/opensc/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# $NetBSD: Makefile,v 1.16 2015/08/23 20:33:34 thomasklausner Exp $ - -# the Git SHA1 ID of the snapshot -OPENSC_GIT_REVISION= a399905d234d3d6d2a9aa8501a4c8ba1224c6b31 -# this suffix is what is generated by the '-S' option to './bootstrap' -# (when run from a Git clone of the OpenSC repository) -OPENSC_VERSION_SUFFIX= git20140221130957 -# this revision is what is generated by the '-R' option to './bootstrap' -# (when run from a Git clone of the OpenSC repository) -OPENSC_VERSION_REVISION= 220 -OPENSC_PKG_VERSION= 0.13.0${OPENSC_VERSION_SUFFIX} -DISTNAME= opensc-${OPENSC_PKG_VERSION} -CATEGORIES= security -MASTER_SITES= -https://github.com/OpenSC/OpenSC/archive/${OPENSC_GIT_REVISION}.tar.gz -WRKSRC= ${WRKDIR}/OpenSC-${OPENSC_GIT_REVISION} - -MAINTAINER= rhansen@bbn.com -HOMEPAGE= https://github.com/OpenSC/OpenSC/wiki -COMMENT= Smart Card drivers and middleware -LICENSE= gnu-lgpl-v2.1 - -BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl - -GNU_CONFIGURE= YES -USE_LIBTOOL= YES -USE_OLD_DES_API= YES -USE_TOOLS+= gmake pkg-config - -USE_TOOLS+= autoreconf autoconf automake -AUTOCONF_REQD= 2.60 -AUTOMAKE_REQD= 1.10 -pre-configure: - cd ${WRKSRC} && \ - ./bootstrap \ - -s ${OPENSC_VERSION_SUFFIX:Q} \ - -r ${OPENSC_VERSION_REVISION:Q} - -.include "options.mk" - -# Previous versions needed these, but 0.12.2 configure does not -# recognize them. -#CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} -#CONFIGURE_ARGS+= --disable-sensitive-logging - -# Is this necessary (and non-default)? -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} - -# This is perhaps an upstream bug. -CONFIGURE_ENV+= PCSC_CFLAGS=-I${PREFIX}/include/PCSC - -# The stylesheets are not found without this. -CONFIGURE_ARGS+= --with-xsl-stylesheetsdir=${BUILDLINK_PREFIX.docbook-xsl}/share/xsl/docbook - -EGDIR= ${PREFIX}/share/examples/opensc -CONF_FILES+= ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf - -INSTALLATION_DIRS= ${EGDIR} -post-install: - ${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf ${DESTDIR}${EGDIR} - -# build tools for doc; should be TOOLS -.include "../../textproc/libxslt/buildlink3.mk" - -.include "../../devel/libltdl/buildlink3.mk" -.include "../../mk/readline.buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 -.include "../../security/openssl/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/opensc/PLIST b/opensc/PLIST deleted file mode 100644 index 6fb8b4f0d1..0000000000 --- a/opensc/PLIST +++ /dev/null @@ -1,69 +0,0 @@ -@comment $NetBSD: PLIST,v 1.9 2014/02/27 20:26:27 r-hansen Exp $ -bin/cardos-tool -bin/cryptoflex-tool -bin/dnie-tool -bin/eidenv -bin/iasecc-tool -bin/netkey-tool -bin/openpgp-tool -bin/opensc-explorer -bin/opensc-tool -bin/piv-tool -bin/pkcs11-tool -bin/pkcs15-crypt -bin/pkcs15-init -bin/pkcs15-tool -bin/sc-hsm-tool -bin/westcos-tool -lib/libopensc.la -lib/opensc-pkcs11.la -lib/pkcs11-spy.la -lib/pkcs11/opensc-pkcs11.so -lib/pkcs11/pkcs11-spy.so -man/man1/cardos-tool.1 -man/man1/cryptoflex-tool.1 -man/man1/eidenv.1 -man/man1/iasecc-tool.1 -man/man1/netkey-tool.1 -man/man1/openpgp-tool.1 -man/man1/opensc-explorer.1 -man/man1/opensc-tool.1 -man/man1/piv-tool.1 -man/man1/pkcs11-tool.1 -man/man1/pkcs15-crypt.1 -man/man1/pkcs15-init.1 -man/man1/pkcs15-tool.1 -man/man1/sc-hsm-tool.1 -man/man1/westcos-tool.1 -man/man5/pkcs15-profile.5 -share/doc/opensc/NEWS -share/examples/opensc/opensc.conf -share/opensc/asepcos.profile -share/opensc/authentic.profile -share/opensc/cardos.profile -share/opensc/cyberflex.profile -share/opensc/entersafe.profile -share/opensc/epass2003.profile -share/opensc/flex.profile -share/opensc/gpk.profile -share/opensc/ias_adele_admin1.profile -share/opensc/ias_adele_admin2.profile -share/opensc/ias_adele_common.profile -share/opensc/iasecc.profile -share/opensc/iasecc_admin_eid.profile -share/opensc/iasecc_generic_oberthur.profile -share/opensc/iasecc_generic_pki.profile -share/opensc/incrypto34.profile -share/opensc/jcop.profile -share/opensc/miocos.profile -share/opensc/muscle.profile -share/opensc/myeid.profile -share/opensc/oberthur.profile -share/opensc/openpgp.profile -share/opensc/pkcs15.profile -share/opensc/rutoken.profile -share/opensc/rutoken_ecp.profile -share/opensc/sc-hsm.profile -share/opensc/setcos.profile -share/opensc/starcos.profile -share/opensc/westcos.profile diff --git a/opensc/TODO b/opensc/TODO deleted file mode 100644 index 9ba10b0fcf..0000000000 --- a/opensc/TODO +++ /dev/null @@ -1,16 +0,0 @@ -(The following is current as of opensc-0.13.0git20140221130957.) - -This is a newer version of security/opensc (a recent snapshot from the -upstream Git repository). Only minimal changes to opensc-0.12.2 have -been made to get it to build; some of the contents of the Makefile may -no longer be necessary (e.g., CONFIGURE_ARGS, CONFIGURE_ENV, -dependencies) and new settings/dependencies may be required. No -testing has been done, other than to ensure that it builds on NetBSD -6.1 i386. - -TODO: - * basic testing - * prune obsolete dependencies and settings from Makefile, if any - * prune obsolete patches, if any - * add new dependencies, if any - * verify that options.mk is still appropriate diff --git a/opensc/distinfo b/opensc/distinfo deleted file mode 100644 index 2ae9e5ac1e..0000000000 --- a/opensc/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: distinfo,v 1.8 2014/02/27 20:26:27 r-hansen Exp $ - -SHA1 (opensc-0.13.0git20140221130957.tar.gz) = 6d7b05dc43ed9e0f9f1c25d0bfe8dd6c105f954c -RMD160 (opensc-0.13.0git20140221130957.tar.gz) = 0c258f159751dc579f8a202bc8bd425e0b3c1a3d -Size (opensc-0.13.0git20140221130957.tar.gz) = 1173029 bytes -SHA1 (patch-aa) = 900d27328ccdf63e1b6fb00b9c99f28a486e2ac6 -SHA1 (patch-ab) = 64ce4684571014fd3405e5dc908d96c88d2a4c69 -SHA1 (patch-bootstrap) = 6c2d40f3c1520ab3cdcf5089e3ca955cf569748b -SHA1 (patch-src_common_compat__getopt.c) = cf295b41fc79e223b4dac2939e1344591a045b02 -SHA1 (patch-src_common_compat__getopt.h) = 22c56f61e006be917422d68c902d769d7beabc99 -SHA1 (patch-src_common_compat__getopt__main.c) = b37df3ea71978a55a100249724103ae14111fb29 -SHA1 (patch-src_pkcs11_pkcs11-global.c) = 5356ee2a94e4fe019b3127558c04e95a595db675 diff --git a/opensc/options.mk b/opensc/options.mk deleted file mode 100644 index 955ebfb21f..0000000000 --- a/opensc/options.mk +++ /dev/null @@ -1,26 +0,0 @@ -# $NetBSD: options.mk,v 1.9 2014/02/27 20:26:27 r-hansen Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.opensc - -# Arguably these should be selectable individually, but upstream requires -# that exactly one be chosen. -PKG_OPTIONS_REQUIRED_GROUPS= cardreader -PKG_OPTIONS_GROUP.cardreader= pcsc-lite openct -PKG_SUGGESTED_OPTIONS= pcsc-lite - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mpcsc-lite) -.include "../../security/pcsc-lite/buildlink3.mk" -CONFIGURE_ARGS+= --enable-pcsc -CONFIGURE_ARGS+= --with-pcsc-provider=${BUILDLINK_PREFIX.pcsc-lite}/lib/libpcsclite.la -.else -CONFIGURE_ARGS+= --disable-pcsc -.endif - -.if !empty(PKG_OPTIONS:Mopenct) -.include "../../security/openct/buildlink3.mk" -CONFIGURE_ARGS+= --enable-openct -.else -CONFIGURE_ARGS+= --disable-openct -.endif diff --git a/opensc/patches/patch-aa b/opensc/patches/patch-aa deleted file mode 100644 index 16a20dc156..0000000000 --- a/opensc/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2014/02/27 20:26:27 r-hansen Exp $ - -Disable installation of config file, because pkgsrc installs config -files as examples. - ---- etc/Makefile.am.orig 2014-02-21 12:09:57.000000000 +0000 -+++ etc/Makefile.am -@@ -22,11 +22,3 @@ opensc.conf: opensc.conf.in force - -e 's|@DEFAULT_SM_MODULE[@]|$(DEFAULT_SM_MODULE)|g' \ - -e 's|@DEBUG_FILE[@]|$(DEBUG_FILE)|g' \ - < $< > $@ -- --install-exec-hook: opensc.conf -- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" -- if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \ -- $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \ -- else \ -- $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \ -- fi diff --git a/opensc/patches/patch-ab b/opensc/patches/patch-ab deleted file mode 100644 index a61d04c5b5..0000000000 --- a/opensc/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2014/02/27 20:26:27 r-hansen Exp $ - -This patch was added 2009-09-10 by hasso@, with comment: - More userfriendly default configuration. - ---- etc/opensc.conf.in.orig 2014-02-21 12:09:57.000000000 +0000 -+++ etc/opensc.conf.in -@@ -459,6 +459,7 @@ app default { - # - # Default: no - # try_emulation_first = yes; -+ try_emulation_first = yes; - - # Enable builtin emulators. - # Default: yes diff --git a/opensc/patches/patch-bootstrap b/opensc/patches/patch-bootstrap deleted file mode 100644 index 420a46d909..0000000000 --- a/opensc/patches/patch-bootstrap +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-bootstrap,v 1.1 2014/02/27 20:26:27 r-hansen Exp $ - - * fix sed regular expressions to be POSIX BREs (change '\s' to - '[[:space:]]', '+' to '\{1,\}') (not yet reported upstream) - * quote $SUFFIX and $REVISION variable expansions (not yet reported - upstream) - ---- bootstrap.orig 2014-02-24 21:54:33.000000000 +0000 -+++ bootstrap -@@ -32,7 +32,7 @@ do - SUFFIX=$OPTARG - ;; - S) -- SUFFIX=git`git log -1 --pretty=fuller --date=iso | grep CommitDate: | sed -E 's/^CommitDate:\s(.*)/\1/' | sed -E 's/(.*)-(.*)-(.*) (.*):(.*):(.*)\s+.*/\1\2\3\4\5\6/'` -+ SUFFIX=git`git log -1 --pretty=fuller --date=iso | grep CommitDate: | sed -E 's/^CommitDate:[[:space:]](.*)/\1/' | sed -E 's/(.*)-(.*)-(.*) (.*):(.*):(.*)[[:space:]]\{1,\}.*/\1\2\3\4\5\6/'` - ;; - r) - REVISION=$OPTARG -@@ -65,14 +65,14 @@ then - if [ -n "$SUFFIX" ] - then - echo Set package suffix "$SUFFIX" -- sed 's/^define(\[PACKAGE_SUFFIX\],\s*\[\([-~]*[0-9a-zA-Z]*\)\])$/define(\[PACKAGE_SUFFIX\], \['$SUFFIX'\])/g' configure.ac > configure.ac.next -+ sed 's/^define(\[PACKAGE_SUFFIX\],[[:space:]]*\[\([-~]*[0-9a-zA-Z]*\)\])$/define(\[PACKAGE_SUFFIX\], \['"$SUFFIX"'\])/g' configure.ac > configure.ac.next - mv configure.ac.next configure.ac - fi - - if [ -n "$REVISION" ] - then - echo Set package revision "$REVISION" -- sed 's/^define(\[PACKAGE_VERSION_REVISION\],\s*\[\([-~]*[0-9a-zA-Z]*\)\])$/define(\[PACKAGE_VERSION_REVISION\], \['$REVISION'\])/g' configure.ac > configure.ac.next -+ sed 's/^define(\[PACKAGE_VERSION_REVISION\],[[:space:]]*\[\([-~]*[0-9a-zA-Z]*\)\])$/define(\[PACKAGE_VERSION_REVISION\], \['"$REVISION"'\])/g' configure.ac > configure.ac.next - mv configure.ac.next configure.ac - fi - fi diff --git a/opensc/patches/patch-src_common_compat__getopt.c b/opensc/patches/patch-src_common_compat__getopt.c deleted file mode 100644 index e0086caf9f..0000000000 --- a/opensc/patches/patch-src_common_compat__getopt.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_common_compat__getopt.c,v 1.1 2014/02/27 20:26:27 r-hansen Exp $ - -See comment in patch-src_common_compat__getopt.h. - ---- src/common/compat_getopt.c.orig 2014-02-21 12:09:57.000000000 +0000 -+++ src/common/compat_getopt.c -@@ -25,7 +25,7 @@ - - #include "config.h" - --#if ! ( defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG) && defined(HAVE_GETOPT_LONG_ONLY) ) -+#if ! ( defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG) ) - - #include - #include diff --git a/opensc/patches/patch-src_common_compat__getopt.h b/opensc/patches/patch-src_common_compat__getopt.h deleted file mode 100644 index 6ee6fdca40..0000000000 --- a/opensc/patches/patch-src_common_compat__getopt.h +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-src_common_compat__getopt.h,v 1.1 2014/02/27 20:26:27 r-hansen Exp $ - -NetBSD has getopt_long but not getopt_long_only. Replacing -getopt_long causes a type conflict with the built-in implementation. -The replacement is unnecesssary because getopt_long_only is not -actually used. - -Reported upstream: -http://article.gmane.org/gmane.comp.encryption.opensc.user/5931 - -The following is the original mail archive URL, but it currently -yields a '404 not found' error: -https://www.opensc-project.org/pipermail/opensc-devel/2012-November/018668.html - ---- src/common/compat_getopt.h.orig 2014-02-21 12:09:57.000000000 +0000 -+++ src/common/compat_getopt.h -@@ -30,7 +30,7 @@ - #include "config.h" - #endif - --#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG) && defined(HAVE_GETOPT_LONG_ONLY) -+#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG) - #include - #else - -@@ -43,7 +43,6 @@ extern "C" { - - #define getopt my_getopt - #define getopt_long my_getopt_long --#define getopt_long_only my_getopt_long_only - #define _getopt_internal _my_getopt_internal - #define opterr my_opterr - #define optind my_optind -@@ -86,6 +85,6 @@ extern int _my_getopt_internal(int argc, - } - #endif - --#endif /* HAVE_GETOPT_H && HAVE_GETOPT_LONG && HAVE_GETOPT_LONG_ONLY */ -+#endif /* HAVE_GETOPT_H && HAVE_GETOPT_LONG */ - - #endif /* MY_GETOPT_H_INCLUDED */ diff --git a/opensc/patches/patch-src_common_compat__getopt__main.c b/opensc/patches/patch-src_common_compat__getopt__main.c deleted file mode 100644 index 723f4fe99b..0000000000 --- a/opensc/patches/patch-src_common_compat__getopt__main.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_common_compat__getopt__main.c,v 1.1 2014/02/27 20:26:27 r-hansen Exp $ - -See comment in patch-src_common_compat__getopt.h. In addition, a -kludge is added here to get the test file to build, pending a new -release from upstream with the issue properly addressed. - ---- src/common/compat_getopt_main.c.orig 2014-02-21 12:09:57.000000000 +0000 -+++ src/common/compat_getopt_main.c -@@ -173,6 +173,8 @@ main(int argc, char * argv[]) - progname); - } - -+#define getopt_long_only getopt_long -+ - /* parse all options from the command line */ - while ((opt = - getopt_long_only(argc, argv, shortopts, longopts, &longind)) != -1) diff --git a/opensc/patches/patch-src_pkcs11_pkcs11-global.c b/opensc/patches/patch-src_pkcs11_pkcs11-global.c deleted file mode 100644 index ccb061d5b0..0000000000 --- a/opensc/patches/patch-src_pkcs11_pkcs11-global.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_pkcs11_pkcs11-global.c,v 1.1 2014/02/27 20:26:27 r-hansen Exp $ - -Use correct size for malloc. - -Not yet reported upstream. - ---- src/pkcs11/pkcs11-global.c.orig 2014-02-21 12:09:57.000000000 +0000 -+++ src/pkcs11/pkcs11-global.c -@@ -42,7 +42,7 @@ extern CK_FUNCTION_LIST pkcs11_function_ - #include - CK_RV mutex_create(void **mutex) - { -- pthread_mutex_t *m = calloc(1, sizeof(*mutex)); -+ pthread_mutex_t *m = calloc(1, sizeof(*m)); - if (m == NULL) - return CKR_GENERAL_ERROR;; - pthread_mutex_init(m, NULL); diff --git a/openssh/DESCR b/openssh/DESCR deleted file mode 100644 index 764ae7f090..0000000000 --- a/openssh/DESCR +++ /dev/null @@ -1,14 +0,0 @@ -OpenSSH is based on the last free version of Tatu Ylonen's SSH with -all patent-encumbered algorithms removed (to external libraries), all -known security bugs fixed, new features reintroduced and many other -clean-ups. More information about SSH itself can be found in the file -README.Ylonen. OpenSSH has been created by Aaron Campbell, Bob Beck, -Markus Friedl, Niels Provos, Theo de Raadt, and Dug Song. - -This port consists of the re-introduction of autoconf support, PAM -support (for Linux and Solaris), EGD[1] support, SOCKS support (using -the Dante [6] libraries and replacements for OpenBSD library functions -that are (regrettably) absent from other unices. This port has been -best tested on Linux, Solaris, HPUX, NetBSD and Irix. Support for AIX, -SCO, NeXT and other Unices is underway. This version actively tracks -changes in the OpenBSD CVS repository. diff --git a/openssh/INSTALL b/openssh/INSTALL deleted file mode 100644 index 8b8d1d310e..0000000000 --- a/openssh/INSTALL +++ /dev/null @@ -1,36 +0,0 @@ -# $NetBSD: INSTALL,v 1.10 2003/08/30 20:23:06 jlam Exp $ - -DIRS="/etc /etc/ssh ${PKG_PREFIX}/etc ${PKG_PREFIX}/etc/ssh" -FILES="sshd.conf sshd_config" - -case ${STAGE} in -POST-INSTALL) - for dir in $DIRS; do - if [ "@PKG_SYSCONFDIR@" != "$dir" ]; then - for file in $FILES; do - path=$dir/$file - if [ -f $path ]; then - ${CAT} <2.0 -BROKEN_FOR_PLATFORM+= OpenBSD-*-* - -USE_GCC_RUNTIME= yes -USE_TOOLS+= autoconf perl - -# retain the following line, for IPv6-ready pkgsrc webpage -BUILD_DEFS+= IPV6_READY - -PKG_GROUPS_VARS+= OPENSSH_GROUP -PKG_USERS_VARS+= OPENSSH_USER -BUILD_DEFS+= OPENSSH_CHROOT -BUILD_DEFS+= VARBASE - -INSTALL_TARGET= install-nokeys - -.include "options.mk" - -# fixes: dyld: Symbol not found: _allow_severity -CONFIGURE_ARGS.Darwin+= --disable-strip - -# OpenSSH on Interix has some important caveats -.if ${OPSYS} == "Interix" -MESSAGE_SRC= ${.CURDIR}/MESSAGE.Interix -BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib/bind -CONFIGURE_ENV+= ac_cv_func_openpty=no -CONFIGURE_ENV+= ac_cv_type_struct_timespec=yes -CPPFLAGS+= -DIOV_MAX=16 # default is INT_MAX, way too large -. if exists(/usr/local/include/bind/resolv.h) -CPPFLAGS+= -I/usr/local/include/bind -BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind -. elif exists(/usr/local/bind/include/resolv.h) -CPPFLAGS+= -I/usr/local/bind/include -BUILDLINK_PASSTHRU_DIRS+= /usr/local/bind/include -. endif -LDFLAGS+= -L/usr/local/lib/bind -LIBS+= -lbind -ldb -lcrypt - -.else # not Interix - -PKG_GROUPS= ${OPENSSH_GROUP} -PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP} - -PKG_GECOS.${OPENSSH_USER}= sshd privsep pseudo-user -PKG_HOME.${OPENSSH_USER}= ${OPENSSH_CHROOT} - -.endif - -SSH_PID_DIR= ${VARBASE}/run # default directory for PID files - -PKG_SYSCONFSUBDIR= ssh - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-mantype=man -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR:Q} -CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q} -CONFIGURE_ARGS+= --with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers} - -.if ${OPSYS} != "Interix" -CONFIGURE_ARGS+= --with-privsep-path=${OPENSSH_CHROOT:Q} -CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER:Q} -.endif - -# pkgsrc already enforces a "secure" version of zlib via dependencies, -# so skip this bogus version check. -CONFIGURE_ARGS+= --without-zlib-version-check - -# the openssh configure script finds and uses ${LD} if defined and -# defaults to ${CC} if not. we override LD here, since running the -# linker directly results in undefined symbols for obvious reasons. -# -CONFIGURE_ENV+= LD=${CC:Q} - -# Enable S/Key support on NetBSD, Darwin, and Solaris. -.if (${OPSYS} == "NetBSD") || (${OPSYS} == "Darwin") || (${OPSYS} == "SunOS") -. include "../../security/skey/buildlink3.mk" -CONFIGURE_ARGS+= --with-skey=${BUILDLINK_PREFIX.skey} -.else -CONFIGURE_ARGS+= --without-skey -.endif - -.if (${OPSYS} == "NetBSD") -. if exists(/usr/include/utmpx.h) -# if we have utmpx et al do not try to use login() -CONFIGURE_ARGS+= --disable-libutil -. endif -# -# NetBSD current after 2011/03/12 has incompatible strnvis(3) and -# prior version don't have it. So, disable use of strnvis(3) now. -# -CONFIGURE_ENV+= ac_cv_func_strnvis=no -.endif - -.if (${OPSYS} == "SunOS") && (${OS_VERSION} == "5.8" || ${OS_VERSION} == "5.9") -CONFIGURE_ARGS+= --disable-utmp --disable-wtmp -.endif - -CONFIGURE_ARGS.Linux+= --enable-md5-password - -# The ssh-askpass program is in ${X11BASE}/bin or ${PREFIX}/bin depending -# on if it's part of the X11 distribution, or if it's installed from pkgsrc -# (security/ssh-askpass). -# -.if exists(${X11BASE}/bin/ssh-askpass) -ASKPASS_PROGRAM= ${X11BASE}/bin/ssh-askpass -.else -ASKPASS_PROGRAM= ${PREFIX}/bin/ssh-askpass -.endif -CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q} -MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q} - -# do the same for xauth -.if exists(${X11BASE}/bin/xauth) -CONFIGURE_ARGS+= --with-xauth=${X11BASE}/bin/xauth -.else -CONFIGURE_ARGS+= --with-xauth=${PREFIX}/bin/xauth -.endif - -CONFS= ssh_config sshd_config moduli - -PLIST_VARS+= darwin prng - -.if exists(/dev/urandom) -. if ${OPSYS} == "NetBSD" -MESSAGE_SRC+= ${.CURDIR}/MESSAGE.urandom -. endif -.else -CONFIGURE_ARGS+= --without-random -CONFS+= ssh_prng_cmds -PLIST.prng= yes -.endif - -EGDIR= ${PREFIX}/share/examples/${PKGBASE} - -# enable privsep patches -.if ${OPSYS} == "Darwin" -CONF_FILES+= ${EGDIR}/org.openssh.sshd.sb ${PKG_SYSCONFDIR}/org.openssh.sshd.sb -CPPFLAGS+= -D__APPLE_SANDBOX_NAMED_EXTERNAL__ -PLIST.darwin= yes -.endif - -.for f in ${CONFS} -CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} -.endfor -OWN_DIRS= ${OPENSSH_CHROOT} -RCD_SCRIPTS= sshd -RCD_SCRIPT_SRC.sshd= ${WRKDIR}/sshd.sh -SMF_METHODS= sshd - -FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q} - -SUBST_CLASSES+= patch -SUBST_STAGE.patch= pre-configure -SUBST_FILES.patch= session.c sandbox-darwin.c -SUBST_SED.patch= -e '/channel_input_port_forward_request/s/0/ROOTUID/' -SUBST_VARS.patch= PKG_SYSCONFDIR - -.include "../../devel/zlib/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../security/tcp_wrappers/buildlink3.mk" - -# -# type of key "ecdsa" isn't always supported depends on OpenSSL. -# -pre-configure: - cd ${WRKSRC} && autoconf -i - -post-configure: - if ${EGREP} -q '^\#define[ ]+OPENSSL_HAS_ECC' \ - ${WRKSRC}/config.h; then \ - ${SED} -e '/HAVE_ECDSA/s/.*//' \ - ${FILESDIR}/sshd.sh > ${WRKDIR}/sshd.sh; \ - else \ - ${SED} -e '/HAVE_ECDSA_START/,/HAVE_ECDSA_STOP/d' \ - ${FILESDIR}/sshd.sh > ${WRKDIR}/sshd.sh; \ - fi - ${SED} -e 's,@VARBASE@,${VARBASE},g' \ - < ${FILESDIR}/org.openssh.sshd.sb.in \ - > ${WRKDIR}/org.openssh.sshd.sb - -post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} - cd ${WRKSRC}; for file in ${CONFS}; do \ - ${INSTALL_DATA} $${file}.out ${DESTDIR}${EGDIR}/$${file}; \ - done -.if !empty(PKG_OPTIONS:Mpam) && ${OPSYS} == "Linux" - ${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.generic \ - ${DESTDIR}${EGDIR}/sshd.pam -.endif -.if ${OPSYS} == "Darwin" - ${INSTALL_DATA} ${WRKDIR}/org.openssh.sshd.sb \ - ${DESTDIR}${EGDIR}/org.openssh.sshd.sb -.endif - -.include "../../mk/bsd.pkg.mk" diff --git a/openssh/PLIST b/openssh/PLIST deleted file mode 100644 index d0a6ca1172..0000000000 --- a/openssh/PLIST +++ /dev/null @@ -1,29 +0,0 @@ -@comment $NetBSD$ -bin/scp -bin/sftp -bin/ssh -bin/ssh-add -bin/ssh-agent -bin/ssh-keygen -bin/ssh-keyscan -libexec/sftp-server -libexec/ssh-keysign -libexec/ssh-pkcs11-helper -man/man1/scp.1 -man/man1/sftp.1 -man/man1/ssh-add.1 -man/man1/ssh-agent.1 -man/man1/ssh-keygen.1 -man/man1/ssh-keyscan.1 -man/man1/ssh.1 -man/man5/moduli.5 -man/man5/ssh_config.5 -man/man5/sshd_config.5 -man/man8/sftp-server.8 -man/man8/ssh-keysign.8 -man/man8/ssh-pkcs11-helper.8 -man/man8/sshd.8 -sbin/sshd -share/examples/openssh/moduli -share/examples/openssh/ssh_config -share/examples/openssh/sshd_config diff --git a/openssh/TODO b/openssh/TODO deleted file mode 100644 index 1d150697c7..0000000000 --- a/openssh/TODO +++ /dev/null @@ -1,6 +0,0 @@ -This probably breaks OS X X11 forwarding. -The relevant code has changed, check macports when they update. - -segfaults for me on netbsd-current (running ssh@host) -but so does the previous version. -(base openssl) diff --git a/openssh/distinfo b/openssh/distinfo deleted file mode 100644 index e4e6989493..0000000000 --- a/openssh/distinfo +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: distinfo,v 1.99 2016/02/26 21:06:38 tez Exp $ - -SHA1 (openssh-7.2p2.tar.gz) = 70e35d7d6386fe08abbd823b3a12a3ca44ac6d38 -RMD160 (openssh-7.2p2.tar.gz) = d18d73719ceeefa5116b5b741124f3604d7ddb99 -SHA512 (openssh-7.2p2.tar.gz) = 44f62b3a7bc50a0735d496a5aedeefb71550d8c10ad8f22b94e29fcc8084842db96e8c4ca41fced17af69e1aab09ed1182a12ad8650d9a46fd8743a0344df95b -Size (openssh-7.2p2.tar.gz) = 1499808 bytes -SHA1 (patch-Makefile.in) = 98960119bda68a663214c8880484552f1207bcfc -SHA1 (patch-auth-passwd.c) = 92c487cc3c092efb56f8b4ac4ca08ccd67803a83 -SHA1 (patch-auth-rhosts.c) = a5e6131e63b83a7e8a06cd80f22def449d6bc2c4 -SHA1 (patch-auth.c) = cd13f8b31b45d668c5e09eca098b17ec8a7c1039 -SHA1 (patch-auth1.c) = cdac14ffa4008e62926526e66316b0a553435374 -SHA1 (patch-auth2.c) = efc1eb6d28cb6ec2bd87723943f3e36c612d93aa -SHA1 (patch-channels.c) = edcce67664bbbc30a8d10ed2fe58dcece944726c -SHA1 (patch-config.h.in) = 7406f10b568d2b8237ee575922ce712658d90d59 -SHA1 (patch-configure.ac) = d7ba54f34e03fd204eb1a9804fcae7fd16e285e2 -SHA1 (patch-defines.h) = bd8687a9a2857f3b8d15ae94095f27f9344003c4 -SHA1 (patch-includes.h) = c4a7622af6fbcd098d18d257724dca6aaeea4fda -SHA1 (patch-loginrec.c) = 28082deb14258fe63cbecad8ac96afc016de439c -SHA1 (patch-openbsd-compat_bsd-openpty.c) = eaac72830e36e307c19a7b679e6018ece9aebaac -SHA1 (patch-openbsd-compat_openbsd-compat.h) = bedbede16ab2fe918419c994ba15a20167b411b4 -SHA1 (patch-openbsd-compat_port-tun.c) = 690dfb1f945d186dd3de5bea70ed8fab86e590ee -SHA1 (patch-platform.c) = f8f211dbc5e596c0f82eb86324d18a84c6151ec5 -SHA1 (patch-sandbox-darwin.c) = d8f0b991cee3ee1e0d22299aa5e1636d64ade549 -SHA1 (patch-scp.c) = 9c2317b0f796641903a826db355ba06595a26ea1 -SHA1 (patch-session.c) = ad85bc1f809e57e8abb380cbdf93e8f60bb86363 -SHA1 (patch-sftp-common.c) = 6819aa040c8f1caa30a704cf6f0588e498df8778 -SHA1 (patch-sshd.8) = 5bf48cd27cef8e8810b9dc7115f5180102a345d1 -SHA1 (patch-sshd.c) = 211297ad6bc66cc50c517234d6c3fd619c01300a -SHA1 (patch-sshpty.c) = cb691d4fbde808927f2fbcc12b87ad983cf21938 -SHA1 (patch-uidswap.c) = 68c4f5ffab7f4c5c9c00b7443a74b2da52809b7e diff --git a/openssh/files/org.openssh.sshd.sb.in b/openssh/files/org.openssh.sshd.sb.in deleted file mode 100644 index e060377c92..0000000000 --- a/openssh/files/org.openssh.sshd.sb.in +++ /dev/null @@ -1,23 +0,0 @@ -;; $NetBSD: org.openssh.sshd.sb.in,v 1.1 2015/08/14 08:57:00 jperkin Exp $ -;; -;; Copyright (c) 2008 Apple Inc. All Rights reserved. -;; -;; sshd - profile for privilege separated children -;; -;; WARNING: The sandbox rules in this file currently constitute -;; Apple System Private Interface and are subject to change at any time and -;; without notice. -;; - -(version 1) - -(deny default) - -(allow file-chroot) -(allow file-read-metadata (literal "@VARBASE@")) - -(allow sysctl-read) -(allow mach-per-user-lookup) -(allow mach-lookup - (global-name "com.apple.system.notification_center") - (global-name "com.apple.system.logger")) diff --git a/openssh/files/smf/manifest.xml b/openssh/files/smf/manifest.xml deleted file mode 100644 index 4bd43a9a74..0000000000 --- a/openssh/files/smf/manifest.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/openssh/files/smf/sshd.sh b/openssh/files/smf/sshd.sh deleted file mode 100644 index 0ab48193b1..0000000000 --- a/openssh/files/smf/sshd.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!@SMF_METHOD_SHELL@ -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)sshd 1.4 04/11/17 SMI" - -SSHDIR=@PKG_SYSCONFDIR@ -KEYGEN="@PREFIX@/bin/ssh-keygen -q" -PIDFILE=@VARBASE@/run/sshd.pid - -# Checks to see if RSA, and DSA host keys are available -# if any of these keys are not present, the respective keys are created. -create_key() -{ - keypath=$1 - keytype=$2 - - if [ ! -f $keypath ]; then - grep "^HostKey $keypath" $SSHDIR/sshd_config > /dev/null 2>&1 - if [ $? -eq 0 ]; then - echo Creating new $keytype public/private host key pair - $KEYGEN -f $keypath -t $keytype -N '' - return $? - fi - fi - - return 0 -} - -# This script is being used for two purposes: as part of an SMF -# start/stop/refresh method, and as a sysidconfig(1M)/sys-unconfig(1M) -# application. -# -# Both, the SMF methods and sysidconfig/sys-unconfig use different -# arguments.. - -case $1 in - # sysidconfig/sys-unconfig arguments (-c and -u) -'-c') - create_key $SSHDIR/ssh_host_rsa_key rsa - create_key $SSHDIR/ssh_host_dsa_key dsa - ;; - -'-u') - # sys-unconfig(1M) knows how to remove ssh host keys, so there's - # nothing to do here. - : - ;; - - # SMF arguments (start and restart [really "refresh"]) -'start') - @PREFIX@/sbin/sshd - ;; - -'restart') - if [ -f "$PIDFILE" ]; then - /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE` - fi - ;; - -*) - echo "Usage: $0 { start | restart }" - exit 1 - ;; -esac - -exit $? diff --git a/openssh/files/sshd.sh b/openssh/files/sshd.sh deleted file mode 100644 index 8493e047e4..0000000000 --- a/openssh/files/sshd.sh +++ /dev/null @@ -1,115 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: sshd.sh,v 1.16 2015/11/11 11:40:06 sevan Exp $ -# -# PROVIDE: sshd -# REQUIRE: DAEMON LOGIN - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="sshd" -rcvar=$name -command="@PREFIX@/sbin/${name}" -keygen_command="@PREFIX@/bin/ssh-keygen" -pidfile="@SSH_PID_DIR@/${name}.pid" -required_files="@PKG_SYSCONFDIR@/sshd_config" -extra_commands="keygen reload" - -sshd_keygen() -{ - ( - umask 022 - if [ -f @PKG_SYSCONFDIR@/ssh_host_dsa_key ]; then - @ECHO@ "You already have a DSA host key in @PKG_SYSCONFDIR@/ssh_host_dsa_key" - @ECHO@ "Skipping protocol version 2 DSA Key Generation" - else - ${keygen_command} -t dsa -f @PKG_SYSCONFDIR@/ssh_host_dsa_key -N '' - fi - - if [ -f @PKG_SYSCONFDIR@/ssh_host_rsa_key ]; then - @ECHO@ "You already have a RSA host key in @PKG_SYSCONFDIR@/ssh_host_rsa_key" - @ECHO@ "Skipping protocol version 2 RSA Key Generation" - else - ${keygen_command} -t rsa -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -N '' - fi -# HAVE_ECDSA_START - if [ -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key ]; then - @ECHO@ "You already have a ECDSA host key in @PKG_SYSCONFDIR@/ssh_host_ecdsa_key" - @ECHO@ "Skipping protocol version 2 ECDSA Key Generation" - else - ${keygen_command} -t ecdsa -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -N '' - fi -# HAVE_ECDSA_STOP -# HAVE_ED25519_START - if [ -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key ]; then - @ECHO@ "You already have a ED25519 host key in @PKG_SYSCONFDIR@/ssh_host_ed25519_key" - @ECHO@ "Skipping protocol version 2 ED25519 Key Generation" - else - ${keygen_command} -t ed25519 -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key -N '' - fi -# HAVE_ED25519_STOP - ) -} - -sshd_precmd() -{ - if [ ! -f @PKG_SYSCONFDIR@/ssh_host_dsa_key -o \ - ! -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -o \ - ! -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -o \ - ! -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key ]; then - if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ] - then - run_rc_command keygen - else - eval ${keygen_cmd} - fi - fi -} - -keygen_cmd=sshd_keygen -start_precmd=sshd_precmd - -if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ] -then - load_rc_config $name - run_rc_command "$1" -else - case ${1:-start} in - start) - if [ -x ${command} -a -f ${required_files} ] - then - @ECHO@ "Starting ${name}." - eval ${start_precmd} - eval ${command} ${sshd_flags} ${command_args} - fi - ;; - stop) - if [ -f ${pidfile} ]; then - pid=`@HEAD@ -1 ${pidfile}` - @ECHO@ "Stopping ${name}." - kill -TERM ${pid} - else - @ECHO@ "${name} not running?" - fi - ;; - restart) - ( $0 stop ) - sleep 1 - $0 start - ;; - status) - if [ -f ${pidfile} ]; then - pid=`@HEAD@ -1 ${pidfile}` - @ECHO@ "${name} is running as pid ${pid}." - else - @ECHO@ "${name} is not running." - fi - ;; - keygen) - eval ${keygen_cmd} - ;; - esac -fi diff --git a/openssh/options.mk b/openssh/options.mk deleted file mode 100644 index bc40cd1ac9..0000000000 --- a/openssh/options.mk +++ /dev/null @@ -1,34 +0,0 @@ -# $NetBSD: options.mk,v 1.31 2015/08/22 05:17:22 taca Exp $ - -.include "../../mk/bsd.prefs.mk" - -PKG_OPTIONS_VAR= PKG_OPTIONS.openssh -PKG_SUPPORTED_OPTIONS= kerberos hpn-patch pam - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mkerberos) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE} -. if ${KRB5_TYPE} == "mit-krb5" -CONFIGURE_ENV+= ac_cv_search_k_hasafs=no -. endif -.endif - -.if !empty(PKG_OPTIONS:Mhpn-patch) -PATCHFILES= openssh-7.1p1-hpn-20150822.diff.bz2 -PATCH_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/openssh/ -PATCH_DIST_STRIP= -p1 -.endif - -PLIST_VARS+= pam - -.if !empty(PKG_OPTIONS:Mpam) -.include "../../mk/pam.buildlink3.mk" -CONFIGURE_ARGS+= --with-pam -MESSAGE_SRC+= ${.CURDIR}/MESSAGE.pam -MESSAGE_SUBST+= EGDIR=${EGDIR} -. if ${OPSYS} == "Linux" -PLIST.pam= yes -. endif -.endif diff --git a/openssh/patches/patch-Makefile.in b/openssh/patches/patch-Makefile.in deleted file mode 100644 index f04cf0d7a9..0000000000 --- a/openssh/patches/patch-Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.5 2016/01/18 12:53:26 jperkin Exp $ - -Removed install-sysconf as we handle that phase through post-install - ---- Makefile.in.orig 2015-08-21 04:49:03.000000000 +0000 -+++ Makefile.in -@@ -2,5 +2,5 @@ - - # uncomment if you run a non bourne compatable shell. Ie. csh --#SHELL = @SH@ -+SHELL = @SH@ - - AUTORECONF=autoreconf -@@ -23,5 +23,5 @@ DESTDIR= - VPATH=@srcdir@ - SSH_PROGRAM=@bindir@/ssh --ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass -+#ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass - SFTP_SERVER=$(libexecdir)/sftp-server - SSH_KEYSIGN=$(libexecdir)/ssh-keysign -@@ -288,5 +288,5 @@ distprep: catman-do - - install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config --install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf -+install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - diff --git a/openssh/patches/patch-auth-passwd.c b/openssh/patches/patch-auth-passwd.c deleted file mode 100644 index 4cc6a05799..0000000000 --- a/openssh/patches/patch-auth-passwd.c +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-auth-passwd.c,v 1.3 2016/01/18 12:53:26 jperkin Exp $ - -Replace uid 0 with ROOTUID macro - ---- auth-passwd.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ auth-passwd.c -@@ -88,7 +88,7 @@ auth_password(Authctxt *authctxt, const - #endif - - #ifndef HAVE_CYGWIN -- if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) -+ if (pw->pw_uid == ROOTUID && options.permit_root_login != PERMIT_YES) - ok = 0; - #endif - if (*password == '\0' && options.permit_empty_passwd == 0) -@@ -123,7 +123,12 @@ auth_password(Authctxt *authctxt, const - authctxt->force_pwchange = 1; - } - #endif -+ -+#ifdef HAVE_INTERIX -+ result = (!setuser(pw->pw_name, password, SU_CHECK)); -+#else - result = sys_auth_passwd(authctxt, password); -+#endif - if (authctxt->force_pwchange) - disable_forwarding(); - return (result && ok); diff --git a/openssh/patches/patch-auth-rhosts.c b/openssh/patches/patch-auth-rhosts.c deleted file mode 100644 index fef060635c..0000000000 --- a/openssh/patches/patch-auth-rhosts.c +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-auth-rhosts.c,v 1.3 2016/01/18 12:53:26 jperkin Exp $ - -Replace uid 0 with ROOTUID macro - ---- auth-rhosts.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ auth-rhosts.c -@@ -242,7 +242,7 @@ auth_rhosts2_raw(struct passwd *pw, cons - * If not logging in as superuser, try /etc/hosts.equiv and - * shosts.equiv. - */ -- if (pw->pw_uid == 0) -+ if (pw->pw_uid == ROOTUID) - debug3("%s: root user, ignoring system hosts files", __func__); - else { - if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr, -@@ -271,7 +271,7 @@ auth_rhosts2_raw(struct passwd *pw, cons - return 0; - } - if (options.strict_modes && -- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || -+ ((st.st_uid != ROOTUID && st.st_uid != pw->pw_uid) || - (st.st_mode & 022) != 0)) { - logit("Rhosts authentication refused for %.100s: " - "bad ownership or modes for home directory.", pw->pw_name); -@@ -298,7 +298,7 @@ auth_rhosts2_raw(struct passwd *pw, cons - * allowing access to their account by anyone. - */ - if (options.strict_modes && -- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || -+ ((st.st_uid != ROOTUID && st.st_uid != pw->pw_uid) || - (st.st_mode & 022) != 0)) { - logit("Rhosts authentication refused for %.100s: bad modes for %.200s", - pw->pw_name, buf); diff --git a/openssh/patches/patch-auth.c b/openssh/patches/patch-auth.c deleted file mode 100644 index 80ad49e22a..0000000000 --- a/openssh/patches/patch-auth.c +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-auth.c,v 1.4 2016/01/18 12:53:26 jperkin Exp $ - -* Replace uid 0 with ROOTUID macro. -* Use login_getpwclass() instead of login_getclass() so that the root - vs. default login class distinction is made correctly, from FrrrBSD's - ports. - ---- auth.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ auth.c -@@ -424,7 +424,7 @@ check_key_in_hostfiles(struct passwd *pw - user_hostfile = tilde_expand_filename(userfile, pw->pw_uid); - if (options.strict_modes && - (stat(user_hostfile, &st) == 0) && -- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || -+ ((st.st_uid != ROOTUID && st.st_uid != pw->pw_uid) || - (st.st_mode & 022) != 0)) { - logit("Authentication refused for %.100s: " - "bad owner or modes for %.200s", -@@ -653,7 +653,7 @@ getpwnamallow(const char *user) - if (!allowed_user(pw)) - return (NULL); - #ifdef HAVE_LOGIN_CAP -- if ((lc = login_getclass(pw->pw_class)) == NULL) { -+ if ((lc = login_getpwclass(pw)) == NULL) { - debug("unable to get login class: %s", user); - return (NULL); - } diff --git a/openssh/patches/patch-auth1.c b/openssh/patches/patch-auth1.c deleted file mode 100644 index 011c4bb54d..0000000000 --- a/openssh/patches/patch-auth1.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-auth1.c,v 1.4 2016/01/18 12:53:26 jperkin Exp $ - -Replace uid 0 with ROOTUID macro - ---- auth1.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ auth1.c -@@ -322,7 +322,7 @@ do_authloop(Authctxt *authctxt) - - #ifndef HAVE_CYGWIN - /* Special handling for root */ -- if (authenticated && authctxt->pw->pw_uid == 0 && -+ if (authenticated && authctxt->pw->pw_uid == ROOTUID && - !auth_root_allowed(meth->name)) { - authenticated = 0; - # ifdef SSH_AUDIT_EVENTS -@@ -423,8 +423,8 @@ do_authentication(Authctxt *authctxt) - * If we are not running as root, the user must have the same uid as - * the server. - */ --#ifndef HAVE_CYGWIN -- if (!use_privsep && getuid() != 0 && authctxt->pw && -+#if !defined(HAVE_CYGWIN) && !defined(HAVE_INTERIX) -+ if (!use_privsep && getuid() != ROOTUID && authctxt->pw && - authctxt->pw->pw_uid != getuid()) - packet_disconnect("Cannot change user when server not running as root."); - #endif diff --git a/openssh/patches/patch-auth2.c b/openssh/patches/patch-auth2.c deleted file mode 100644 index f9b6acf2e0..0000000000 --- a/openssh/patches/patch-auth2.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-auth2.c,v 1.6 2016/01/18 12:53:26 jperkin Exp $ - -Replace uid 0 with ROOTUID macro - ---- auth2.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ auth2.c -@@ -302,7 +302,7 @@ userauth_finish(Authctxt *authctxt, int - fatal("INTERNAL ERROR: authenticated and postponed"); - - /* Special handling for root */ -- if (authenticated && authctxt->pw->pw_uid == 0 && -+ if (authenticated && authctxt->pw->pw_uid == ROOTUID && - !auth_root_allowed(method)) { - authenticated = 0; - #ifdef SSH_AUDIT_EVENTS diff --git a/openssh/patches/patch-channels.c b/openssh/patches/patch-channels.c deleted file mode 100644 index 1c13d603a9..0000000000 --- a/openssh/patches/patch-channels.c +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-channels.c,v 1.3 2016/01/18 12:53:26 jperkin Exp $ - -Fix X11 forwarding under Mac OS X Yosemite. Patch taken from MacPorts. - -https://trac.macports.org/browser/trunk/dports/net/openssh/files/launchd.patch?rev=121205 - ---- channels.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ channels.c -@@ -4037,15 +4037,35 @@ x11_connect_display(void) - * connection to the real X server. - */ - -- /* Check if the display is from launchd. */ - #ifdef __APPLE__ -- if (strncmp(display, "/tmp/launch", 11) == 0) { -- sock = connect_local_xsocket_path(display); -- if (sock < 0) -- return -1; -+ /* Check if the display is a path to a socket (as set by launchd). */ -+ { -+ char path[PATH_MAX]; -+ struct stat sbuf; -+ int is_path_to_socket = 0; -+ -+ strlcpy(path, display, sizeof(path)); -+ if (0 == stat(path, &sbuf)) { -+ is_path_to_socket = 1; -+ } else { -+ char *dot = strrchr(path, '.'); -+ if (dot) { -+ *dot = '\0'; -+ /* screen = atoi(dot + 1); */ -+ if (0 == stat(path, &sbuf)) { -+ is_path_to_socket=1; -+ } -+ } -+ } - -- /* OK, we now have a connection to the display. */ -- return sock; -+ if (is_path_to_socket) { -+ sock = connect_local_xsocket_path(path); -+ if (sock < 0) -+ return -1; -+ -+ /* OK, we now have a connection to the display. */ -+ return sock; -+ } - } - #endif - /* diff --git a/openssh/patches/patch-config.h.in b/openssh/patches/patch-config.h.in deleted file mode 100644 index 4253ab9c3d..0000000000 --- a/openssh/patches/patch-config.h.in +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-config.h.in,v 1.5 2016/01/18 12:53:26 jperkin Exp $ - -* Added Interix and define new path to if_tun.h. -* Revive tcp_wrappers support. - ---- config.h.in.orig 2015-08-21 05:09:20.000000000 +0000 -+++ config.h.in -@@ -640,6 +640,9 @@ - /* define if you have int64_t data type */ - #undef HAVE_INT64_T - -+/* Define if you are on Interix */ -+#undef HAVE_INTERIX -+ - /* Define to 1 if the system has the type `intmax_t'. */ - #undef HAVE_INTMAX_T - -@@ -799,6 +802,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_NET_IF_TUN_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_NET_TUN_IF_TUN_H -+ - /* Define if you are on NeXT */ - #undef HAVE_NEXT - -@@ -1394,6 +1400,9 @@ - /* Define if pututxline updates lastlog too */ - #undef LASTLOG_WRITE_PUTUTXLINE - -+/* Define if you want TCP Wrappers support */ -+#undef LIBWRAP -+ - /* Define to whatever link() returns for "not supported" if it doesn't return - EOPNOTSUPP. */ - #undef LINK_OPNOTSUPP_ERRNO diff --git a/openssh/patches/patch-configure.ac b/openssh/patches/patch-configure.ac deleted file mode 100644 index 790ef5ad5f..0000000000 --- a/openssh/patches/patch-configure.ac +++ /dev/null @@ -1,141 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.5 2016/01/18 12:53:26 jperkin Exp $ - -* Various fixes regarding portability -* Revive tcp_wrappers support. - ---- configure.ac.orig 2015-08-21 04:49:03.000000000 +0000 -+++ configure.ac -@@ -316,6 +316,9 @@ AC_ARG_WITH([rpath], - ] - ) - -+# pkgsrc handles any rpath settings this package needs -+need_dash_r= -+ - # Allow user to specify flags - AC_ARG_WITH([cflags], - [ --with-cflags Specify additional flags to pass to compiler], -@@ -387,6 +390,7 @@ AC_CHECK_HEADERS([ \ - maillock.h \ - ndir.h \ - net/if_tun.h \ -+ net/tun/if_tun.h \ - netdb.h \ - netgroup.h \ - pam/pam_appl.h \ -@@ -696,6 +700,15 @@ main() { if (NSVersionOfRunTimeLibrary(" - ;; - esac - ;; -+*-*-interix*) -+ AC_DEFINE(HAVE_INTERIX) -+ AC_DEFINE(DISABLE_FD_PASSING) -+ AC_DEFINE(DISABLE_SHADOW) -+ AC_DEFINE(IP_TOS_IS_BROKEN) -+ AC_DEFINE(MISSING_HOWMANY) -+ AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT) -+ AC_DEFINE(USE_PIPES) -+ ;; - *-*-irix5*) - PATH="$PATH:/usr/etc" - AC_DEFINE([BROKEN_INET_NTOA], [1], -@@ -1424,6 +1437,62 @@ AC_ARG_WITH([skey], - ] - ) - -+# Check whether user wants TCP wrappers support -+TCPW_MSG="no" -+AC_ARG_WITH([tcp-wrappers], -+ [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)], -+ [ -+ if test "x$withval" != "xno" ; then -+ saved_LIBS="$LIBS" -+ saved_LDFLAGS="$LDFLAGS" -+ saved_CPPFLAGS="$CPPFLAGS" -+ if test -n "${withval}" && \ -+ test "x${withval}" != "xyes"; then -+ if test -d "${withval}/lib"; then -+ if test -n "${need_dash_r}"; then -+ LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" -+ else -+ LDFLAGS="-L${withval}/lib ${LDFLAGS}" -+ fi -+ else -+ if test -n "${need_dash_r}"; then -+ LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" -+ else -+ LDFLAGS="-L${withval} ${LDFLAGS}" -+ fi -+ fi -+ if test -d "${withval}/include"; then -+ CPPFLAGS="-I${withval}/include ${CPPFLAGS}" -+ else -+ CPPFLAGS="-I${withval} ${CPPFLAGS}" -+ fi -+ fi -+ LIBS="-lwrap $LIBS" -+ AC_MSG_CHECKING([for libwrap]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -+#include -+#include -+#include -+#include -+int deny_severity = 0, allow_severity = 0; -+ ]], [[ -+ hosts_access(0); -+ ]])], [ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE([LIBWRAP], [1], -+ [Define if you want -+ TCP Wrappers support]) -+ SSHDLIBS="$SSHDLIBS -lwrap" -+ TCPW_MSG="yes" -+ ], [ -+ AC_MSG_ERROR([*** libwrap missing]) -+ -+ ]) -+ LIBS="$saved_LIBS" -+ fi -+ ] -+) -+ - # Check whether user wants to use ldns - LDNS_MSG="no" - AC_ARG_WITH(ldns, -@@ -4816,9 +4885,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - ]) - if test -z "$conf_wtmpx_location"; then - if test x"$system_wtmpx_path" = x"no" ; then -- AC_DEFINE([DISABLE_WTMPX]) -+ for f in /var/log/wtmpx; do -+ if test -f $f ; then -+ conf_wtmpx_location=$f -+ fi -+ done -+ if test -z "$conf_wtmpx_location"; then -+ AC_DEFINE(DISABLE_WTMPX) -+ fi - fi --else -+fi -+if test -n "$conf_wtmpx_location"; then - AC_DEFINE_UNQUOTED([CONF_WTMPX_FILE], ["$conf_wtmpx_location"], - [Define if you want to specify the path to your wtmpx file]) - fi -@@ -4905,7 +4982,7 @@ echo "OpenSSH has been configured with t - echo " User binaries: $B" - echo " System binaries: $C" - echo " Configuration files: $D" --echo " Askpass program: $E" -+echo " Askpass program: ${ASKPASS_PROGRAM}" - echo " Manual pages: $F" - echo " PID file: $G" - echo " Privilege separation chroot path: $H" -@@ -4929,6 +5006,7 @@ echo " KerberosV support - echo " SELinux support: $SELINUX_MSG" - echo " Smartcard support: $SCARD_MSG" - echo " S/KEY support: $SKEY_MSG" -+echo " TCP Wrappers support: $TCPW_MSG" - echo " MD5 password support: $MD5_MSG" - echo " libedit support: $LIBEDIT_MSG" - echo " Solaris process contract support: $SPC_MSG" diff --git a/openssh/patches/patch-defines.h b/openssh/patches/patch-defines.h deleted file mode 100644 index 63788b31ba..0000000000 --- a/openssh/patches/patch-defines.h +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-defines.h,v 1.4 2016/01/18 12:53:26 jperkin Exp $ - -Define ROOTUID, UTMPX_FILE and WTMPX_FILE - ---- defines.h.orig 2015-08-21 04:49:03.000000000 +0000 -+++ defines.h -@@ -30,6 +30,15 @@ - - /* Constants */ - -+#ifdef HAVE_INTERIX -+/* Interix has a special concept of "administrator". */ -+# define ROOTUID 197108 -+# define ROOTGID 131616 -+#else -+# define ROOTUID 0 -+# define ROOTGID 0 -+#endif -+ - #if defined(HAVE_DECL_SHUT_RD) && HAVE_DECL_SHUT_RD == 0 - enum - { -@@ -721,6 +730,24 @@ struct winsize { - # endif - # endif - #endif -+#ifndef UTMPX_FILE -+# ifdef _PATH_UTMPX -+# define UTMPX_FILE _PATH_UTMPX -+# else -+# ifdef CONF_UTMPX_FILE -+# define UTMPX_FILE CONF_UTMPX_FILE -+# endif -+# endif -+#endif -+#ifndef WTMPX_FILE -+# ifdef _PATH_WTMPX -+# define WTMPX_FILE _PATH_WTMPX -+# else -+# ifdef CONF_WTMPX_FILE -+# define WTMPX_FILE CONF_WTMPX_FILE -+# endif -+# endif -+#endif - /* pick up the user's location for lastlog if given */ - #ifndef LASTLOG_FILE - # ifdef _PATH_LASTLOG diff --git a/openssh/patches/patch-includes.h b/openssh/patches/patch-includes.h deleted file mode 100644 index 5e54a9dcd8..0000000000 --- a/openssh/patches/patch-includes.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-includes.h,v 1.4 2016/01/18 12:53:26 jperkin Exp $ - -Interix support - ---- includes.h.orig 2015-08-21 04:49:03.000000000 +0000 -+++ includes.h -@@ -127,6 +127,10 @@ - #ifdef HAVE_READPASSPHRASE_H - # include - #endif -+#ifdef HAVE_INTERIX -+# include -+# include -+#endif - - #ifdef HAVE_IA_H - # include diff --git a/openssh/patches/patch-loginrec.c b/openssh/patches/patch-loginrec.c deleted file mode 100644 index fa56d5a158..0000000000 --- a/openssh/patches/patch-loginrec.c +++ /dev/null @@ -1,68 +0,0 @@ -$NetBSD: patch-loginrec.c,v 1.5 2016/01/18 12:53:26 jperkin Exp $ - -Interix support and related fixes. Fix build on FreeBSD. - ---- loginrec.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ loginrec.c -@@ -432,8 +432,8 @@ login_set_addr(struct logininfo *li, con - int - login_write(struct logininfo *li) - { --#ifndef HAVE_CYGWIN -- if (geteuid() != 0) { -+#if !defined(HAVE_CYGWIN) && !defined(HAVE_INTERIX) -+ if (geteuid() != ROOTUID) { - logit("Attempt to write login records by non-root user (aborting)"); - return (1); - } -@@ -441,7 +441,7 @@ login_write(struct logininfo *li) - - /* set the timestamp */ - login_set_current_time(li); --#ifdef USE_LOGIN -+#if defined(USE_LOGIN) && (HAVE_UTMP_H) - syslogin_write_entry(li); - #endif - #ifdef USE_LASTLOG -@@ -625,7 +625,7 @@ line_abbrevname(char *dst, const char *s - ** into account. - **/ - --#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) -+#if defined(USE_UTMP) || defined (USE_WTMP) || (defined (USE_LOGIN) && defined (HAVE_UTMP_H)) - - /* build the utmp structure */ - void -@@ -762,10 +762,6 @@ construct_utmpx(struct logininfo *li, st - set_utmpx_time(li, utx); - utx->ut_pid = li->pid; - -- /* strncpy(): Don't necessarily want null termination */ -- strncpy(utx->ut_user, li->username, -- MIN_SIZEOF(utx->ut_user, li->username)); -- - if (li->type == LTYPE_LOGOUT) - return; - -@@ -774,6 +770,12 @@ construct_utmpx(struct logininfo *li, st - * for logouts. - */ - -+ /* strncpy(): Don't necessarily want null termination */ -+#if defined(__FreeBSD__) -+ strncpy(utx->ut_user, li->username, MIN_SIZEOF(utx->ut_user, li->username)); -+#else -+ strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username)); -+#endif - # ifdef HAVE_HOST_IN_UTMPX - strncpy(utx->ut_host, li->hostname, - MIN_SIZEOF(utx->ut_host, li->hostname)); -@@ -1409,7 +1411,7 @@ wtmpx_get_entry(struct logininfo *li) - ** Low-level libutil login() functions - **/ - --#ifdef USE_LOGIN -+#if defined(USE_LOGIN) && defined(HAVE_UTMP_H) - static int - syslogin_perform_login(struct logininfo *li) - { diff --git a/openssh/patches/patch-openbsd-compat_bsd-openpty.c b/openssh/patches/patch-openbsd-compat_bsd-openpty.c deleted file mode 100644 index 05c46daa46..0000000000 --- a/openssh/patches/patch-openbsd-compat_bsd-openpty.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-openbsd-compat_bsd-openpty.c,v 1.3 2016/01/18 12:53:26 jperkin Exp $ - -Interix support - ---- openbsd-compat/bsd-openpty.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ openbsd-compat/bsd-openpty.c -@@ -121,15 +121,17 @@ openpty(int *amaster, int *aslave, char - return (-1); - } - -+#if !defined(HAVE_INTERIX) - /* - * Try to push the appropriate streams modules, as described - * in Solaris pts(7). - */ - ioctl(*aslave, I_PUSH, "ptem"); - ioctl(*aslave, I_PUSH, "ldterm"); --# ifndef __hpux -+ # ifndef __hpux - ioctl(*aslave, I_PUSH, "ttcompat"); --# endif /* __hpux */ -+ # endif /* __hpux */ -+#endif /* !HAVE_INTERIX */ - - return (0); - diff --git a/openssh/patches/patch-openbsd-compat_openbsd-compat.h b/openssh/patches/patch-openbsd-compat_openbsd-compat.h deleted file mode 100644 index 771757f15f..0000000000 --- a/openssh/patches/patch-openbsd-compat_openbsd-compat.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-openbsd-compat_openbsd-compat.h,v 1.4 2016/01/18 12:53:26 jperkin Exp $ - -strtoll() declaration - ---- openbsd-compat/openbsd-compat.h.orig 2015-08-21 04:49:03.000000000 +0000 -+++ openbsd-compat/openbsd-compat.h -@@ -99,6 +99,10 @@ size_t strlcat(char *dst, const char *sr - int setenv(register const char *name, register const char *value, int rewrite); - #endif - -+#ifndef HAVE_STRTOLL -+long long strtoll(const char *, char **, int); -+#endif -+ - #ifndef HAVE_STRMODE - void strmode(int mode, char *p); - #endif diff --git a/openssh/patches/patch-openbsd-compat_port-tun.c b/openssh/patches/patch-openbsd-compat_port-tun.c deleted file mode 100644 index 7114086073..0000000000 --- a/openssh/patches/patch-openbsd-compat_port-tun.c +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-openbsd-compat_port-tun.c,v 1.3 2016/01/18 12:53:26 jperkin Exp $ - -if_tun.h can be found in net/tun - ---- openbsd-compat/port-tun.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ openbsd-compat/port-tun.c -@@ -111,6 +111,10 @@ sys_tun_open(int tun, int mode) - #include - #include - -+#ifdef HAVE_NET_TUN_IF_TUN_H -+#include -+#endif -+ - #ifdef HAVE_NET_IF_TUN_H - #include - #endif -@@ -120,7 +124,10 @@ sys_tun_open(int tun, int mode) - { - struct ifreq ifr; - char name[100]; -- int fd = -1, sock, flag; -+ int fd = -1, sock; -+#if defined(TUNSIFHEAD) && !defined(SSH_TUN_PREPEND_AF) -+ int flag; -+#endif - const char *tunbase = "tun"; - - if (mode == SSH_TUNMODE_ETHERNET) { -@@ -154,9 +161,9 @@ sys_tun_open(int tun, int mode) - return (-1); - } - -+#if defined(TUNSIFHEAD) && !defined(SSH_TUN_PREPEND_AF) - /* Turn on tunnel headers */ - flag = 1; --#if defined(TUNSIFHEAD) && !defined(SSH_TUN_PREPEND_AF) - if (mode != SSH_TUNMODE_ETHERNET && - ioctl(fd, TUNSIFHEAD, &flag) == -1) { - debug("%s: ioctl(%d, TUNSIFHEAD, 1): %s", __func__, fd, diff --git a/openssh/patches/patch-platform.c b/openssh/patches/patch-platform.c deleted file mode 100644 index fe837c1b5a..0000000000 --- a/openssh/patches/patch-platform.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-platform.c,v 1.5 2016/01/18 12:53:26 jperkin Exp $ - -Interix support - ---- platform.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ platform.c -@@ -90,7 +90,9 @@ platform_privileged_uidswap(void) - /* uid 0 is not special on Cygwin so always try */ - return 1; - #else -+#if !defined(HAVE_INTERIX) - return (getuid() == 0 || geteuid() == 0); -+#endif /* !HAVE_INTERIX */ - #endif - } - diff --git a/openssh/patches/patch-sandbox-darwin.c b/openssh/patches/patch-sandbox-darwin.c deleted file mode 100644 index 04070d9670..0000000000 --- a/openssh/patches/patch-sandbox-darwin.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-sandbox-darwin.c,v 1.2 2016/01/18 12:53:26 jperkin Exp $ - -Support sandbox on newer OSX, from MacPorts. - ---- sandbox-darwin.c.orig 2016-03-09 18:04:48.000000000 +0000 -+++ sandbox-darwin.c -@@ -62,8 +62,16 @@ ssh_sandbox_child(struct ssh_sandbox *bo - struct rlimit rl_zero; - - debug3("%s: starting Darwin sandbox", __func__); -+#ifdef __APPLE_SANDBOX_NAMED_EXTERNAL__ -+#ifndef SANDBOX_NAMED_EXTERNAL -+#define SANDBOX_NAMED_EXTERNAL (0x3) -+#endif -+ if (sandbox_init("/usr/pkg/etc/ssh/org.openssh.sshd.sb", -+ SANDBOX_NAMED_EXTERNAL, &errmsg) == -1) -+#else - if (sandbox_init(kSBXProfilePureComputation, SANDBOX_NAMED, - &errmsg) == -1) -+#endif - fatal("%s: sandbox_init: %s", __func__, errmsg); - - /* diff --git a/openssh/patches/patch-scp.c b/openssh/patches/patch-scp.c deleted file mode 100644 index 415ddfbc2b..0000000000 --- a/openssh/patches/patch-scp.c +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-scp.c,v 1.4 2016/01/18 12:53:26 jperkin Exp $ - -Interix support - ---- scp.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ scp.c -@@ -478,7 +478,11 @@ main(int argc, char **argv) - argc -= optind; - argv += optind; - -+#ifdef HAVE_INTERIX -+ if ((pwd = getpwuid_ex(userid = getuid(), PW_FULLNAME)) == NULL) -+#else - if ((pwd = getpwuid(userid = getuid())) == NULL) -+#endif - fatal("unknown user %u", (u_int) userid); - - if (!isatty(STDOUT_FILENO)) -@@ -886,8 +890,10 @@ rsource(char *name, struct stat *statp) - return; - } - while ((dp = readdir(dirp)) != NULL) { -+#ifndef HAVE_INTERIX - if (dp->d_ino == 0) - continue; -+#endif - if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) - continue; - if (strlen(name) + 1 + strlen(dp->d_name) >= sizeof(path) - 1) { -@@ -1297,7 +1303,9 @@ okname(char *cp0) - case '\'': - case '"': - case '`': -+#ifndef HAVE_INTERIX - case ' ': -+#endif - case '#': - goto bad; - default: diff --git a/openssh/patches/patch-session.c b/openssh/patches/patch-session.c deleted file mode 100644 index 7e033af2cc..0000000000 --- a/openssh/patches/patch-session.c +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-session.c,v 1.5 2016/01/18 12:53:26 jperkin Exp $ - -Interix support - ---- session.c.orig 2016-03-09 18:04:48.000000000 +0000 -+++ session.c -@@ -398,7 +398,7 @@ do_authenticated1(Authctxt *authctxt) - break; - } - debug("Received TCP/IP port forwarding request."); -- if (channel_input_port_forward_request(s->pw->pw_uid == 0, -+ if (channel_input_port_forward_request(s->pw->pw_uid == ROOTUID, - &options.fwd_opts) < 0) { - debug("Port forwarding failed."); - break; -@@ -1117,7 +1117,7 @@ read_etc_default_login(char ***env, u_in - if (tmpenv == NULL) - return; - -- if (uid == 0) -+ if (uid == ROOTUID) - var = child_get_env(tmpenv, "SUPATH"); - else - var = child_get_env(tmpenv, "PATH"); -@@ -1226,7 +1226,7 @@ do_setup_env(Session *s, const char *she - # endif /* HAVE_ETC_DEFAULT_LOGIN */ - if (path == NULL || *path == '\0') { - child_set_env(&env, &envsize, "PATH", -- s->pw->pw_uid == 0 ? -+ s->pw->pw_uid == ROOTUID ? - SUPERUSER_PATH : _PATH_STDPATH); - } - # endif /* HAVE_CYGWIN */ -@@ -1340,6 +1340,18 @@ do_setup_env(Session *s, const char *she - strcmp(pw->pw_dir, "/") ? pw->pw_dir : ""); - read_environment_file(&env, &envsize, buf); - } -+ -+#ifdef HAVE_INTERIX -+ { -+ /* copy standard Windows environment, then apply changes */ -+ env_t *winenv = env_login(pw); -+ env_putarray(winenv, env, ENV_OVERRIDE); -+ -+ /* swap over to altered environment as a traditional array */ -+ env = env_array(winenv); -+ } -+#endif -+ - if (debug_flag) { - /* dump the environment */ - fprintf(stderr, "Environment:\n"); -@@ -1531,11 +1543,13 @@ do_setusercontext(struct passwd *pw) - perror("setgid"); - exit(1); - } -+# if !defined(HAVE_INTERIX) - /* Initialize the group list. */ - if (initgroups(pw->pw_name, pw->pw_gid) < 0) { - perror("initgroups"); - exit(1); - } -+# endif /* !HAVE_INTERIX */ - endgrent(); - #endif - -@@ -2381,7 +2395,7 @@ session_pty_cleanup2(Session *s) - record_logout(s->pid, s->tty, s->pw->pw_name); - - /* Release the pseudo-tty. */ -- if (getuid() == 0) -+ if (getuid() == ROOTUID) - pty_release(s->tty); - - /* diff --git a/openssh/patches/patch-sftp-common.c b/openssh/patches/patch-sftp-common.c deleted file mode 100644 index 4bf2960569..0000000000 --- a/openssh/patches/patch-sftp-common.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-sftp-common.c,v 1.4 2016/01/18 12:53:26 jperkin Exp $ - -Include for strmode(3). - ---- sftp-common.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ sftp-common.c -@@ -37,6 +37,9 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H -+#include -+#endif - #ifdef HAVE_UTIL_H - #include - #endif diff --git a/openssh/patches/patch-sshd.8 b/openssh/patches/patch-sshd.8 deleted file mode 100644 index 085accf98c..0000000000 --- a/openssh/patches/patch-sshd.8 +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-sshd.8,v 1.2 2016/01/18 12:53:26 jperkin Exp $ - -* Revive tcp_wrappers support. - ---- sshd.8.orig 2015-08-21 04:49:03.000000000 +0000 -+++ sshd.8 -@@ -850,6 +850,12 @@ the user's home directory becomes access - This file should be writable only by the user, and need not be - readable by anyone else. - .Pp -+.It Pa /etc/hosts.allow -+.It Pa /etc/hosts.deny -+Access controls that should be enforced by tcp-wrappers are defined here. -+Further details are described in -+.Xr hosts_access 5 . -+.Pp - .It Pa /etc/hosts.equiv - This file is for host-based authentication (see - .Xr ssh 1 ) . -@@ -953,6 +959,7 @@ The content of this file is not sensitiv - .Xr ssh-keygen 1 , - .Xr ssh-keyscan 1 , - .Xr chroot 2 , -+.Xr hosts_access 5 , - .Xr login.conf 5 , - .Xr moduli 5 , - .Xr sshd_config 5 , diff --git a/openssh/patches/patch-sshd.c b/openssh/patches/patch-sshd.c deleted file mode 100644 index 0057a5b93f..0000000000 --- a/openssh/patches/patch-sshd.c +++ /dev/null @@ -1,130 +0,0 @@ -$NetBSD: patch-sshd.c,v 1.6 2016/01/18 12:53:26 jperkin Exp $ - -* Interix support -* Revive tcp_wrappers support. - ---- sshd.c.orig 2016-03-09 18:04:48.000000000 +0000 -+++ sshd.c -@@ -125,6 +125,13 @@ - #include "version.h" - #include "ssherr.h" - -+#ifdef LIBWRAP -+#include -+#include -+int allow_severity; -+int deny_severity; -+#endif /* LIBWRAP */ -+ - #ifndef O_NOCTTY - #define O_NOCTTY 0 - #endif -@@ -236,7 +243,11 @@ int *startup_pipes = NULL; - int startup_pipe; /* in child */ - - /* variables used for privilege separation */ -+#ifdef HAVE_INTERIX -+int use_privsep = 0; -+#else - int use_privsep = -1; -+#endif - struct monitor *pmonitor = NULL; - int privsep_is_preauth = 1; - -@@ -643,6 +654,10 @@ privsep_preauth_child(void) - /* Drop our privileges */ - debug3("privsep user:group %u:%u", (u_int)privsep_pw->pw_uid, - (u_int)privsep_pw->pw_gid); -+#ifdef HAVE_INTERIX -+ if (setuser(privsep_pw->pw_name, NULL, SU_COMPLETE)) -+ fatal("setuser: %.100s", strerror(errno)); -+#endif - gidset[0] = privsep_pw->pw_gid; - if (setgroups(1, gidset) < 0) - fatal("setgroups: %.100s", strerror(errno)); -@@ -712,11 +727,17 @@ privsep_preauth(Authctxt *authctxt) - - /* Arrange for logging to be sent to the monitor */ - set_log_handler(mm_log_handler, pmonitor); -- -+#ifdef __APPLE_SANDBOX_NAMED_EXTERNAL_ -+ /* We need to do this before we chroot() so we can read sshd.sb */ -+ if (box != NULL) -+ ssh_sandbox_child(box);_ -+#endif - privsep_preauth_child(); - setproctitle("%s", "[net]"); -+#ifndef __APPLE_SANDBOX_NAMED_EXTERNAL__ - if (box != NULL) - ssh_sandbox_child(box); -+#endif - - return 0; - } -@@ -730,7 +751,7 @@ privsep_postauth(Authctxt *authctxt) - #ifdef DISABLE_FD_PASSING - if (1) { - #else -- if (authctxt->pw->pw_uid == 0 || options.use_login) { -+ if (authctxt->pw->pw_uid == ROOTUID || options.use_login) { - #endif - /* File descriptor passing is broken or root login */ - use_privsep = 0; -@@ -1497,8 +1518,10 @@ main(int ac, char **av) - av = saved_argv; - #endif - -- if (geteuid() == 0 && setgroups(0, NULL) == -1) -+#ifndef HAVE_INTERIX -+ if (geteuid() == ROOTUID && setgroups(0, NULL) == -1) - debug("setgroups(): %.200s", strerror(errno)); -+#endif - - /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ - sanitise_stdfd(); -@@ -1925,7 +1948,7 @@ main(int ac, char **av) - (st.st_uid != getuid () || - (st.st_mode & (S_IWGRP|S_IWOTH)) != 0)) - #else -- if (st.st_uid != 0 || (st.st_mode & (S_IWGRP|S_IWOTH)) != 0) -+ if (st.st_uid != ROOTUID || (st.st_mode & (S_IWGRP|S_IWOTH)) != 0) - #endif - fatal("%s must be owned by root and not group or " - "world-writable.", _PATH_PRIVSEP_CHROOT_DIR); -@@ -1948,8 +1971,10 @@ main(int ac, char **av) - * to create a file, and we can't control the code in every - * module which might be used). - */ -+#ifndef HAVE_INTERIX - if (setgroups(0, NULL) < 0) - debug("setgroups() failed: %.200s", strerror(errno)); -+#endif - - if (rexec_flag) { - rexec_argv = xcalloc(rexec_argc + 2, sizeof(char *)); -@@ -2145,6 +2170,25 @@ main(int ac, char **av) - audit_connection_from(remote_ip, remote_port); - #endif - -+#ifdef LIBWRAP -+ allow_severity = options.log_facility|LOG_INFO; -+ deny_severity = options.log_facility|LOG_WARNING; -+ /* Check whether logins are denied from this host. */ -+ if (packet_connection_is_on_socket()) { -+ struct request_info req; -+ -+ request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0); -+ fromhost(&req); -+ -+ if (!hosts_access(&req)) { -+ debug("Connection refused by tcp wrapper"); -+ refuse(&req); -+ /* NOTREACHED */ -+ fatal("libwrap refuse returns"); -+ } -+ } -+#endif /* LIBWRAP */ -+ - /* Log the connection. */ - laddr = get_local_ipaddr(sock_in); - verbose("Connection from %s port %d on %s port %d", diff --git a/openssh/patches/patch-sshpty.c b/openssh/patches/patch-sshpty.c deleted file mode 100644 index c96ba181fe..0000000000 --- a/openssh/patches/patch-sshpty.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-sshpty.c,v 1.3 2016/01/18 12:53:26 jperkin Exp $ - -Replace uid 0 with ROOTUID macro - ---- sshpty.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ sshpty.c -@@ -86,7 +86,7 @@ void - pty_release(const char *tty) - { - #if !defined(__APPLE_PRIVPTY__) && !defined(HAVE_OPENPTY) -- if (chown(tty, (uid_t) 0, (gid_t) 0) < 0) -+ if (chown(tty, (uid_t) ROOTUID, (gid_t) ROOTGID) < 0) - error("chown %.100s 0 0 failed: %.100s", tty, strerror(errno)); - if (chmod(tty, (mode_t) 0666) < 0) - error("chmod %.100s 0666 failed: %.100s", tty, strerror(errno)); -@@ -215,7 +215,7 @@ pty_setowner(struct passwd *pw, const ch - if (st.st_uid != pw->pw_uid || st.st_gid != gid) { - if (chown(tty, pw->pw_uid, gid) < 0) { - if (errno == EROFS && -- (st.st_uid == pw->pw_uid || st.st_uid == 0)) -+ (st.st_uid == pw->pw_uid || st.st_uid == ROOTUID)) - debug("chown(%.100s, %u, %u) failed: %.100s", - tty, (u_int)pw->pw_uid, (u_int)gid, - strerror(errno)); diff --git a/openssh/patches/patch-uidswap.c b/openssh/patches/patch-uidswap.c deleted file mode 100644 index 3b623b8b8e..0000000000 --- a/openssh/patches/patch-uidswap.c +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-uidswap.c,v 1.5 2016/01/18 12:53:26 jperkin Exp $ - -Interix support - ---- uidswap.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ uidswap.c -@@ -67,13 +67,13 @@ temporarily_use_uid(struct passwd *pw) - (u_int)pw->pw_uid, (u_int)pw->pw_gid, - (u_int)saved_euid, (u_int)saved_egid); - #ifndef HAVE_CYGWIN -- if (saved_euid != 0) { -+ if (saved_euid != ROOTUID) { - privileged = 0; - return; - } - #endif - #else -- if (geteuid() != 0) { -+ if (geteuid() != ROOTUID) { - privileged = 0; - return; - } -@@ -96,9 +96,11 @@ temporarily_use_uid(struct passwd *pw) - - /* set and save the user's groups */ - if (user_groupslen == -1) { -+#ifndef HAVE_INTERIX - if (initgroups(pw->pw_name, pw->pw_gid) < 0) - fatal("initgroups: %s: %.100s", pw->pw_name, - strerror(errno)); -+#endif - - user_groupslen = getgroups(0, NULL); - if (user_groupslen < 0) -@@ -112,9 +114,11 @@ temporarily_use_uid(struct passwd *pw) - free(user_groups); - } - } -+#ifndef HAVE_INTERIX - /* Set the effective uid to the given (unprivileged) uid. */ - if (setgroups(user_groupslen, user_groups) < 0) - fatal("setgroups: %.100s", strerror(errno)); -+#endif - #ifndef SAVED_IDS_WORK_WITH_SETEUID - /* Propagate the privileged gid to all of our gids. */ - if (setgid(getegid()) < 0) -@@ -187,8 +191,10 @@ restore_uid(void) - setgid(getgid()); - #endif /* SAVED_IDS_WORK_WITH_SETEUID */ - -+#ifndef HAVE_INTERIX - if (setgroups(saved_egroupslen, saved_egroups) < 0) - fatal("setgroups: %.100s", strerror(errno)); -+#endif - temporarily_use_uid_effective = 0; - } - -@@ -211,6 +217,10 @@ permanently_set_uid(struct passwd *pw) - debug("permanently_set_uid: %u/%u", (u_int)pw->pw_uid, - (u_int)pw->pw_gid); - -+#if defined(HAVE_INTERIX) -+ if (setuser(pw->pw_name, NULL, SU_COMPLETE)) -+ fatal("setuser %u: %.100s", (u_int)pw->pw_gid, strerror(errno)); -+#else - if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) < 0) - fatal("setresgid %u: %.100s", (u_int)pw->pw_gid, strerror(errno)); - -@@ -247,6 +257,7 @@ permanently_set_uid(struct passwd *pw) - (setuid(old_uid) != -1 || seteuid(old_uid) != -1)) - fatal("%s: was able to restore old [e]uid", __func__); - #endif -+#endif /* HAVE_INTERIX */ - - /* Verify UID drop was successful */ - if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) { diff --git a/osg/DESCR b/osg/DESCR deleted file mode 100644 index 1c71b14ddd..0000000000 --- a/osg/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -The OpenSceneGraph is an open source high performance 3D graphics toolkit, used -by application developers in fields such as visual simulation, games, virtual -reality, scientific visualization and modelling. Written entirely in Standard -C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, -HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well -established as the world leading scene graph technology, used widely in the -vis-sim, space, scientific, oil-gas, games and virtual reality industries. diff --git a/osg/Makefile b/osg/Makefile deleted file mode 100644 index 64569ea7d1..0000000000 --- a/osg/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# $NetBSD: Makefile,v 1.55 2015/06/30 09:57:36 ryoon Exp $ - -DISTNAME= osg-3.4.1 -CATEGORIES= graphics devel -MASTER_SITES= ${MASTER_SITE_GITHUB:=openscenegraph/} -GITHUB_PROJECT= OpenSceneGraph -GITHUB_TAG= OpenSceneGraph-${PKGVERSION_NOREV} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.openscenegraph.org/ -COMMENT= High performance 3D graphics toolkit -LICENSE= gnu-lgpl-v2.1 - -USE_CMAKE= yes -USE_LANGUAGES= c c++ -USE_TOOLS+= pkg-config -PKGCONFIG_OVERRIDE= packaging/pkgconfig/openscenegraph.pc.in -PKGCONFIG_OVERRIDE+= packaging/pkgconfig/openthreads.pc.in - -CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Xine=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_RSVG=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Poppler-glib=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SDL=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE -CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=TRUE -CMAKE_ARGS+= -DOSG_USE_QT:BOOL=OFF - -CXXFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS - -PLIST_VARS+= quartz x11 - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Darwin" -PLIST.quartz= yes -.else -PLIST.x11= yes -.include "../../graphics/giflib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../multimedia/ffmpeg2/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXrandr/buildlink3.mk" -.endif - -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/osg/PLIST b/osg/PLIST deleted file mode 100644 index 130f3eff18..0000000000 --- a/osg/PLIST +++ /dev/null @@ -1,769 +0,0 @@ -@comment $NetBSD$ -bin/osgarchive -bin/osgconv -bin/osgfilecache -bin/osgversion -bin/osgviewer -bin/present3D -include/OpenThreads/Atomic -include/OpenThreads/Barrier -include/OpenThreads/Block -include/OpenThreads/Condition -include/OpenThreads/Config -include/OpenThreads/Exports -include/OpenThreads/Mutex -include/OpenThreads/ReadWriteMutex -include/OpenThreads/ReentrantMutex -include/OpenThreads/ScopedLock -include/OpenThreads/Thread -include/OpenThreads/Version -include/osg/AlphaFunc -include/osg/AnimationPath -include/osg/ApplicationUsage -include/osg/ArgumentParser -include/osg/Array -include/osg/ArrayDispatchers -include/osg/AudioStream -include/osg/AutoTransform -include/osg/Billboard -include/osg/BlendColor -include/osg/BlendEquation -include/osg/BlendEquationi -include/osg/BlendFunc -include/osg/BlendFunci -include/osg/BoundingBox -include/osg/BoundingSphere -include/osg/BoundsChecking -include/osg/BufferIndexBinding -include/osg/BufferObject -include/osg/BufferTemplate -include/osg/Callback -include/osg/Camera -include/osg/CameraView -include/osg/Capability -include/osg/ClampColor -include/osg/ClearNode -include/osg/ClipControl -include/osg/ClipNode -include/osg/ClipPlane -include/osg/ClusterCullingCallback -include/osg/CollectOccludersVisitor -include/osg/ColorMask -include/osg/ColorMaski -include/osg/ColorMatrix -include/osg/ComputeBoundsVisitor -include/osg/Config -include/osg/ConvexPlanarOccluder -include/osg/ConvexPlanarPolygon -include/osg/CoordinateSystemNode -include/osg/CopyOp -include/osg/CullFace -include/osg/CullSettings -include/osg/CullStack -include/osg/CullingSet -include/osg/DeleteHandler -include/osg/Depth -include/osg/DisplaySettings -include/osg/DrawPixels -include/osg/Drawable -include/osg/Endian -include/osg/Export -include/osg/Fog -include/osg/FragmentProgram -include/osg/FrameBufferObject -include/osg/FrameStamp -include/osg/FrontFace -include/osg/GL -include/osg/GL2Extensions -include/osg/GLBeginEndAdapter -include/osg/GLDefines -include/osg/GLExtensions -include/osg/GLObjects -include/osg/GLU -include/osg/Geode -include/osg/Geometry -include/osg/GraphicsContext -include/osg/GraphicsCostEstimator -include/osg/GraphicsThread -include/osg/Group -include/osg/Hint -include/osg/Image -include/osg/ImageSequence -include/osg/ImageStream -include/osg/ImageUtils -include/osg/KdTree -include/osg/LOD -include/osg/Light -include/osg/LightModel -include/osg/LightSource -include/osg/LineSegment -include/osg/LineStipple -include/osg/LineWidth -include/osg/LogicOp -include/osg/Material -include/osg/Math -include/osg/Matrix -include/osg/MatrixTransform -include/osg/Matrixd -include/osg/Matrixf -include/osg/MixinVector -include/osg/Multisample -include/osg/Node -include/osg/NodeCallback -include/osg/NodeTrackerCallback -include/osg/NodeVisitor -include/osg/Notify -include/osg/Object -include/osg/Observer -include/osg/ObserverNodePath -include/osg/OccluderNode -include/osg/OcclusionQueryNode -include/osg/OperationThread -include/osg/PagedLOD -include/osg/PatchParameter -include/osg/Plane -include/osg/Point -include/osg/PointSprite -include/osg/PolygonMode -include/osg/PolygonOffset -include/osg/PolygonStipple -include/osg/Polytope -include/osg/PositionAttitudeTransform -include/osg/PrimitiveRestartIndex -include/osg/PrimitiveSet -include/osg/Program -include/osg/Projection -include/osg/ProxyNode -include/osg/Quat -include/osg/Referenced -include/osg/RenderInfo -include/osg/SampleMaski -include/osg/Scissor -include/osg/ScriptEngine -include/osg/Sequence -include/osg/ShadeModel -include/osg/Shader -include/osg/ShaderAttribute -include/osg/ShaderComposer -include/osg/ShadowVolumeOccluder -include/osg/Shape -include/osg/ShapeDrawable -include/osg/State -include/osg/StateAttribute -include/osg/StateAttributeCallback -include/osg/StateSet -include/osg/Stats -include/osg/Stencil -include/osg/StencilTwoSided -include/osg/Switch -include/osg/TemplatePrimitiveFunctor -include/osg/TexEnv -include/osg/TexEnvCombine -include/osg/TexEnvFilter -include/osg/TexGen -include/osg/TexGenNode -include/osg/TexMat -include/osg/Texture -include/osg/Texture1D -include/osg/Texture2D -include/osg/Texture2DArray -include/osg/Texture2DMultisample -include/osg/Texture3D -include/osg/TextureBuffer -include/osg/TextureCubeMap -include/osg/TextureRectangle -include/osg/Timer -include/osg/TransferFunction -include/osg/Transform -include/osg/TriangleFunctor -include/osg/TriangleIndexFunctor -include/osg/TriangleLinePointIndexFunctor -include/osg/Types -include/osg/Uniform -include/osg/UserDataContainer -include/osg/ValueObject -include/osg/Vec2 -include/osg/Vec2b -include/osg/Vec2d -include/osg/Vec2f -include/osg/Vec2i -include/osg/Vec2s -include/osg/Vec2ub -include/osg/Vec2ui -include/osg/Vec2us -include/osg/Vec3 -include/osg/Vec3b -include/osg/Vec3d -include/osg/Vec3f -include/osg/Vec3i -include/osg/Vec3s -include/osg/Vec3ub -include/osg/Vec3ui -include/osg/Vec3us -include/osg/Vec4 -include/osg/Vec4b -include/osg/Vec4d -include/osg/Vec4f -include/osg/Vec4i -include/osg/Vec4s -include/osg/Vec4ub -include/osg/Vec4ui -include/osg/Vec4us -include/osg/Version -include/osg/VertexAttribDivisor -include/osg/VertexProgram -include/osg/View -include/osg/Viewport -include/osg/buffered_value -include/osg/fast_back_stack -include/osg/io_utils -include/osg/observer_ptr -include/osg/ref_ptr -include/osgAnimation/Action -include/osgAnimation/ActionAnimation -include/osgAnimation/ActionBlendIn -include/osgAnimation/ActionBlendOut -include/osgAnimation/ActionCallback -include/osgAnimation/ActionStripAnimation -include/osgAnimation/ActionVisitor -include/osgAnimation/Animation -include/osgAnimation/AnimationManagerBase -include/osgAnimation/AnimationUpdateCallback -include/osgAnimation/BasicAnimationManager -include/osgAnimation/Bone -include/osgAnimation/BoneMapVisitor -include/osgAnimation/Channel -include/osgAnimation/CubicBezier -include/osgAnimation/EaseMotion -include/osgAnimation/Export -include/osgAnimation/FrameAction -include/osgAnimation/Interpolator -include/osgAnimation/Keyframe -include/osgAnimation/LinkVisitor -include/osgAnimation/MorphGeometry -include/osgAnimation/RigGeometry -include/osgAnimation/RigTransform -include/osgAnimation/RigTransformHardware -include/osgAnimation/RigTransformSoftware -include/osgAnimation/Sampler -include/osgAnimation/Skeleton -include/osgAnimation/StackedMatrixElement -include/osgAnimation/StackedQuaternionElement -include/osgAnimation/StackedRotateAxisElement -include/osgAnimation/StackedScaleElement -include/osgAnimation/StackedTransform -include/osgAnimation/StackedTransformElement -include/osgAnimation/StackedTranslateElement -include/osgAnimation/StatsHandler -include/osgAnimation/StatsVisitor -include/osgAnimation/Target -include/osgAnimation/Timeline -include/osgAnimation/TimelineAnimationManager -include/osgAnimation/UpdateBone -include/osgAnimation/UpdateMaterial -include/osgAnimation/UpdateMatrixTransform -include/osgAnimation/UpdateUniform -include/osgAnimation/Vec3Packed -include/osgAnimation/VertexInfluence -include/osgDB/Archive -include/osgDB/AuthenticationMap -include/osgDB/Callbacks -include/osgDB/ClassInterface -include/osgDB/ConvertBase64 -include/osgDB/ConvertUTF -include/osgDB/DataTypes -include/osgDB/DatabasePager -include/osgDB/DatabaseRevisions -include/osgDB/DotOsgWrapper -include/osgDB/DynamicLibrary -include/osgDB/Export -include/osgDB/ExternalFileWriter -include/osgDB/FileCache -include/osgDB/FileNameUtils -include/osgDB/FileUtils -include/osgDB/ImageOptions -include/osgDB/ImagePager -include/osgDB/ImageProcessor -include/osgDB/Input -include/osgDB/InputStream -include/osgDB/ObjectCache -include/osgDB/ObjectWrapper -include/osgDB/Options -include/osgDB/Output -include/osgDB/OutputStream -include/osgDB/ParameterOutput -include/osgDB/PluginQuery -include/osgDB/ReadFile -include/osgDB/ReaderWriter -include/osgDB/Registry -include/osgDB/Serializer -include/osgDB/SharedStateManager -include/osgDB/StreamOperator -include/osgDB/Version -include/osgDB/WriteFile -include/osgDB/XmlParser -include/osgDB/fstream -include/osgFX/AnisotropicLighting -include/osgFX/BumpMapping -include/osgFX/Cartoon -include/osgFX/Effect -include/osgFX/Export -include/osgFX/MultiTextureControl -include/osgFX/Outline -include/osgFX/Registry -include/osgFX/Scribe -include/osgFX/SpecularHighlights -include/osgFX/Technique -include/osgFX/Validator -include/osgFX/Version -include/osgGA/AnimationPathManipulator -include/osgGA/CameraManipulator -include/osgGA/CameraViewSwitchManipulator -include/osgGA/Device -include/osgGA/DriveManipulator -include/osgGA/Event -include/osgGA/EventHandler -include/osgGA/EventQueue -include/osgGA/EventVisitor -include/osgGA/Export -include/osgGA/FirstPersonManipulator -include/osgGA/FlightManipulator -include/osgGA/GUIActionAdapter -include/osgGA/GUIEventAdapter -include/osgGA/GUIEventHandler -include/osgGA/KeySwitchMatrixManipulator -include/osgGA/MultiTouchTrackballManipulator -include/osgGA/NodeTrackerManipulator -include/osgGA/OrbitManipulator -include/osgGA/SphericalManipulator -include/osgGA/StandardManipulator -include/osgGA/StateSetManipulator -include/osgGA/TerrainManipulator -include/osgGA/TrackballManipulator -include/osgGA/UFOManipulator -include/osgGA/Version -include/osgGA/Widget -include/osgManipulator/AntiSquish -include/osgManipulator/Command -include/osgManipulator/CommandManager -include/osgManipulator/Constraint -include/osgManipulator/Dragger -include/osgManipulator/Export -include/osgManipulator/Projector -include/osgManipulator/RotateCylinderDragger -include/osgManipulator/RotateSphereDragger -include/osgManipulator/Scale1DDragger -include/osgManipulator/Scale2DDragger -include/osgManipulator/ScaleAxisDragger -include/osgManipulator/Selection -include/osgManipulator/TabBoxDragger -include/osgManipulator/TabBoxTrackballDragger -include/osgManipulator/TabPlaneDragger -include/osgManipulator/TabPlaneTrackballDragger -include/osgManipulator/TrackballDragger -include/osgManipulator/Translate1DDragger -include/osgManipulator/Translate2DDragger -include/osgManipulator/TranslateAxisDragger -include/osgManipulator/TranslatePlaneDragger -include/osgManipulator/Version -include/osgParticle/AccelOperator -include/osgParticle/AngularAccelOperator -include/osgParticle/AngularDampingOperator -include/osgParticle/BounceOperator -include/osgParticle/BoxPlacer -include/osgParticle/CenteredPlacer -include/osgParticle/CompositePlacer -include/osgParticle/ConnectedParticleSystem -include/osgParticle/ConstantRateCounter -include/osgParticle/Counter -include/osgParticle/DampingOperator -include/osgParticle/DomainOperator -include/osgParticle/Emitter -include/osgParticle/ExplosionDebrisEffect -include/osgParticle/ExplosionEffect -include/osgParticle/ExplosionOperator -include/osgParticle/Export -include/osgParticle/FireEffect -include/osgParticle/FluidFrictionOperator -include/osgParticle/FluidProgram -include/osgParticle/ForceOperator -include/osgParticle/Interpolator -include/osgParticle/LinearInterpolator -include/osgParticle/ModularEmitter -include/osgParticle/ModularProgram -include/osgParticle/MultiSegmentPlacer -include/osgParticle/Operator -include/osgParticle/OrbitOperator -include/osgParticle/Particle -include/osgParticle/ParticleEffect -include/osgParticle/ParticleProcessor -include/osgParticle/ParticleSystem -include/osgParticle/ParticleSystemUpdater -include/osgParticle/Placer -include/osgParticle/PointPlacer -include/osgParticle/PrecipitationEffect -include/osgParticle/Program -include/osgParticle/RadialShooter -include/osgParticle/RandomRateCounter -include/osgParticle/SectorPlacer -include/osgParticle/SegmentPlacer -include/osgParticle/Shooter -include/osgParticle/SinkOperator -include/osgParticle/SmokeEffect -include/osgParticle/SmokeTrailEffect -include/osgParticle/VariableRateCounter -include/osgParticle/Version -include/osgParticle/range -include/osgPresentation/AnimationMaterial -include/osgPresentation/CompileSlideCallback -include/osgPresentation/Cursor -include/osgPresentation/Export -include/osgPresentation/KeyEventHandler -include/osgPresentation/PickEventHandler -include/osgPresentation/PropertyManager -include/osgPresentation/SlideEventHandler -include/osgPresentation/SlideShowConstructor -include/osgPresentation/Timeout -include/osgShadow/ConvexPolyhedron -include/osgShadow/DebugShadowMap -include/osgShadow/Export -include/osgShadow/LightSpacePerspectiveShadowMap -include/osgShadow/MinimalCullBoundsShadowMap -include/osgShadow/MinimalDrawBoundsShadowMap -include/osgShadow/MinimalShadowMap -include/osgShadow/OccluderGeometry -include/osgShadow/ParallelSplitShadowMap -include/osgShadow/ProjectionShadowMap -include/osgShadow/ShadowMap -include/osgShadow/ShadowSettings -include/osgShadow/ShadowTechnique -include/osgShadow/ShadowTexture -include/osgShadow/ShadowVolume -include/osgShadow/ShadowedScene -include/osgShadow/SoftShadowMap -include/osgShadow/StandardShadowMap -include/osgShadow/Version -include/osgShadow/ViewDependentShadowMap -include/osgShadow/ViewDependentShadowTechnique -include/osgSim/BlinkSequence -include/osgSim/ColorRange -include/osgSim/DOFTransform -include/osgSim/ElevationSlice -include/osgSim/Export -include/osgSim/GeographicLocation -include/osgSim/HeightAboveTerrain -include/osgSim/Impostor -include/osgSim/ImpostorSprite -include/osgSim/InsertImpostorsVisitor -include/osgSim/LightPoint -include/osgSim/LightPointNode -include/osgSim/LightPointSystem -include/osgSim/LineOfSight -include/osgSim/MultiSwitch -include/osgSim/ObjectRecordData -include/osgSim/OverlayNode -include/osgSim/ScalarBar -include/osgSim/ScalarsToColors -include/osgSim/Sector -include/osgSim/ShapeAttribute -include/osgSim/SphereSegment -include/osgSim/Version -include/osgSim/VisibilityGroup -include/osgTerrain/DisplacementMappingTechnique -include/osgTerrain/Export -include/osgTerrain/GeometryPool -include/osgTerrain/GeometryTechnique -include/osgTerrain/Layer -include/osgTerrain/Locator -include/osgTerrain/Terrain -include/osgTerrain/TerrainTechnique -include/osgTerrain/TerrainTile -include/osgTerrain/ValidDataOperator -include/osgTerrain/Version -include/osgText/Export -include/osgText/FadeText -include/osgText/Font -include/osgText/Font3D -include/osgText/Glyph -include/osgText/KerningType -include/osgText/String -include/osgText/Style -include/osgText/Text -include/osgText/Text3D -include/osgText/TextBase -include/osgText/Version -include/osgUI/AlignmentSettings -include/osgUI/Callbacks -include/osgUI/ColorPalette -include/osgUI/ComboBox -include/osgUI/Dialog -include/osgUI/Export -include/osgUI/FrameSettings -include/osgUI/Label -include/osgUI/LineEdit -include/osgUI/Popup -include/osgUI/PushButton -include/osgUI/Style -include/osgUI/TabWidget -include/osgUI/TextSettings -include/osgUI/Validator -include/osgUI/Widget -include/osgUtil/ConvertVec -include/osgUtil/CubeMapGenerator -include/osgUtil/CullVisitor -include/osgUtil/DelaunayTriangulator -include/osgUtil/DisplayRequirementsVisitor -include/osgUtil/DrawElementTypeSimplifier -include/osgUtil/EdgeCollector -include/osgUtil/Export -include/osgUtil/GLObjectsVisitor -include/osgUtil/HalfWayMapGenerator -include/osgUtil/HighlightMapGenerator -include/osgUtil/IncrementalCompileOperation -include/osgUtil/IntersectVisitor -include/osgUtil/IntersectionVisitor -include/osgUtil/LineSegmentIntersector -include/osgUtil/MeshOptimizers -include/osgUtil/OperationArrayFunctor -include/osgUtil/Optimizer -include/osgUtil/PerlinNoise -include/osgUtil/PlaneIntersector -include/osgUtil/PolytopeIntersector -include/osgUtil/PositionalStateContainer -include/osgUtil/PrintVisitor -include/osgUtil/RayIntersector -include/osgUtil/ReflectionMapGenerator -include/osgUtil/RenderBin -include/osgUtil/RenderLeaf -include/osgUtil/RenderStage -include/osgUtil/ReversePrimitiveFunctor -include/osgUtil/SceneGraphBuilder -include/osgUtil/SceneView -include/osgUtil/ShaderGen -include/osgUtil/Simplifier -include/osgUtil/SmoothingVisitor -include/osgUtil/StateGraph -include/osgUtil/Statistics -include/osgUtil/TangentSpaceGenerator -include/osgUtil/Tessellator -include/osgUtil/TransformAttributeFunctor -include/osgUtil/TransformCallback -include/osgUtil/TriStripVisitor -include/osgUtil/UpdateVisitor -include/osgUtil/Version -include/osgViewer/CompositeViewer -include/osgViewer/Export -include/osgViewer/GraphicsWindow -include/osgViewer/Keystone -include/osgViewer/Renderer -include/osgViewer/Scene -include/osgViewer/Version -include/osgViewer/View -include/osgViewer/Viewer -include/osgViewer/ViewerBase -include/osgViewer/ViewerEventHandlers -include/osgViewer/api/X11/GraphicsHandleX11 -include/osgViewer/api/X11/GraphicsWindowX11 -include/osgViewer/api/X11/PixelBufferX11 -include/osgViewer/config/AcrossAllScreens -include/osgViewer/config/PanoramicSphericalDisplay -include/osgViewer/config/SingleScreen -include/osgViewer/config/SingleWindow -include/osgViewer/config/SphericalDisplay -include/osgViewer/config/WoWVxDisplay -include/osgVolume/Export -include/osgVolume/FixedFunctionTechnique -include/osgVolume/Layer -include/osgVolume/Locator -include/osgVolume/MultipassTechnique -include/osgVolume/Property -include/osgVolume/RayTracedTechnique -include/osgVolume/Version -include/osgVolume/Volume -include/osgVolume/VolumeScene -include/osgVolume/VolumeSettings -include/osgVolume/VolumeTechnique -include/osgVolume/VolumeTile -include/osgWidget/Box -include/osgWidget/Browser -include/osgWidget/Canvas -include/osgWidget/EventInterface -include/osgWidget/Export -include/osgWidget/Frame -include/osgWidget/Input -include/osgWidget/Label -include/osgWidget/Lua -include/osgWidget/PdfReader -include/osgWidget/Python -include/osgWidget/ScriptEngine -include/osgWidget/StyleInterface -include/osgWidget/StyleManager -include/osgWidget/Table -include/osgWidget/Types -include/osgWidget/UIObjectParent -include/osgWidget/Util -include/osgWidget/Version -include/osgWidget/ViewerEventHandlers -include/osgWidget/VncClient -include/osgWidget/Widget -include/osgWidget/Window -include/osgWidget/WindowManager -lib/libOpenThreads.so -lib/libOpenThreads.so.20 -lib/libOpenThreads.so.3.3.0 -lib/libosg.so -lib/libosg.so.131 -lib/libosg.so.${PKGVERSION} -lib/libosgAnimation.so -lib/libosgAnimation.so.131 -lib/libosgAnimation.so.${PKGVERSION} -lib/libosgDB.so -lib/libosgDB.so.131 -lib/libosgDB.so.${PKGVERSION} -lib/libosgFX.so -lib/libosgFX.so.131 -lib/libosgFX.so.${PKGVERSION} -lib/libosgGA.so -lib/libosgGA.so.131 -lib/libosgGA.so.${PKGVERSION} -lib/libosgManipulator.so -lib/libosgManipulator.so.131 -lib/libosgManipulator.so.${PKGVERSION} -lib/libosgParticle.so -lib/libosgParticle.so.131 -lib/libosgParticle.so.${PKGVERSION} -lib/libosgPresentation.so -lib/libosgPresentation.so.131 -lib/libosgPresentation.so.${PKGVERSION} -lib/libosgShadow.so -lib/libosgShadow.so.131 -lib/libosgShadow.so.${PKGVERSION} -lib/libosgSim.so -lib/libosgSim.so.131 -lib/libosgSim.so.${PKGVERSION} -lib/libosgTerrain.so -lib/libosgTerrain.so.131 -lib/libosgTerrain.so.${PKGVERSION} -lib/libosgText.so -lib/libosgText.so.131 -lib/libosgText.so.${PKGVERSION} -lib/libosgUI.so -lib/libosgUI.so.131 -lib/libosgUI.so.${PKGVERSION} -lib/libosgUtil.so -lib/libosgUtil.so.131 -lib/libosgUtil.so.${PKGVERSION} -lib/libosgViewer.so -lib/libosgViewer.so.131 -lib/libosgViewer.so.${PKGVERSION} -lib/libosgVolume.so -lib/libosgVolume.so.131 -lib/libosgVolume.so.${PKGVERSION} -lib/libosgWidget.so -lib/libosgWidget.so.131 -lib/libosgWidget.so.${PKGVERSION} -lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so -lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so -lib/osgPlugins-${PKGVERSION}/osgdb_ac.so -lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so -lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so -lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so -lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so -lib/osgPlugins-${PKGVERSION}/osgdb_dds.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osg.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osganimation.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgfx.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgparticle.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgshadow.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgsim.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgterrain.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgtext.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgviewer.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgvolume.so -lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgwidget.so -lib/osgPlugins-${PKGVERSION}/osgdb_dot.so -lib/osgPlugins-${PKGVERSION}/osgdb_dw.so -lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so -${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so -lib/osgPlugins-${PKGVERSION}/osgdb_freetype.so -${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_gif.so -lib/osgPlugins-${PKGVERSION}/osgdb_gles.so -lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so -lib/osgPlugins-${PKGVERSION}/osgdb_gz.so -lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so -${PLIST.quartz}lib/osgPlugins-${PKGVERSION}/osgdb_imageio.so -lib/osgPlugins-${PKGVERSION}/osgdb_ive.so -${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so -lib/osgPlugins-${PKGVERSION}/osgdb_ktx.so -lib/osgPlugins-${PKGVERSION}/osgdb_logo.so -lib/osgPlugins-${PKGVERSION}/osgdb_lua.so -lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so -lib/osgPlugins-${PKGVERSION}/osgdb_lws.so -lib/osgPlugins-${PKGVERSION}/osgdb_md2.so -lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so -lib/osgPlugins-${PKGVERSION}/osgdb_normals.so -lib/osgPlugins-${PKGVERSION}/osgdb_obj.so -lib/osgPlugins-${PKGVERSION}/osgdb_openflight.so -lib/osgPlugins-${PKGVERSION}/osgdb_osc.so -lib/osgPlugins-${PKGVERSION}/osgdb_osg.so -lib/osgPlugins-${PKGVERSION}/osgdb_osga.so -lib/osgPlugins-${PKGVERSION}/osgdb_osgjs.so -lib/osgPlugins-${PKGVERSION}/osgdb_osgshadow.so -lib/osgPlugins-${PKGVERSION}/osgdb_osgterrain.so -lib/osgPlugins-${PKGVERSION}/osgdb_osgtgz.so -lib/osgPlugins-${PKGVERSION}/osgdb_osgviewer.so -lib/osgPlugins-${PKGVERSION}/osgdb_p3d.so -lib/osgPlugins-${PKGVERSION}/osgdb_pic.so -lib/osgPlugins-${PKGVERSION}/osgdb_ply.so -${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_png.so -lib/osgPlugins-${PKGVERSION}/osgdb_pnm.so -lib/osgPlugins-${PKGVERSION}/osgdb_pov.so -lib/osgPlugins-${PKGVERSION}/osgdb_pvr.so -lib/osgPlugins-${PKGVERSION}/osgdb_revisions.so -lib/osgPlugins-${PKGVERSION}/osgdb_rgb.so -lib/osgPlugins-${PKGVERSION}/osgdb_rot.so -lib/osgPlugins-${PKGVERSION}/osgdb_scale.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osg.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osganimation.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgfx.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgga.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgmanipulator.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgparticle.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgshadow.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgsim.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgterrain.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgtext.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgui.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgutil.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgviewer.so -lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgvolume.so -lib/osgPlugins-${PKGVERSION}/osgdb_shp.so -lib/osgPlugins-${PKGVERSION}/osgdb_stl.so -lib/osgPlugins-${PKGVERSION}/osgdb_tf.so -lib/osgPlugins-${PKGVERSION}/osgdb_tga.so -lib/osgPlugins-${PKGVERSION}/osgdb_tgz.so -${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so -lib/osgPlugins-${PKGVERSION}/osgdb_trans.so -lib/osgPlugins-${PKGVERSION}/osgdb_trk.so -lib/osgPlugins-${PKGVERSION}/osgdb_txf.so -lib/osgPlugins-${PKGVERSION}/osgdb_txp.so -lib/osgPlugins-${PKGVERSION}/osgdb_vtf.so -lib/osgPlugins-${PKGVERSION}/osgdb_x.so -lib/osgPlugins-${PKGVERSION}/osgdb_zip.so -lib/pkgconfig/openscenegraph-osg.pc -lib/pkgconfig/openscenegraph-osgAnimation.pc -lib/pkgconfig/openscenegraph-osgDB.pc -lib/pkgconfig/openscenegraph-osgFX.pc -lib/pkgconfig/openscenegraph-osgGA.pc -lib/pkgconfig/openscenegraph-osgManipulator.pc -lib/pkgconfig/openscenegraph-osgParticle.pc -lib/pkgconfig/openscenegraph-osgShadow.pc -lib/pkgconfig/openscenegraph-osgSim.pc -lib/pkgconfig/openscenegraph-osgTerrain.pc -lib/pkgconfig/openscenegraph-osgText.pc -lib/pkgconfig/openscenegraph-osgUtil.pc -lib/pkgconfig/openscenegraph-osgViewer.pc -lib/pkgconfig/openscenegraph-osgVolume.pc -lib/pkgconfig/openscenegraph-osgWidget.pc -lib/pkgconfig/openscenegraph.pc -lib/pkgconfig/openthreads.pc diff --git a/osg/buildlink3.mk b/osg/buildlink3.mk deleted file mode 100644 index 744ca6d201..0000000000 --- a/osg/buildlink3.mk +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.40 2015/06/30 10:02:22 ryoon Exp $ - -BUILDLINK_TREE+= osg - -.if !defined(OSG_BUILDLINK3_MK) -OSG_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.osg+= osg>=2.8.3 -BUILDLINK_ABI_DEPENDS.osg+= osg>=3.0.1nb37 -BUILDLINK_PKGSRCDIR.osg?= ../../wip/osg - -.if ${OPSYS} != "Darwin" -.include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/giflib/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../multimedia/ffmpeg2/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXrandr/buildlink3.mk" -.endif -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" - -.endif # OSG_BUILDLINK3_MK - -BUILDLINK_TREE+= -osg diff --git a/osg/distinfo b/osg/distinfo deleted file mode 100644 index 5b40a48e82..0000000000 --- a/osg/distinfo +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 21:34:11 agc Exp $ - -SHA1 (osg-3.4.1.tar.gz) = 6fc56846f5790d85dd8139aecb958701f4f4e630 -RMD160 (osg-3.4.1.tar.gz) = 299ab7131433e7f36f0da10eb102014bce26ec83 -SHA512 (osg-3.4.1.tar.gz) = 4a65625e208d24256b5564bbe9d6f557758b51fae0acf85d1f71968a237fec299088536830fc862d25e02039de9ea13176b298a68aaa644eac958acbe1f4e143 -Size (osg-3.4.1.tar.gz) = 5686385 bytes -SHA1 (patch-CMakeModules_FindFFmpeg.cmake) = 42fecd77c2059b6157e5cab7734f7917a81a6a18 -SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b -SHA1 (patch-ad) = 909075cabe15541b182794b4fdf5baa038f07ed3 -SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8 -SHA1 (patch-applications_present3D_Cluster.cpp) = 1b05be4da6632356200192d8f5aa5f08270f68d8 -SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102 -SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = d8e9efa88898e240775ead76c5c9df4c86cd562c -SHA1 (patch-src_osg_GLExtensions.cpp) = 5fc04fa162c5cf8aa34ddfb0152092b02e8eec08 diff --git a/osg/patches/patch-CMakeModules_FindFFmpeg.cmake b/osg/patches/patch-CMakeModules_FindFFmpeg.cmake deleted file mode 100644 index 40acbb6aa4..0000000000 --- a/osg/patches/patch-CMakeModules_FindFFmpeg.cmake +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD$ - -Find ffmpeg from pkgsrc - ---- CMakeModules/FindFFmpeg.cmake.orig 2017-08-28 16:50:49.000000000 +0000 -+++ CMakeModules/FindFFmpeg.cmake -@@ -30,7 +30,7 @@ MACRO(FFMPEG_FIND varname shortname head - - FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername} - PATHS -- ${FFMPEG_ROOT}/include -+ ${FFMPEG_ROOT}/include/ffmpeg2 - $ENV{FFMPEG_DIR}/include - ${FFMPEG_ROOT} - $ENV{FFMPEG_DIR} -@@ -43,7 +43,7 @@ MACRO(FFMPEG_FIND varname shortname head - /opt/csw/include # Blastwave - /opt/include - /usr/freeware/include -- PATH_SUFFIXES ffmpeg -+ PATH_SUFFIXES ffmpeg2 - DOC "Location of FFMPEG Headers" - ) - -@@ -69,9 +69,9 @@ MACRO(FFMPEG_FIND varname shortname head - FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES - NAMES ${shortname} - PATHS -- ${FFMPEG_ROOT}/lib -+ ${FFMPEG_ROOT}/lib/ffmpeg2 - $ENV{FFMPEG_DIR}/lib -- ${FFMPEG_ROOT}/lib${shortname} -+ ${FFMPEG_ROOT}/lib/ffmpeg2${shortname} - $ENV{FFMPEG_DIR}/lib${shortname} - ~/Library/Frameworks - /Library/Frameworks -@@ -84,6 +84,7 @@ MACRO(FFMPEG_FIND varname shortname head - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -+ PATH_SUFFIXES ffmpeg2 - DOC "Location of FFMPEG Libraries" - ) - diff --git a/osg/patches/patch-ab b/osg/patches/patch-ab deleted file mode 100644 index 188790e057..0000000000 --- a/osg/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2012/03/07 16:27:35 adam Exp $ - -Support NetBSD. - ---- src/osgDB/FileUtils.cpp.orig 2015-06-01 13:40:20.000000000 +0000 -+++ src/osgDB/FileUtils.cpp -@@ -78,7 +78,7 @@ typedef char TCHAR; - #define stat64 stat - #endif - #elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ -- (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) -+ (defined(__hpux) || defined(__NetBSD__) && !defined(_LARGEFILE64_SOURCE)) - #define stat64 stat - #endif - diff --git a/osg/patches/patch-ad b/osg/patches/patch-ad deleted file mode 100644 index 5e449f00a4..0000000000 --- a/osg/patches/patch-ad +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 adam Exp $ - -Support NetBSD. - ---- src/OpenThreads/pthreads/PThread.cpp.orig 2015-04-07 18:01:12.000000000 +0000 -+++ src/OpenThreads/pthreads/PThread.cpp -@@ -135,6 +135,15 @@ private: - { - #if defined(__sgi) - pthread_setrunon_np( pd->cpunum ); -+#elif defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP) -+ cpuset_t *cset; -+ cset = cpuset_create(); -+ if (cset != NULL) -+ { -+ cpuset_set(pd->cpunum, cset); -+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset); -+ cpuset_destroy(cset); -+ } - #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) - cpu_set_t cpumask; - CPU_ZERO( &cpumask ); -@@ -592,6 +601,18 @@ int Thread::setProcessorAffinity(unsigne - status = pthread_attr_setscope( &thread_attr, PTHREAD_SCOPE_BOUND_NP ); - return status; - -+#elif defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP) -+ if (pd->isRunning() && Thread::CurrentThread()==this) -+ { -+ cpuset_t *cset; -+ cset = cpuset_create(); -+ if (cset != NULL) -+ { -+ cpuset_set(pd->cpunum, cset); -+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset); -+ cpuset_destroy(cset); -+ } -+ } - #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) - - if (pd->isRunning() && Thread::CurrentThread()==this) -@@ -1057,7 +1078,16 @@ int OpenThreads::SetProcessorAffinityOfC - } - else - { --#if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) -+#if defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP) -+ cpuset_t *cset; -+ cset = cpuset_create(); -+ if (cset != NULL) -+ { -+ cpuset_set(cpunum, cset); -+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset); -+ cpuset_destroy(cset); -+ } -+#elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) - cpu_set_t cpumask; - CPU_ZERO( &cpumask ); - CPU_SET( cpunum, &cpumask ); diff --git a/osg/patches/patch-ae b/osg/patches/patch-ae deleted file mode 100644 index 7c887353c1..0000000000 --- a/osg/patches/patch-ae +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2012/03/07 16:27:35 adam Exp $ - -PkgSrc does not use lib64. - ---- CMakeLists.txt.orig 2011-07-31 07:50:34.000000000 +0000 -+++ CMakeLists.txt -@@ -586,12 +586,6 @@ IF(CYGWIN) - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") - ENDIF() - --IF(UNIX AND NOT WIN32 AND NOT APPLE) -- IF(CMAKE_SIZEOF_VOID_P MATCHES "8") -- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") -- MARK_AS_ADVANCED(LIB_POSTFIX) -- ENDIF() --ENDIF() - IF(NOT DEFINED LIB_POSTFIX) - SET(LIB_POSTFIX "") - ENDIF() diff --git a/osg/patches/patch-applications_present3D_Cluster.cpp b/osg/patches/patch-applications_present3D_Cluster.cpp deleted file mode 100644 index ec12f2bc50..0000000000 --- a/osg/patches/patch-applications_present3D_Cluster.cpp +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD$ - -Support more platforms. - ---- applications/present3D/Cluster.cpp.orig 2017-08-28 16:50:49.000000000 +0000 -+++ applications/present3D/Cluster.cpp -@@ -33,7 +33,8 @@ - #if defined(__linux) - #include - #include --#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || \ -+ defined(__NetBSD__) || defined(__OpenBSD__) - #include - #include - #elif defined(__sgi) -@@ -340,7 +341,8 @@ void Receiver::sync( void ) - } - - #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \ -- defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) -+ defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \ -+ defined(__NetBSD__) || defined(__OpenBSD__) - socklen_t - #else - int diff --git a/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp b/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp deleted file mode 100644 index 954cdfae78..0000000000 --- a/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD$ - -ntohl(3) is defined in arpa/inet.h, not in netinet/in.h. - ---- src/osgPlugins/osc/ip/posix/NetworkingUtils.cpp.orig 2013-02-04 12:50:51.000000000 +0000 -+++ src/osgPlugins/osc/ip/posix/NetworkingUtils.cpp -@@ -29,8 +29,8 @@ - */ - #include "ip/NetworkingUtils.h" - -+#include - #include --#include - #include - #include - #include diff --git a/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h b/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h deleted file mode 100644 index 7c83c8c15d..0000000000 --- a/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD$ - -Configure endianness for osc plug-in. - ---- src/osgPlugins/osc/osc/OscHostEndianness.h.orig 2015-07-23 11:14:00.000000000 +0000 -+++ src/osgPlugins/osc/osc/OscHostEndianness.h -@@ -64,7 +64,7 @@ - #else - #error Unknown machine endianness detected. - #endif -- #elif defined(__FreeBSD__) -+ #elif defined(__FreeBSD__) || defined(__NetBSD__) - #include - #if (_BYTE_ORDER == _LITTLE_ENDIAN) - #ifndef __LITTLE_ENDIAN__ diff --git a/osg/patches/patch-src_osg_GLExtensions.cpp b/osg/patches/patch-src_osg_GLExtensions.cpp deleted file mode 100644 index 7ad2e95e96..0000000000 --- a/osg/patches/patch-src_osg_GLExtensions.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD$ - -Support NetBSD. - ---- src/osg/GLExtensions.cpp.orig 2017-04-03 10:44:31.000000000 +0000 -+++ src/osg/GLExtensions.cpp -@@ -378,7 +378,7 @@ OSG_INIT_SINGLETON_PROXY(GLExtensionDisa - static void *handle = dlopen((const char *)0L, RTLD_LAZY); - return dlsym(handle, funcName); - -- #elif defined (__FreeBSD__) -+ #elif defined (__FreeBSD__) || defined (__NetBSD__) - - return dlsym( RTLD_DEFAULT, funcName ); - diff --git a/simgear/DESCR b/simgear/DESCR deleted file mode 100644 index f5664619a7..0000000000 --- a/simgear/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -SimGear is a set of open-source libraries designed to be used as building -blocks for quickly assembling 3d simulations, games, and visualization -applications. diff --git a/simgear/Makefile b/simgear/Makefile deleted file mode 100644 index fc2b5fb64f..0000000000 --- a/simgear/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $NetBSD: Makefile,v 1.50 2015/06/30 09:57:36 ryoon Exp $ - -DISTNAME= simgear-3.4.0 -CATEGORIES= games devel -MASTER_SITES= ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \ - ftp://mirrors.ibiblio.org/simgear/ftp/Source/ \ - http://mirrors.ibiblio.org/simgear/ftp/Source/ \ - ftp://ftp.goflyflightgear.com/simgear/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://simgear.sourceforge.net/ -COMMENT= Simulator Construction Tools -LICENSE= gnu-lgpl-v2 - -USE_LANGUAGES= c c++ -USE_PKGLOCALEDIR= yes -USE_CMAKE= yes - -BUILDLINK_API_DEPENDS.plib+= plib>=1.8.5 - -.include "../../audio/freealut/buildlink3.mk" -.include "../../audio/openal-soft/buildlink3.mk" -.include "../../devel/boost-headers/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../games/plib/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../wip/osg/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/simgear/PLIST b/simgear/PLIST deleted file mode 100644 index 9ed1bdbb8e..0000000000 --- a/simgear/PLIST +++ /dev/null @@ -1,330 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2012/09/30 01:50:15 dholland Exp $ -include/simgear/3rdparty/utf8/utf8.h -include/simgear/3rdparty/utf8/utf8/checked.h -include/simgear/3rdparty/utf8/utf8/core.h -include/simgear/3rdparty/utf8/utf8/unchecked.h -include/simgear/bucket/newbucket.hxx -include/simgear/bvh/BVHBoundingBoxVisitor.hxx -include/simgear/bvh/BVHGroup.hxx -include/simgear/bvh/BVHLineGeometry.hxx -include/simgear/bvh/BVHLineSegmentVisitor.hxx -include/simgear/bvh/BVHMaterial.hxx -include/simgear/bvh/BVHMotionTransform.hxx -include/simgear/bvh/BVHNearestPointVisitor.hxx -include/simgear/bvh/BVHNode.hxx -include/simgear/bvh/BVHPageNode.hxx -include/simgear/bvh/BVHPageRequest.hxx -include/simgear/bvh/BVHPager.hxx -include/simgear/bvh/BVHStaticBinary.hxx -include/simgear/bvh/BVHStaticData.hxx -include/simgear/bvh/BVHStaticGeometry.hxx -include/simgear/bvh/BVHStaticGeometryBuilder.hxx -include/simgear/bvh/BVHStaticLeaf.hxx -include/simgear/bvh/BVHStaticNode.hxx -include/simgear/bvh/BVHStaticTriangle.hxx -include/simgear/bvh/BVHSubTreeCollector.hxx -include/simgear/bvh/BVHTransform.hxx -include/simgear/bvh/BVHVisitor.hxx -include/simgear/canvas/Canvas.hxx -include/simgear/canvas/CanvasEvent.hxx -include/simgear/canvas/CanvasEventManager.hxx -include/simgear/canvas/CanvasEventTypes.hxx -include/simgear/canvas/CanvasEventVisitor.hxx -include/simgear/canvas/CanvasMgr.hxx -include/simgear/canvas/CanvasObjectPlacement.hxx -include/simgear/canvas/CanvasPlacement.hxx -include/simgear/canvas/CanvasSystemAdapter.hxx -include/simgear/canvas/CanvasWindow.hxx -include/simgear/canvas/ODGauge.hxx -include/simgear/canvas/ShivaVG/openvg.h -include/simgear/canvas/ShivaVG/vgu.h -include/simgear/canvas/VGInitOperation.hxx -include/simgear/canvas/canvas_fwd.hxx -include/simgear/canvas/elements/CanvasElement.hxx -include/simgear/canvas/elements/CanvasGroup.hxx -include/simgear/canvas/elements/CanvasImage.hxx -include/simgear/canvas/elements/CanvasMap.hxx -include/simgear/canvas/elements/CanvasPath.hxx -include/simgear/canvas/elements/CanvasText.hxx -include/simgear/canvas/elements/detail/add_segment_variadic.hxx -include/simgear/canvas/events/CustomEvent.hxx -include/simgear/canvas/events/DeviceEvent.hxx -include/simgear/canvas/events/KeyboardEvent.hxx -include/simgear/canvas/events/MouseEvent.hxx -include/simgear/canvas/layout/AlignFlag_values.hxx -include/simgear/canvas/layout/BoxLayout.hxx -include/simgear/canvas/layout/Layout.hxx -include/simgear/canvas/layout/LayoutItem.hxx -include/simgear/canvas/layout/NasalWidget.hxx -include/simgear/canvas/layout/SpacerItem.hxx -include/simgear/compiler.h -include/simgear/constants.h -include/simgear/debug/BufferedLogCallback.hxx -include/simgear/debug/debug_types.h -include/simgear/debug/logstream.hxx -include/simgear/environment/metar.hxx -include/simgear/environment/precipitation.hxx -include/simgear/ephemeris/celestialBody.hxx -include/simgear/ephemeris/ephemeris.hxx -include/simgear/ephemeris/jupiter.hxx -include/simgear/ephemeris/mars.hxx -include/simgear/ephemeris/mercury.hxx -include/simgear/ephemeris/moonpos.hxx -include/simgear/ephemeris/neptune.hxx -include/simgear/ephemeris/pluto.hxx -include/simgear/ephemeris/saturn.hxx -include/simgear/ephemeris/star.hxx -include/simgear/ephemeris/stardata.hxx -include/simgear/ephemeris/uranus.hxx -include/simgear/ephemeris/venus.hxx -include/simgear/io/DAVMultiStatus.hxx -include/simgear/io/HTTPClient.hxx -include/simgear/io/HTTPContentDecode.hxx -include/simgear/io/HTTPFileRequest.hxx -include/simgear/io/HTTPMemoryRequest.hxx -include/simgear/io/HTTPRequest.hxx -include/simgear/io/SVNDirectory.hxx -include/simgear/io/SVNReportParser.hxx -include/simgear/io/SVNRepository.hxx -include/simgear/io/iochannel.hxx -include/simgear/io/lowlevel.hxx -include/simgear/io/raw_socket.hxx -include/simgear/io/sg_binobj.hxx -include/simgear/io/sg_file.hxx -include/simgear/io/sg_netBuffer.hxx -include/simgear/io/sg_netChannel.hxx -include/simgear/io/sg_netChat.hxx -include/simgear/io/sg_serial.hxx -include/simgear/io/sg_socket.hxx -include/simgear/io/sg_socket_udp.hxx -include/simgear/magvar/coremag.hxx -include/simgear/magvar/magvar.hxx -include/simgear/math/SGBox.hxx -include/simgear/math/SGCMath.hxx -include/simgear/math/SGGeoc.hxx -include/simgear/math/SGGeod.hxx -include/simgear/math/SGGeodesy.hxx -include/simgear/math/SGGeometry.hxx -include/simgear/math/SGGeometryFwd.hxx -include/simgear/math/SGIntersect.hxx -include/simgear/math/SGLimits.hxx -include/simgear/math/SGLineSegment.hxx -include/simgear/math/SGLocation.hxx -include/simgear/math/SGMath.hxx -include/simgear/math/SGMathFwd.hxx -include/simgear/math/SGMatrix.hxx -include/simgear/math/SGMisc.hxx -include/simgear/math/SGPlane.hxx -include/simgear/math/SGQuat.hxx -include/simgear/math/SGRay.hxx -include/simgear/math/SGRect.hxx -include/simgear/math/SGSphere.hxx -include/simgear/math/SGTriangle.hxx -include/simgear/math/SGVec2.hxx -include/simgear/math/SGVec3.hxx -include/simgear/math/SGVec4.hxx -include/simgear/math/beziercurve.hxx -include/simgear/math/interpolater.hxx -include/simgear/math/leastsqs.hxx -include/simgear/math/sg_geodesy.hxx -include/simgear/math/sg_random.h -include/simgear/math/sg_types.hxx -include/simgear/misc/CSSBorder.hxx -include/simgear/misc/ListDiff.hxx -include/simgear/misc/ResourceManager.hxx -include/simgear/misc/SVGpreserveAspectRatio.hxx -include/simgear/misc/SimpleMarkdown.hxx -include/simgear/misc/gzcontainerfile.hxx -include/simgear/misc/interpolator.hxx -include/simgear/misc/make_new.hxx -include/simgear/misc/sg_dir.hxx -include/simgear/misc/sg_path.hxx -include/simgear/misc/sgstream.hxx -include/simgear/misc/stdint.hxx -include/simgear/misc/stopwatch.hxx -include/simgear/misc/strutils.hxx -include/simgear/misc/tabbed_values.hxx -include/simgear/misc/texcoord.hxx -include/simgear/misc/zfstream.hxx -include/simgear/nasal/cppbind/Ghost.hxx -include/simgear/nasal/cppbind/NasalCallContext.hxx -include/simgear/nasal/cppbind/NasalContext.hxx -include/simgear/nasal/cppbind/NasalHash.hxx -include/simgear/nasal/cppbind/NasalObject.hxx -include/simgear/nasal/cppbind/NasalObjectHolder.hxx -include/simgear/nasal/cppbind/NasalString.hxx -include/simgear/nasal/cppbind/detail/NasalObject_callMethod_templates.hxx -include/simgear/nasal/cppbind/detail/from_nasal_function_templates.hxx -include/simgear/nasal/cppbind/detail/from_nasal_helper.hxx -include/simgear/nasal/cppbind/detail/functor_templates.hxx -include/simgear/nasal/cppbind/detail/nasal_traits.hxx -include/simgear/nasal/cppbind/detail/to_nasal_helper.hxx -include/simgear/nasal/cppbind/from_nasal.hxx -include/simgear/nasal/cppbind/to_nasal.hxx -include/simgear/nasal/naref.h -include/simgear/nasal/nasal.h -include/simgear/package/Catalog.hxx -include/simgear/package/Delegate.hxx -include/simgear/package/Install.hxx -include/simgear/package/Package.hxx -include/simgear/package/Root.hxx -include/simgear/props/AtomicChangeListener.hxx -include/simgear/props/ExtendedPropertyAdapter.hxx -include/simgear/props/PropertyBasedElement.hxx -include/simgear/props/PropertyBasedMgr.hxx -include/simgear/props/PropertyInterpolationMgr.hxx -include/simgear/props/PropertyInterpolator.hxx -include/simgear/props/condition.hxx -include/simgear/props/easing_functions.hxx -include/simgear/props/propertyObject.hxx -include/simgear/props/props.hxx -include/simgear/props/props_io.hxx -include/simgear/props/propsfwd.hxx -include/simgear/props/tiedpropertylist.hxx -include/simgear/props/vectorPropTemplates.hxx -include/simgear/scene/material/Effect.hxx -include/simgear/scene/material/EffectBuilder.hxx -include/simgear/scene/material/EffectCullVisitor.hxx -include/simgear/scene/material/EffectGeode.hxx -include/simgear/scene/material/Pass.hxx -include/simgear/scene/material/Technique.hxx -include/simgear/scene/material/TextureBuilder.hxx -include/simgear/scene/material/mat.hxx -include/simgear/scene/material/matlib.hxx -include/simgear/scene/material/matmodel.hxx -include/simgear/scene/material/mipmap.hxx -include/simgear/scene/material/parseBlendFunc.hxx -include/simgear/scene/model/BVHDebugCollectVisitor.hxx -include/simgear/scene/model/BVHPageNodeOSG.hxx -include/simgear/scene/model/BoundingVolumeBuildVisitor.hxx -include/simgear/scene/model/CheckSceneryVisitor.hxx -include/simgear/scene/model/ConditionNode.hxx -include/simgear/scene/model/ModelRegistry.hxx -include/simgear/scene/model/PrimitiveCollector.hxx -include/simgear/scene/model/SGClipGroup.hxx -include/simgear/scene/model/SGInteractionAnimation.hxx -include/simgear/scene/model/SGMaterialAnimation.hxx -include/simgear/scene/model/SGOffsetTransform.hxx -include/simgear/scene/model/SGPickAnimation.hxx -include/simgear/scene/model/SGReaderWriterXML.hxx -include/simgear/scene/model/SGRotateTransform.hxx -include/simgear/scene/model/SGScaleTransform.hxx -include/simgear/scene/model/SGText.hxx -include/simgear/scene/model/SGTrackToAnimation.hxx -include/simgear/scene/model/SGTranslateTransform.hxx -include/simgear/scene/model/animation.hxx -include/simgear/scene/model/model.hxx -include/simgear/scene/model/modellib.hxx -include/simgear/scene/model/particles.hxx -include/simgear/scene/model/persparam.hxx -include/simgear/scene/model/placement.hxx -include/simgear/scene/sky/CloudShaderGeometry.hxx -include/simgear/scene/sky/cloud.hxx -include/simgear/scene/sky/cloudfield.hxx -include/simgear/scene/sky/dome.hxx -include/simgear/scene/sky/moon.hxx -include/simgear/scene/sky/newcloud.hxx -include/simgear/scene/sky/oursun.hxx -include/simgear/scene/sky/sky.hxx -include/simgear/scene/sky/sphere.hxx -include/simgear/scene/sky/stars.hxx -include/simgear/scene/tgdb/GroundLightManager.hxx -include/simgear/scene/tgdb/ReaderWriterSPT.hxx -include/simgear/scene/tgdb/ReaderWriterSTG.hxx -include/simgear/scene/tgdb/SGBuildingBin.hxx -include/simgear/scene/tgdb/SGDirectionalLightBin.hxx -include/simgear/scene/tgdb/SGLightBin.hxx -include/simgear/scene/tgdb/SGModelBin.hxx -include/simgear/scene/tgdb/SGNodeTriangles.hxx -include/simgear/scene/tgdb/SGOceanTile.hxx -include/simgear/scene/tgdb/SGReaderWriterBTG.hxx -include/simgear/scene/tgdb/SGTexturedTriangleBin.hxx -include/simgear/scene/tgdb/SGTileDetailsCallback.hxx -include/simgear/scene/tgdb/SGTileGeometryBin.hxx -include/simgear/scene/tgdb/SGTriangleBin.hxx -include/simgear/scene/tgdb/SGVasiDrawable.hxx -include/simgear/scene/tgdb/SGVertexArrayBin.hxx -include/simgear/scene/tgdb/ShaderGeometry.hxx -include/simgear/scene/tgdb/TreeBin.hxx -include/simgear/scene/tgdb/apt_signs.hxx -include/simgear/scene/tgdb/obj.hxx -include/simgear/scene/tgdb/pt_lights.hxx -include/simgear/scene/tgdb/userdata.hxx -include/simgear/scene/tsync/terrasync.hxx -include/simgear/scene/util/ColorInterpolator.hxx -include/simgear/scene/util/CopyOp.hxx -include/simgear/scene/util/DeletionManager.hxx -include/simgear/scene/util/NodeAndDrawableVisitor.hxx -include/simgear/scene/util/Noise.hxx -include/simgear/scene/util/OptionsReadFileCallback.hxx -include/simgear/scene/util/OsgDebug.hxx -include/simgear/scene/util/OsgMath.hxx -include/simgear/scene/util/OsgSingleton.hxx -include/simgear/scene/util/PrimitiveUtils.hxx -include/simgear/scene/util/QuadTreeBuilder.hxx -include/simgear/scene/util/RenderConstants.hxx -include/simgear/scene/util/SGDebugDrawCallback.hxx -include/simgear/scene/util/SGEnlargeBoundingBox.hxx -include/simgear/scene/util/SGNodeMasks.hxx -include/simgear/scene/util/SGPickCallback.hxx -include/simgear/scene/util/SGReaderWriterOptions.hxx -include/simgear/scene/util/SGSceneFeatures.hxx -include/simgear/scene/util/SGSceneUserData.hxx -include/simgear/scene/util/SGStateAttributeVisitor.hxx -include/simgear/scene/util/SGTextureStateAttributeVisitor.hxx -include/simgear/scene/util/SGUpdateVisitor.hxx -include/simgear/scene/util/SplicingVisitor.hxx -include/simgear/scene/util/StateAttributeFactory.hxx -include/simgear/scene/util/UpdateOnceCallback.hxx -include/simgear/scene/util/VectorArrayAdapter.hxx -include/simgear/scene/util/parse_color.hxx -include/simgear/scene/util/project.hxx -include/simgear/screen/colors.hxx -include/simgear/screen/extensions.hxx -include/simgear/screen/screen-dump.hxx -include/simgear/screen/tr.h -include/simgear/serial/serial.hxx -include/simgear/sg_inlines.h -include/simgear/simgear_config.h -include/simgear/sound/readwav.hxx -include/simgear/sound/sample_group.hxx -include/simgear/sound/sample_openal.hxx -include/simgear/sound/sample_queue.hxx -include/simgear/sound/soundmgr_openal.hxx -include/simgear/sound/xmlsound.hxx -include/simgear/structure/OSGUtils.hxx -include/simgear/structure/OSGVersion.hxx -include/simgear/structure/SGAtomic.hxx -include/simgear/structure/SGBinding.hxx -include/simgear/structure/SGExpression.hxx -include/simgear/structure/SGPerfMon.hxx -include/simgear/structure/SGReferenced.hxx -include/simgear/structure/SGSharedPtr.hxx -include/simgear/structure/SGSmplhist.hxx -include/simgear/structure/SGSmplstat.hxx -include/simgear/structure/SGWeakPtr.hxx -include/simgear/structure/SGWeakReferenced.hxx -include/simgear/structure/Singleton.hxx -include/simgear/structure/StateMachine.hxx -include/simgear/structure/StringTable.hxx -include/simgear/structure/callback.hxx -include/simgear/structure/commands.hxx -include/simgear/structure/detail/function_list_template.hxx -include/simgear/structure/event_mgr.hxx -include/simgear/structure/exception.hxx -include/simgear/structure/function_list.hxx -include/simgear/structure/intern.hxx -include/simgear/structure/map.hxx -include/simgear/structure/singleton.hpp -include/simgear/structure/subsystem_mgr.hxx -include/simgear/threads/SGGuard.hxx -include/simgear/threads/SGQueue.hxx -include/simgear/threads/SGThread.hxx -include/simgear/timing/lowleveltime.h -include/simgear/timing/sg_time.hxx -include/simgear/timing/timestamp.hxx -include/simgear/timing/timezone.h -include/simgear/version.h -include/simgear/xml/easyxml.hxx -lib/libSimGearCore.a -lib/libSimGearScene.a diff --git a/simgear/buildlink3.mk b/simgear/buildlink3.mk deleted file mode 100644 index 646edeee3d..0000000000 --- a/simgear/buildlink3.mk +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.12 2015/04/25 14:23:03 tnn Exp $ - -BUILDLINK_TREE+= simgear - -.if !defined(SIMGEAR_BUILDLINK3_MK) -SIMGEAR_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.simgear+= simgear>=2.0.0nb6 -BUILDLINK_ABI_DEPENDS.simgear+= simgear>=2.8.0nb23 -BUILDLINK_PKGSRCDIR.simgear?= ../../wip/simgear -BUILDLINK_DEPMETHOD.simgear?= build - -.include "../../devel/zlib/buildlink3.mk" -.include "../../games/plib/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.endif # SIMGEAR_BUILDLINK3_MK - -BUILDLINK_TREE+= -simgear diff --git a/simgear/distinfo b/simgear/distinfo deleted file mode 100644 index 0ea72b1e16..0000000000 --- a/simgear/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.6 2015/11/03 20:57:04 agc Exp $ - -SHA1 (simgear-3.4.0.tar.bz2) = 3021692be05ca1c983ffa7a4483a74934ec02dbb -RMD160 (simgear-3.4.0.tar.bz2) = d296d818fae183afc3a3ccf67fc8545663d4c5da -SHA512 (simgear-3.4.0.tar.bz2) = 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320 -Size (simgear-3.4.0.tar.bz2) = 1057455 bytes -SHA1 (patch-simgear_canvas_ShivaVG_src_shConfig.h) = c4ebe072a6a60f627b1a28e19de48db4e4f01ce2 -SHA1 (patch-simgear_canvas_elements_CanvasText.cxx) = 4b42ec6066357286dc11eaf87601212daea638ea -SHA1 (patch-simgear_scene_material_Technique.cxx) = a7b40f3311b7586459f764fe392e9fbea78b79ea -SHA1 (patch-simgear_scene_sky_CloudShaderGeometry.cxx) = d28b8164da756d899db01e7ecb944c41198f3772 -SHA1 (patch-simgear_scene_sky_cloud_cxx) = c2a259d96f4aa2bad413874203316b61fb3506c8 -SHA1 (patch-simgear_scene_tgdb_ShaderGeometry.cxx) = 7992319b775573b802150f391a446fff9b1ed419 -SHA1 (patch-simgear_scene_util_SGSceneFeatures.cxx) = fe05df427b8fdfd1c7b1b1fae081633d4def9c97 -SHA1 (patch-simgear_sound_sample__group_cxx) = ef4dd3534aa902ed1d3945f5879bfe3ef20d31ca -SHA1 (patch-simgear_timing_timestamp_cxx) = 20101dd1802c9d18a6680c9b4868efd5c937f973 diff --git a/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h b/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h deleted file mode 100644 index 2f30a4c5b5..0000000000 --- a/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD$ - ---- simgear/canvas/ShivaVG/src/shConfig.h.orig 2015-02-18 20:10:39.000000000 +0000 -+++ simgear/canvas/ShivaVG/src/shConfig.h -@@ -26,7 +26,7 @@ - // MacOS - #define VG_API_MACOSX - --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - - // FreeBSD - #define VG_API_FREEBSD diff --git a/simgear/patches/patch-simgear_canvas_elements_CanvasText.cxx b/simgear/patches/patch-simgear_canvas_elements_CanvasText.cxx deleted file mode 100644 index 6ff18cd8a3..0000000000 --- a/simgear/patches/patch-simgear_canvas_elements_CanvasText.cxx +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD$ - -Text::GlyphQuads::Coords2 changed type from std::vector -in 3.2.0 of osc to osg::ref_ptr in 3.4.0 - ---- simgear/canvas/elements/CanvasText.cxx.orig 2015-11-05 17:00:10.000000000 +0000 -+++ simgear/canvas/elements/CanvasText.cxx -@@ -165,15 +165,15 @@ namespace canvas - - if( global_i == _begin ) - // before first character of line -- pos.x() = coords[_begin * 4].x(); -+ pos.x() = (*coords)[_begin * 4].x(); - else if( global_i == _end ) - // After Last character of line -- pos.x() = coords[(_end - 1) * 4 + 2].x(); -+ pos.x() = (*coords)[(_end - 1) * 4 + 2].x(); - else - { -- float prev_l = coords[(global_i - 1) * 4].x(), -- prev_r = coords[(global_i - 1) * 4 + 2].x(), -- cur_l = coords[global_i * 4].x(); -+ float prev_l = (*coords)[(global_i - 1) * 4].x(), -+ prev_r = (*coords)[(global_i - 1) * 4 + 2].x(), -+ cur_l = (*coords)[global_i * 4].x(); - - if( prev_l == prev_r ) - // If previous character width is zero set to begin of next character -@@ -205,7 +205,7 @@ namespace canvas - { - // Get threshold for mouse x position for setting cursor before or after - // current character -- float threshold = coords[i * 4].x() -+ float threshold = (*coords)[i * 4].x() - + HIT_FRACTION * glyphs[i]->getHorizontalAdvance() - * character_width; - -@@ -652,8 +652,8 @@ namespace canvas - // osg::Vec2 lowRight = local+osg::Vec2(width+fHorizQuadMargin, ...); - // osg::Vec2 upRight = local+osg::Vec2(width+fHorizQuadMargin, ...); - -- float left = coords[i * 4].x(), -- right = coords[i * 4 + 2].x(), -+ float left = (*coords)[i * 4].x(), -+ right = (*coords)[i * 4 + 2].x(), - width = glyphs[i]->getWidth() * wr; - - // (local + width + fHoriz) - (local - fHoriz) = width + 2*fHoriz | -width diff --git a/simgear/patches/patch-simgear_scene_material_Technique.cxx b/simgear/patches/patch-simgear_scene_material_Technique.cxx deleted file mode 100644 index 1ad7db9b68..0000000000 --- a/simgear/patches/patch-simgear_scene_material_Technique.cxx +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD$ - -osg 3.4 compatibility changes - ---- simgear/scene/material/Technique.cxx.orig 2015-02-18 20:10:39.000000000 +0000 -+++ simgear/scene/material/Technique.cxx -@@ -326,9 +326,9 @@ public: - = GL2Extensions::Get(static_cast(contextId), true); - if (!extensions) - return; -- if (!extensions->isGlslSupported()) -+ if (!extensions->isGlslSupported) - return; -- value = extensions->getLanguageVersion(); -+ value = extensions->glslLanguageVersion; - } - }; - -@@ -357,7 +357,7 @@ public: - = GL2Extensions::Get(static_cast(contextId), true); - if (!extensions) - return; -- value = extensions->isGlslSupported(); -+ value = extensions->isGlslSupported; - } - }; - diff --git a/simgear/patches/patch-simgear_scene_sky_CloudShaderGeometry.cxx b/simgear/patches/patch-simgear_scene_sky_CloudShaderGeometry.cxx deleted file mode 100644 index 4c73d9b31e..0000000000 --- a/simgear/patches/patch-simgear_scene_sky_CloudShaderGeometry.cxx +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD$ - -osg 3.4 compatibility changes - ---- simgear/scene/sky/CloudShaderGeometry.cxx.orig 2015-02-18 20:10:39.000000000 +0000 -+++ simgear/scene/sky/CloudShaderGeometry.cxx -@@ -128,7 +128,7 @@ void CloudShaderGeometry::drawImplementa - sortData.frameSorted = frameNumber; - } - -- const Extensions* extensions = getExtensions(state.getContextID(),true); -+ const GLExtensions* extensions = GLExtensions::Get(state.getContextID(),true); - GLfloat ua1[3] = { (GLfloat) alpha_factor, - (GLfloat) shade_factor, - (GLfloat) cloud_height }; diff --git a/simgear/patches/patch-simgear_scene_sky_cloud_cxx b/simgear/patches/patch-simgear_scene_sky_cloud_cxx deleted file mode 100644 index a491674757..0000000000 --- a/simgear/patches/patch-simgear_scene_sky_cloud_cxx +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-simgear_scene_sky_cloud_cxx,v 1.1 2012/09/30 01:50:16 dholland Exp $ - -Fix build failure on NetBSD. - ---- simgear/scene/sky/cloud.cxx.orig 2012-08-16 14:20:29.000000000 +0000 -+++ simgear/scene/sky/cloud.cxx -@@ -27,7 +27,7 @@ - - #include - --#include -+#include - - #include - #include diff --git a/simgear/patches/patch-simgear_scene_tgdb_ShaderGeometry.cxx b/simgear/patches/patch-simgear_scene_tgdb_ShaderGeometry.cxx deleted file mode 100644 index bef6fb7dbf..0000000000 --- a/simgear/patches/patch-simgear_scene_tgdb_ShaderGeometry.cxx +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD$ - -osg 3.4 compatibility changes - ---- simgear/scene/tgdb/ShaderGeometry.cxx.orig 2015-02-18 20:10:39.000000000 +0000 -+++ simgear/scene/tgdb/ShaderGeometry.cxx -@@ -47,7 +47,7 @@ void ShaderGeometry::addObject(const Vec - void ShaderGeometry::drawImplementation(osg::RenderInfo& renderInfo) const - { - State& state = *renderInfo.getState(); -- const Extensions* extensions = getExtensions(state.getContextID(), true); -+ const GLExtensions* extensions = GLExtensions::Get(state.getContextID(), true); - Vec4Array::const_iterator citer = _posScaleArray->begin(); - Vec4Array::const_iterator cend = _posScaleArray->end(); - FloatArray::const_iterator viter = _vertexAttribArray->begin(); diff --git a/simgear/patches/patch-simgear_scene_util_SGSceneFeatures.cxx b/simgear/patches/patch-simgear_scene_util_SGSceneFeatures.cxx deleted file mode 100644 index 452b971142..0000000000 --- a/simgear/patches/patch-simgear_scene_util_SGSceneFeatures.cxx +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD$ - -osg 3.4 compatibility changes - ---- simgear/scene/util/SGSceneFeatures.cxx.orig 2015-02-18 20:10:39.000000000 +0000 -+++ simgear/scene/util/SGSceneFeatures.cxx -@@ -25,10 +25,7 @@ - - #include "SGSceneFeatures.hxx" - --#include --#include --#include --#include -+#include - #include - - #include -@@ -84,17 +81,17 @@ SGSceneFeatures::setTextureCompression(o - bool - SGSceneFeatures::getHavePointSprites(unsigned contextId) const - { -- return osg::PointSprite::isPointSpriteSupported(contextId); -+ return osg::GLExtensions::Get(contextId, true)->isPointSpriteSupported; - } - - bool - SGSceneFeatures::getHaveFragmentPrograms(unsigned contextId) const - { -- const osg::FragmentProgram::Extensions* fpe; -- fpe = osg::FragmentProgram::getExtensions(contextId, true); -+ const osg::GLExtensions* fpe; -+ fpe = osg::GLExtensions::Get(contextId, true); - if (!fpe) - return false; -- if (!fpe->isFragmentProgramSupported()) -+ if (!fpe->isFragmentProgramSupported) - return false; - - return true; -@@ -103,11 +100,11 @@ SGSceneFeatures::getHaveFragmentPrograms - bool - SGSceneFeatures::getHaveVertexPrograms(unsigned contextId) const - { -- const osg::VertexProgram::Extensions* vpe; -- vpe = osg::VertexProgram::getExtensions(contextId, true); -+ const osg::GLExtensions* vpe; -+ vpe = osg::GLExtensions::Get(contextId, true); - if (!vpe) - return false; -- if (!vpe->isVertexProgramSupported()) -+ if (!vpe->isVertexProgramSupported) - return false; - - return true; -@@ -124,11 +121,11 @@ SGSceneFeatures::getHaveShaderPrograms(u - bool - SGSceneFeatures::getHavePointParameters(unsigned contextId) const - { -- const osg::Point::Extensions* pe; -- pe = osg::Point::getExtensions(contextId, true); -+ const osg::GLExtensions* pe; -+ pe = osg::GLExtensions::Get(contextId, true); - if (!pe) - return false; -- if (!pe->isPointParametersSupported()) -+ if (!pe->isPointParametersSupported) - return false; - return true; - } diff --git a/simgear/patches/patch-simgear_sound_sample__group_cxx b/simgear/patches/patch-simgear_sound_sample__group_cxx deleted file mode 100644 index a9a61fb80e..0000000000 --- a/simgear/patches/patch-simgear_sound_sample__group_cxx +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-simgear_sound_sample__group_cxx,v 1.1 2012/09/30 01:50:16 dholland Exp $ - -Fix build failure on NetBSD. - ---- simgear/sound/sample_group.cxx~ 2012-08-16 14:20:28.000000000 +0000 -+++ simgear/sound/sample_group.cxx -@@ -22,2 +22,4 @@ - -+#include -+ - #ifdef HAVE_CONFIG_H -@@ -32,3 +34,3 @@ - bool isNaN(float *v) { -- return (isnan(v[0]) || isnan(v[1]) || isnan(v[2])); -+ return (std::isnan(v[0]) || std::isnan(v[1]) || std::isnan(v[2])); - } diff --git a/simgear/patches/patch-simgear_timing_timestamp_cxx b/simgear/patches/patch-simgear_timing_timestamp_cxx deleted file mode 100644 index 07ef4f9bb1..0000000000 --- a/simgear/patches/patch-simgear_timing_timestamp_cxx +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-simgear_timing_timestamp_cxx,v 1.1 2012/09/30 01:50:16 dholland Exp $ - -NetBSD does not have clock_nanosleep() so we can't use the -POSIX_TIMERS code. - ---- simgear/timing/timestamp.cxx~ 2012-08-16 14:20:29.000000000 +0000 -+++ simgear/timing/timestamp.cxx -@@ -47,6 +47,11 @@ - # include - #endif - -+#ifdef __NetBSD__ -+/* XXX netbsd doesn't have clock_nanosleep */ -+#undef _POSIX_TIMERS -+#endif -+ - #ifdef WIN32 - # include - # if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )