From 6c65838d0ab9b46b2385b72c1d8be3d415258358 Mon Sep 17 00:00:00 2001 From: Charlie Date: Tue, 1 Jun 2010 00:47:25 -0700 Subject: [PATCH] update Tue Jun 1 00:37:00 PDT 2010 --- doc/CHANGES-2010 | 4 +- doc/TODO | 3 +- security/netpgp/Makefile | 4 +- security/netpgp/distinfo | 8 +- textproc/py-enchant/Makefile | 34 +- textproc/py-enchant/PLIST | 22 +- textproc/py-enchant/distinfo | 10 +- textproc/py-enchant/patches/patch-aa | 17 + textproc/py-enchant/patches/patch-ab | 14 + wip/ibus-t9/Makefile | 3 +- wip/ibus-t9/distinfo | 6 +- wip/p5-MasonX-Apache2Handler/Makefile | 5 +- wip/raster3d/DESCR | 15 + wip/raster3d/Makefile | 95 +++++ wip/raster3d/PLIST | 170 +++++++++ wip/raster3d/distinfo | 7 + wip/raster3d/files/in.h | 515 ++++++++++++++++++++++++++ wip/raster3d/options.mk | 7 + wip/raster3d/patches/patch-aa | 21 ++ wip/raster3d/patches/patch-ab | 27 ++ wip/slashem/DESCR | 2 + wip/slashem/Makefile | 32 ++ wip/slashem/PLIST | 208 +++++++++++ wip/slashem/TODO | 5 + wip/slashem/distinfo | 7 + wip/slashem/patches/patch-aa | 15 + wip/slashem/patches/patch-ab | 17 + 27 files changed, 1246 insertions(+), 27 deletions(-) create mode 100644 textproc/py-enchant/patches/patch-aa create mode 100644 textproc/py-enchant/patches/patch-ab create mode 100644 wip/raster3d/DESCR create mode 100644 wip/raster3d/Makefile create mode 100644 wip/raster3d/PLIST create mode 100644 wip/raster3d/distinfo create mode 100644 wip/raster3d/files/in.h create mode 100644 wip/raster3d/options.mk create mode 100644 wip/raster3d/patches/patch-aa create mode 100644 wip/raster3d/patches/patch-ab create mode 100644 wip/slashem/DESCR create mode 100644 wip/slashem/Makefile create mode 100644 wip/slashem/PLIST create mode 100644 wip/slashem/TODO create mode 100644 wip/slashem/distinfo create mode 100644 wip/slashem/patches/patch-aa create mode 100644 wip/slashem/patches/patch-ab diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010 index dca3e4f0e68d..9c3bb34929f9 100644 --- a/doc/CHANGES-2010 +++ b/doc/CHANGES-2010 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2010,v 1.2071 2010/05/31 21:21:50 wiz Exp $ +$NetBSD: CHANGES-2010,v 1.2073 2010/06/01 06:15:56 agc Exp $ Changes to the packages collection and infrastructure in 2010: @@ -2717,3 +2717,5 @@ Changes to the packages collection and infrastructure in 2010: Updated devel/fossil to 201005211.62104 [wiz 2010-05-31] Updated security/py-paramiko to 1.7.6 [gls 2010-05-31] Updated pkgtools/x11-links to 0.49 [wiz 2010-05-31] + Updated textproc/py-enchant to 1.6.2 [obache 2010-06-01] + Updated security/netpgp to 20100601 [agc 2010-06-01] diff --git a/doc/TODO b/doc/TODO index 60970bdf8fc8..ae2a641473e3 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.9334 2010/05/31 19:39:45 dholland Exp $ +$NetBSD: TODO,v 1.9335 2010/06/01 05:28:36 obache Exp $ Suggested new packages ====================== @@ -1159,7 +1159,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o py-checker-0.8.17 o py-cups-1.9.50 o py-django-1.2 - o py-enchant-1.6.2 [pkg/43384] o py-fpconst-0.7.2 [pkg/42556] o py-game-1.9.1 o py-gnome2-desktop-2.30.0 [GNOME 2.30] diff --git a/security/netpgp/Makefile b/security/netpgp/Makefile index d2829767e3d4..7f463790aaed 100644 --- a/security/netpgp/Makefile +++ b/security/netpgp/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2010/05/08 03:45:58 agc Exp $ +# $NetBSD: Makefile,v 1.12 2010/06/01 06:15:00 agc Exp $ -DISTNAME= netpgp-20100507 +DISTNAME= netpgp-20100601 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/security/netpgp/distinfo b/security/netpgp/distinfo index 4a0bef093df1..c2cd9afb746d 100644 --- a/security/netpgp/distinfo +++ b/security/netpgp/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.10 2010/05/08 03:45:58 agc Exp $ +$NetBSD: distinfo,v 1.11 2010/06/01 06:15:00 agc Exp $ -SHA1 (netpgp-20100507.tar.gz) = 3696075b8124ede5e31d2f18560f0587c4c41273 -RMD160 (netpgp-20100507.tar.gz) = 3ce4e94073b81ac525809939c0477dce8754da99 -Size (netpgp-20100507.tar.gz) = 1585401 bytes +SHA1 (netpgp-20100601.tar.gz) = e4074e89d8e2280b5f88cdd2a56265b0ef3252a6 +RMD160 (netpgp-20100601.tar.gz) = 8350fec1db8c9bdd1d5ca313a6c8d0ea5e82d0ad +Size (netpgp-20100601.tar.gz) = 1525450 bytes diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile index c2197798330b..201fb7edc11a 100644 --- a/textproc/py-enchant/Makefile +++ b/textproc/py-enchant/Makefile @@ -1,19 +1,41 @@ -# $NetBSD: Makefile,v 1.2 2009/02/16 19:38:27 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2010/06/01 05:28:11 obache Exp $ # -DISTNAME= pyenchant-1.4.2 +DISTNAME= pyenchant-1.6.2 PKGNAME= ${DISTNAME:S/py/${PYPKGPREFIX}-/} CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyenchant/} +MASTER_SITES= http://pypi.python.org/packages/source/p/pyenchant/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://pyenchant.sourceforge.net/ +HOMEPAGE= http://www.rfk.id.au/software/pyenchant/ COMMENT= Spellchecking library for Python +LICENSE= gnu-lgpl-v2.1 PKG_DESTDIR_SUPPORT= user-destdir -USE_LANGUAGES= c +.include "../../lang/python/pyversion.mk" + +.if ${PYPACKAGE} && ${PYPACKAGE} == "python24" +DEPENDS+= ${PYPKGPREFIX}-ctype-[0-9]*:../../devel/py-ctype +.endif +DEPENDS+= enchant-[0-9]*:../../textproc/enchant + +USE_LANGUAGES= # empty + +FIND_PREFIX:= ENCHANT_DIR=enchant +.include "../../mk/find-prefix.mk" + +.include "../../mk/bsd.prefs.mk" + +DLEXT.dylib= dylib +DLEXT= ${DLEXT.${_OPSYS_SHLIB_TYPE}:Uso} +PYENCHANT_LIBRARY_PATH= ${ENCHANT_DIR}/lib/libenchant.${DLEXT} + +# fix the path of libenchant with patch-ab. +SUBST_CLASSES+= dlpath +SUBST_STAGE.dlpath= pre-configure +SUBST_FILES.dlpath= enchant/_enchant.py +SUBST_VARS.dlpath= PYENCHANT_LIBRARY_PATH .include "../../lang/python/egg.mk" -.include "../../textproc/enchant/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-enchant/PLIST b/textproc/py-enchant/PLIST index ccfff73d0029..ef0a2c77381c 100644 --- a/textproc/py-enchant/PLIST +++ b/textproc/py-enchant/PLIST @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:25 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2010/06/01 05:28:11 obache Exp $ ${PYSITELIB}/enchant/__init__.py ${PYSITELIB}/enchant/__init__.pyc ${PYSITELIB}/enchant/__init__.pyo -${PYSITELIB}/enchant/_enchant.so +${PYSITELIB}/enchant/_enchant.py +${PYSITELIB}/enchant/_enchant.pyc +${PYSITELIB}/enchant/_enchant.pyo ${PYSITELIB}/enchant/checker/CmdLineChecker.py ${PYSITELIB}/enchant/checker/CmdLineChecker.pyc ${PYSITELIB}/enchant/checker/CmdLineChecker.pyo @@ -12,18 +14,34 @@ ${PYSITELIB}/enchant/checker/GtkSpellCheckerDialog.pyo ${PYSITELIB}/enchant/checker/__init__.py ${PYSITELIB}/enchant/checker/__init__.pyc ${PYSITELIB}/enchant/checker/__init__.pyo +${PYSITELIB}/enchant/checker/tests.py +${PYSITELIB}/enchant/checker/tests.pyc +${PYSITELIB}/enchant/checker/tests.pyo ${PYSITELIB}/enchant/checker/wxSpellCheckerDialog.py ${PYSITELIB}/enchant/checker/wxSpellCheckerDialog.pyc ${PYSITELIB}/enchant/checker/wxSpellCheckerDialog.pyo +${PYSITELIB}/enchant/errors.py +${PYSITELIB}/enchant/errors.pyc +${PYSITELIB}/enchant/errors.pyo +${PYSITELIB}/enchant/lib/enchant/README.txt ${PYSITELIB}/enchant/pypwl.py ${PYSITELIB}/enchant/pypwl.pyc ${PYSITELIB}/enchant/pypwl.pyo +${PYSITELIB}/enchant/share/enchant/README.txt +${PYSITELIB}/enchant/share/enchant/ispell/README.txt +${PYSITELIB}/enchant/share/enchant/myspell/README.txt +${PYSITELIB}/enchant/tests.py +${PYSITELIB}/enchant/tests.pyc +${PYSITELIB}/enchant/tests.pyo ${PYSITELIB}/enchant/tokenize/__init__.py ${PYSITELIB}/enchant/tokenize/__init__.pyc ${PYSITELIB}/enchant/tokenize/__init__.pyo ${PYSITELIB}/enchant/tokenize/en.py ${PYSITELIB}/enchant/tokenize/en.pyc ${PYSITELIB}/enchant/tokenize/en.pyo +${PYSITELIB}/enchant/tokenize/tests.py +${PYSITELIB}/enchant/tokenize/tests.pyc +${PYSITELIB}/enchant/tokenize/tests.pyo ${PYSITELIB}/enchant/utils.py ${PYSITELIB}/enchant/utils.pyc ${PYSITELIB}/enchant/utils.pyo diff --git a/textproc/py-enchant/distinfo b/textproc/py-enchant/distinfo index b568e4983bd4..e78def37ed70 100644 --- a/textproc/py-enchant/distinfo +++ b/textproc/py-enchant/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/10/08 09:42:47 wiz Exp $ +$NetBSD: distinfo,v 1.2 2010/06/01 05:28:11 obache Exp $ -SHA1 (pyenchant-1.4.2.tar.gz) = 97197d72a0197e459946805d254b3958a0e1de2e -RMD160 (pyenchant-1.4.2.tar.gz) = 9107042d841ab920baeeef10643d88ff4e65bb7f -Size (pyenchant-1.4.2.tar.gz) = 81230 bytes +SHA1 (pyenchant-1.6.2.tar.gz) = 54937a31dfdd1023f588ff599135b541f7845eb8 +RMD160 (pyenchant-1.6.2.tar.gz) = 8dc31b837e33d2fe517b9346077060767526861b +Size (pyenchant-1.6.2.tar.gz) = 57761 bytes +SHA1 (patch-aa) = 4afb6e32c84efb177f47b94fca4b91bae459a10d +SHA1 (patch-ab) = ff02e814ff0cf66eca54608c545ae6e95456231f diff --git a/textproc/py-enchant/patches/patch-aa b/textproc/py-enchant/patches/patch-aa new file mode 100644 index 000000000000..4018ee0e486e --- /dev/null +++ b/textproc/py-enchant/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.1 2010/06/01 05:28:11 obache Exp $ + +avoid extra download of distribute-0.6.10.tar.gz. + +--- setup.py.orig 2010-05-29 04:14:59.000000000 +0000 ++++ setup.py +@@ -6,8 +6,8 @@ + # + + +-import distribute_setup +-distribute_setup.use_setuptools() ++#import distribute_setup ++#distribute_setup.use_setuptools() + from setuptools import setup, find_packages, Extension + + import sys diff --git a/textproc/py-enchant/patches/patch-ab b/textproc/py-enchant/patches/patch-ab new file mode 100644 index 000000000000..0cbcd3ef5402 --- /dev/null +++ b/textproc/py-enchant/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.1 2010/06/01 05:28:11 obache Exp $ + +fix path of libenchant. + +--- enchant/_enchant.py.orig 2010-03-06 07:27:42.000000000 +0000 ++++ enchant/_enchant.py +@@ -67,6 +67,7 @@ if sys.platform == "win32": + + def _e_path_possibilities(): + yield os.environ.get("PYENCHANT_LIBRARY_PATH") ++ yield "@PYENCHANT_LIBRARY_PATH@" + yield find_library("enchant") + yield find_library("libenchant") + yield find_library("libenchant-1") diff --git a/wip/ibus-t9/Makefile b/wip/ibus-t9/Makefile index 1ca99a1046ff..6217378c951c 100644 --- a/wip/ibus-t9/Makefile +++ b/wip/ibus-t9/Makefile @@ -1,10 +1,9 @@ # $NetBSD$ # -DISTNAME= ibus-t9-1.3.0.20100403 +DISTNAME= ibus-t9-2.1.0.20100601 CATEGORIES= inputmethod MASTER_SITES= http://ibus-t9.googlecode.com/files/ -EXTRACT_SUFX= .tar.bz2 MAINTAINER= obache@NetBSD.org HOMEPAGE= http://code.google.com/p/ibus-t9/ diff --git a/wip/ibus-t9/distinfo b/wip/ibus-t9/distinfo index f6145bdf2918..0271c43bb12a 100644 --- a/wip/ibus-t9/distinfo +++ b/wip/ibus-t9/distinfo @@ -1,7 +1,7 @@ $NetBSD$ -SHA1 (ibus-t9-1.3.0.20100403.tar.bz2) = ba91fb5c67419f796018bf3ba806e9a9fee85bdf -RMD160 (ibus-t9-1.3.0.20100403.tar.bz2) = db35c1d02188f4b70e81abeee0c1eead8d47517d -Size (ibus-t9-1.3.0.20100403.tar.bz2) = 231157 bytes +SHA1 (ibus-t9-2.1.0.20100601.tar.gz) = e3e849a8fc02c485fb3059396993c7d644623c3a +RMD160 (ibus-t9-2.1.0.20100601.tar.gz) = a6f038ee55ad7897f400443ff7781b86b9d0f032 +Size (ibus-t9-2.1.0.20100601.tar.gz) = 288846 bytes SHA1 (patch-aa) = 7b34fb6f73dbf3f2951f66c41b5270129801e930 SHA1 (patch-ab) = c4f4cc3d149e49c70bce971ebf33fa69d4862c8f diff --git a/wip/p5-MasonX-Apache2Handler/Makefile b/wip/p5-MasonX-Apache2Handler/Makefile index ef4aee3af77e..89a181beeb95 100644 --- a/wip/p5-MasonX-Apache2Handler/Makefile +++ b/wip/p5-MasonX-Apache2Handler/Makefile @@ -15,11 +15,14 @@ COMMENT= Perl-based Apache handler for Apache2 with Mason DEPENDS+= p5-libapreq2>=2.4:../../www/p5-libapreq2 DEPENDS+= p5-HTML-Mason>=1.26:../../www/p5-HTML-Mason -DEPENDS+= ap2-perl>=1.99.17:../../www/ap2-perl +DEPENDS+= ${APACHE_PKG_PREFIX}-perl>=1.99.17:../../www/ap2-perl BUILDLINK_API_DEPENDS.perl= perl>=5.8.4 PERL5_PACKLIST= auto/MasonX/Apache2Handler/.packlist +PKG_APACHE_ACCEPTED= apache2 apache22 + +.include "../../mk/apache.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wip/raster3d/DESCR b/wip/raster3d/DESCR new file mode 100644 index 000000000000..83760a9439bc --- /dev/null +++ b/wip/raster3d/DESCR @@ -0,0 +1,15 @@ +Raster3D is a set of tools for generating high quality raster images of +proteins or other molecules. + +The core program renders spheres, triangles, cylinders, and quadric +surfaces with specular highlighting, Phong shading, and shadowing. It +uses an efficient software Z-buffer algorithm which is independent of +any graphics hardware. + +Ancillary programs process atomic coordinates from PDB files into +rendering descriptions for pictures composed of ribbons, space-filling +atoms, bonds, ball+stick, etc. + +Raster3D can also be used to render pictures composed in other programs +such as Molscript in glorious 3D with highlights, shadowing, etc. Output +is to pixel image files with 24 bits of color information per pixel. diff --git a/wip/raster3d/Makefile b/wip/raster3d/Makefile new file mode 100644 index 000000000000..2a33ad92a661 --- /dev/null +++ b/wip/raster3d/Makefile @@ -0,0 +1,95 @@ +# $NetBSD$ +# + +PKGNAME= raster3d-2.7d +DISTNAME= Raster3D_${PKGNAME:C/.*-//} +CATEGORIES= graphics biology +MASTER_SITES= http://skuld.bmsc.washington.edu/raster3d/ \ + http://mirror.inerd.com/FreeBSD/distfiles/raster3d/ \ + http://mirror.inerd.com/FreeBSD/distfiles/raster3d/old/ + +MAINTAINER= shaun@inerd.com +HOMEPAGE= http://skuld.bmsc.washington.edu/raster3d/ +COMMENT= Set of tools for generating raster images of proteins and molecules + +FFLAGS:= "${FFLAGS} -Wno-globals -L${LOCALBASE}/lib" + +USE_LANGUAGES= c fortran + +DATADIR= ${PREFIX}/share/${PKGBASE} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EGDIR= ${PREFIX}/share/examples/${PKGBASE} + +BINARIES= avs2ps balls rastep render ribbon rings3d rods normal3d +SCRIPTS= label3d stereo3d + +MANL= avs2ps.l label3d.l r3d_objects.l rastep.l render.l rods.l \ + balls.l normal3d.l r3dtops.l raster3d.l ribbon.l stereo3d.l + +PLIST_SUBST+= DATADIR="${DATADIR:C/^${PREFIX}\///}" +PLIST_SUBST+= DOCSDIR="${DOCSDIR:C/^${PREFIX}\///}" +PLIST_SUBST+= EGDIR="${EGDIR:C/^${PREFIX}\///}" + +.include "options.mk" + +.include "../../mk/bsd.prefs.mk" + +#----------------------------------------------------------------------- + +.include "../../mk/endian.mk" + +OSDEFS= + +.if ${OPSYS} != "IRIX" && ${OPSYS} != "SunOS" +OSDEFS= -DLINUX +.endif + +.if ${MACHINE_ENDIAN} == "little" +OSDEFS+= -DNETWORKBYTEORDER +.endif + +MAKE_ENV+= OPSYS="${OPSYS}" OSDEFS="${OSDEFS}" + +.if !empty(PKG_OPTIONS:Mmagick) +PLIST_SUBST+= IMAGEMAGICK="" +.else +PLIST_SUBST+= IMAGEMAGICK="@comment " +.endif + +post-patch: +.if ${OPSYS} == "FreeBSD" + ${CP} ${.CURDIR}/files/in.h ${WRKSRC}/in.h +.endif + +#----------------------------------------------------------------------- + +pre-build: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} netbsd + +do-install: + ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin + ${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/manl + + cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BINARIES} ${PREFIX}/bin +.if !empty(PKG_OPTIONS:Mmagick) + cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin +.endif + ${INSTALL_DATA_DIR} ${DATADIR}/materials + cd ${WRKSRC}/materials && ${INSTALL_DATA} * ${DATADIR}/materials + cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANL} ${PREFIX}/${PKGMANDIR}/manl + + ${INSTALL_DATA_DIR} ${DOCSDIR}/html + cd ${WRKSRC}/doc && ${INSTALL_DATA} R3D_manual.pdf ${DOCSDIR} + cd ${WRKSRC}/html && ${INSTALL_DATA} * ${DOCSDIR}/html + + ${INSTALL_DATA_DIR} ${EGDIR}/msms + cd ${WRKSRC}/examples && ${INSTALL_DATA} *.* ${EGDIR} + cd ${WRKSRC}/examples/msms && ${INSTALL_DATA} * ${EGDIR}/msms + +.if !empty(PKG_OPTIONS:Mmagick) +. include "../../graphics/ImageMagick/buildlink3.mk" +.endif + +.include "../../graphics/tiff/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/wip/raster3d/PLIST b/wip/raster3d/PLIST new file mode 100644 index 000000000000..d1faf5993df6 --- /dev/null +++ b/wip/raster3d/PLIST @@ -0,0 +1,170 @@ +@comment $NetBSD$ +bin/avs2ps +bin/balls +bin/rastep +bin/render +bin/ribbon +bin/rings3d +bin/rods +bin/normal3d +${IMAGEMAGICK}bin/label3d +${IMAGEMAGICK}bin/stereo3d +${DOCSDIR}/html/README +${DOCSDIR}/html/avs2ps.html +${DOCSDIR}/html/balls.html +${DOCSDIR}/html/index_button.gif +${DOCSDIR}/html/label3d.html +${DOCSDIR}/html/normal3d.html +${DOCSDIR}/html/pdb_anisou.html +${DOCSDIR}/html/r3d_animation.html +${DOCSDIR}/html/r3d_colorpicker.gif +${DOCSDIR}/html/r3d_colorpicker.html +${DOCSDIR}/html/r3d_colors.html +${DOCSDIR}/html/r3d_docbkg.jpg +${DOCSDIR}/html/r3d_docstyle.css +${DOCSDIR}/html/r3d_example1.jpeg +${DOCSDIR}/html/r3d_example2.jpeg +${DOCSDIR}/html/r3d_example5.jpeg +${DOCSDIR}/html/r3d_example6.gif +${DOCSDIR}/html/r3d_example6.jpeg +${DOCSDIR}/html/r3d_example7.jpeg +${DOCSDIR}/html/r3d_example8.jpeg +${DOCSDIR}/html/r3d_example9.jpeg +${DOCSDIR}/html/r3d_examples.html +${DOCSDIR}/html/r3d_filters.html +${DOCSDIR}/html/r3d_hints.html +${DOCSDIR}/html/r3d_icon.gif +${DOCSDIR}/html/r3d_labels.html +${DOCSDIR}/html/r3d_msms.png +${DOCSDIR}/html/r3d_obj15.gif +${DOCSDIR}/html/r3d_obj19.gif +${DOCSDIR}/html/r3d_stereo7.jpeg +${DOCSDIR}/html/r3d_transparent.html +${DOCSDIR}/html/r3dtops.html +${DOCSDIR}/html/r3dtops_tex1.gif +${DOCSDIR}/html/r3dtops_tex2.gif +${DOCSDIR}/html/r3dtops_tex3.gif +${DOCSDIR}/html/rastep.html +${DOCSDIR}/html/rastep_options.gif +${DOCSDIR}/html/raster3d.html +${DOCSDIR}/html/render.html +${DOCSDIR}/html/rgb_black.jpeg +${DOCSDIR}/html/rgb_white.jpeg +${DOCSDIR}/html/rgbmap_black.html +${DOCSDIR}/html/rgbmap_white.html +${DOCSDIR}/html/rgbtext.html +${DOCSDIR}/html/ribbon.html +${DOCSDIR}/html/rings3d.html +${DOCSDIR}/html/rods.html +${DOCSDIR}/html/stereo3d.html +${DOCSDIR}/R3D_manual.pdf +${EGDIR}/msms/README +${EGDIR}/msms/msms2r3d.c +${EGDIR}/msms/msms_example.script +${EGDIR}/LT.pdb +${EGDIR}/README.examples +${EGDIR}/chaincolours.pdb +${EGDIR}/clip.r3d +${EGDIR}/ex5.jpeg +${EGDIR}/ex5_matrix.r3d +${EGDIR}/ex7_header.r3d +${EGDIR}/ex7_helix.r3d +${EGDIR}/ex7_labels.r3d +${EGDIR}/ex7_tex.r3d +${EGDIR}/ex7_titles.r3d +${EGDIR}/example1.r3d +${EGDIR}/example1.script +${EGDIR}/example2.script +${EGDIR}/example2.sgi +${EGDIR}/example3.mol +${EGDIR}/example3.r3d +${EGDIR}/example3.script +${EGDIR}/example4.script +${EGDIR}/example5.r3d +${EGDIR}/example5.script +${EGDIR}/example6.r3d +${EGDIR}/example6.script +${EGDIR}/example7.jpeg +${EGDIR}/example7.r3d +${EGDIR}/example7.script +${EGDIR}/example8.script +${EGDIR}/example9.script +${EGDIR}/gal_srf.r3d.gz +${EGDIR}/header1.r3d +${EGDIR}/header2.r3d +${EGDIR}/header4.r3d +${EGDIR}/header8.r3d +${EGDIR}/plane.r3d +${EGDIR}/sugarG.pdb +${EGDIR}/sugarcolours.pdb +${EGDIR}/sugars.pdb +${EGDIR}/transparent.r3d +${DATADIR}/materials/2-sided.r3d +${DATADIR}/materials/backdrop_1.r3d +${DATADIR}/materials/backdrop_2.r3d +${DATADIR}/materials/backdrop_3.r3d +${DATADIR}/materials/backface.r3d +${DATADIR}/materials/basement.r3d +${DATADIR}/materials/black.r3d +${DATADIR}/materials/blue.r3d +${DATADIR}/materials/bronze.r3d +${DATADIR}/materials/brown.r3d +${DATADIR}/materials/cpk.colours +${DATADIR}/materials/cyan.r3d +${DATADIR}/materials/darkblue.r3d +${DATADIR}/materials/darkgreen.r3d +${DATADIR}/materials/darkgrey.r3d +${DATADIR}/materials/darkred.r3d +${DATADIR}/materials/dna.colours +${DATADIR}/materials/end_material.r3d +${DATADIR}/materials/floor.r3d +${DATADIR}/materials/fog.r3d +${DATADIR}/materials/forestgreen.r3d +${DATADIR}/materials/gold.r3d +${DATADIR}/materials/green.r3d +${DATADIR}/materials/grey.r3d +${DATADIR}/materials/lightblue.r3d +${DATADIR}/materials/lightgreen.r3d +${DATADIR}/materials/lightgrey.r3d +${DATADIR}/materials/lightorange.r3d +${DATADIR}/materials/lightyellow.r3d +${DATADIR}/materials/lilac.r3d +${DATADIR}/materials/matte.r3d +${DATADIR}/materials/moccasin.r3d +${DATADIR}/materials/mycolors.pdb +${DATADIR}/materials/orange.r3d +${DATADIR}/materials/orchid.r3d +${DATADIR}/materials/pearl.r3d +${DATADIR}/materials/pink.r3d +${DATADIR}/materials/purple.r3d +${DATADIR}/materials/red.r3d +${DATADIR}/materials/residue.colours +${DATADIR}/materials/shapely.colours +${DATADIR}/materials/silver.r3d +${DATADIR}/materials/translucent.r3d +${DATADIR}/materials/translucent_30.r3d +${DATADIR}/materials/translucent_60.r3d +${DATADIR}/materials/translucent_90.r3d +${DATADIR}/materials/transparent.r3d +${DATADIR}/materials/transparent0.r3d +${DATADIR}/materials/transparent1.r3d +${DATADIR}/materials/white.r3d +${DATADIR}/materials/yellow.r3d +man/manl/avs2ps.l +man/manl/label3d.l +man/manl/r3d_objects.l +man/manl/rastep.l +man/manl/render.l +man/manl/rods.l +man/manl/balls.l +man/manl/normal3d.l +man/manl/r3dtops.l +man/manl/raster3d.l +man/manl/ribbon.l +man/manl/stereo3d.l +@dirrm ${EGDIR}/msms +@dirrm ${EGDIR} +@dirrm ${DOCSDIR}/html +@dirrm ${DOCSDIR} +@dirrm ${DATADIR}/materials +@dirrm ${DATADIR} diff --git a/wip/raster3d/distinfo b/wip/raster3d/distinfo new file mode 100644 index 000000000000..b40fc0cf8565 --- /dev/null +++ b/wip/raster3d/distinfo @@ -0,0 +1,7 @@ +$NetBSD$ + +SHA1 (Raster3D_2.7d.tar.gz) = eb939d6fa0e27d4f50fbb56e84985b1db96bcb0a +RMD160 (Raster3D_2.7d.tar.gz) = 646db1421f3222d75ba4f1a0c2339d603629877e +Size (Raster3D_2.7d.tar.gz) = 1724473 bytes +SHA1 (patch-aa) = 7322d1f94e59cdca60a08e277f8e7c0f0dea9a67 +SHA1 (patch-ab) = 1ca04b4c6ce4dec41dbaf7b09e7728e4d8ea54f8 diff --git a/wip/raster3d/files/in.h b/wip/raster3d/files/in.h new file mode 100644 index 000000000000..ca88849c441c --- /dev/null +++ b/wip/raster3d/files/in.h @@ -0,0 +1,515 @@ +/* + * Copyright (c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _NETINET_IN_H_ +#define _NETINET_IN_H_ + +#include + +/* + * Constants and structures defined by the internet system, + * Per RFC 790, September 1981, and numerous additions. + */ + +/* + * Protocols (RFC 1700) + */ +#define IPPROTO_IP 0 /* dummy for IP */ +#define IPPROTO_HOPOPTS 0 /* IP6 hop-by-hop options */ +#define IPPROTO_ICMP 1 /* control message protocol */ +#define IPPROTO_IGMP 2 /* group mgmt protocol */ +#define IPPROTO_GGP 3 /* gateway^2 (deprecated) */ +#define IPPROTO_IPV4 4 /* IPv4 encapsulation */ +#define IPPROTO_IPIP IPPROTO_IPV4 /* for compatibility */ +#define IPPROTO_TCP 6 /* tcp */ +#define IPPROTO_ST 7 /* Stream protocol II */ +#define IPPROTO_EGP 8 /* exterior gateway protocol */ +#define IPPROTO_PIGP 9 /* private interior gateway */ +#define IPPROTO_RCCMON 10 /* BBN RCC Monitoring */ +#define IPPROTO_NVPII 11 /* network voice protocol*/ +#define IPPROTO_PUP 12 /* pup */ +#define IPPROTO_ARGUS 13 /* Argus */ +#define IPPROTO_EMCON 14 /* EMCON */ +#define IPPROTO_XNET 15 /* Cross Net Debugger */ +#define IPPROTO_CHAOS 16 /* Chaos*/ +#define IPPROTO_UDP 17 /* user datagram protocol */ +#define IPPROTO_MUX 18 /* Multiplexing */ +#define IPPROTO_MEAS 19 /* DCN Measurement Subsystems */ +#define IPPROTO_HMP 20 /* Host Monitoring */ +#define IPPROTO_PRM 21 /* Packet Radio Measurement */ +#define IPPROTO_IDP 22 /* xns idp */ +#define IPPROTO_TRUNK1 23 /* Trunk-1 */ +#define IPPROTO_TRUNK2 24 /* Trunk-2 */ +#define IPPROTO_LEAF1 25 /* Leaf-1 */ +#define IPPROTO_LEAF2 26 /* Leaf-2 */ +#define IPPROTO_RDP 27 /* Reliable Data */ +#define IPPROTO_IRTP 28 /* Reliable Transaction */ +#define IPPROTO_TP 29 /* tp-4 w/ class negotiation */ +#define IPPROTO_BLT 30 /* Bulk Data Transfer */ +#define IPPROTO_NSP 31 /* Network Services */ +#define IPPROTO_INP 32 /* Merit Internodal */ +#define IPPROTO_SEP 33 /* Sequential Exchange */ +#define IPPROTO_3PC 34 /* Third Party Connect */ +#define IPPROTO_IDPR 35 /* InterDomain Policy Routing */ +#define IPPROTO_XTP 36 /* XTP */ +#define IPPROTO_DDP 37 /* Datagram Delivery */ +#define IPPROTO_CMTP 38 /* Control Message Transport */ +#define IPPROTO_TPXX 39 /* TP++ Transport */ +#define IPPROTO_IL 40 /* IL transport protocol */ +#define IPPROTO_IPV6 41 /* IP6 header */ +#define IPPROTO_SDRP 42 /* Source Demand Routing */ +#define IPPROTO_ROUTING 43 /* IP6 routing header */ +#define IPPROTO_FRAGMENT 44 /* IP6 fragmentation header */ +#define IPPROTO_IDRP 45 /* InterDomain Routing*/ +#define IPPROTO_RSVP 46 /* resource reservation */ +#define IPPROTO_GRE 47 /* General Routing Encap. */ +#define IPPROTO_MHRP 48 /* Mobile Host Routing */ +#define IPPROTO_BHA 49 /* BHA */ +#define IPPROTO_ESP 50 /* IP6 Encap Sec. Payload */ +#define IPPROTO_AH 51 /* IP6 Auth Header */ +#define IPPROTO_INLSP 52 /* Integ. Net Layer Security */ +#define IPPROTO_SWIPE 53 /* IP with encryption */ +#define IPPROTO_NHRP 54 /* Next Hop Resolution */ +#define IPPROTO_MOBILE 55 /* IP Mobility */ +#define IPPROTO_TLSP 56 /* Transport Layer Security */ +#define IPPROTO_SKIP 57 /* SKIP */ +#define IPPROTO_ICMPV6 58 /* ICMP6 */ +#define IPPROTO_NONE 59 /* IP6 no next header */ +#define IPPROTO_DSTOPTS 60 /* IP6 destination option */ +#define IPPROTO_AHIP 61 /* any host internal protocol */ +#define IPPROTO_CFTP 62 /* CFTP */ +#define IPPROTO_HELLO 63 /* "hello" routing protocol */ +#define IPPROTO_SATEXPAK 64 /* SATNET/Backroom EXPAK */ +#define IPPROTO_KRYPTOLAN 65 /* Kryptolan */ +#define IPPROTO_RVD 66 /* Remote Virtual Disk */ +#define IPPROTO_IPPC 67 /* Pluribus Packet Core */ +#define IPPROTO_ADFS 68 /* Any distributed FS */ +#define IPPROTO_SATMON 69 /* Satnet Monitoring */ +#define IPPROTO_VISA 70 /* VISA Protocol */ +#define IPPROTO_IPCV 71 /* Packet Core Utility */ +#define IPPROTO_CPNX 72 /* Comp. Prot. Net. Executive */ +#define IPPROTO_CPHB 73 /* Comp. Prot. HeartBeat */ +#define IPPROTO_WSN 74 /* Wang Span Network */ +#define IPPROTO_PVP 75 /* Packet Video Protocol */ +#define IPPROTO_BRSATMON 76 /* BackRoom SATNET Monitoring */ +#define IPPROTO_ND 77 /* Sun net disk proto (temp.) */ +#define IPPROTO_WBMON 78 /* WIDEBAND Monitoring */ +#define IPPROTO_WBEXPAK 79 /* WIDEBAND EXPAK */ +#define IPPROTO_EON 80 /* ISO cnlp */ +#define IPPROTO_VMTP 81 /* VMTP */ +#define IPPROTO_SVMTP 82 /* Secure VMTP */ +#define IPPROTO_VINES 83 /* Banyon VINES */ +#define IPPROTO_TTP 84 /* TTP */ +#define IPPROTO_IGP 85 /* NSFNET-IGP */ +#define IPPROTO_DGP 86 /* dissimilar gateway prot. */ +#define IPPROTO_TCF 87 /* TCF */ +#define IPPROTO_IGRP 88 /* Cisco/GXS IGRP */ +#define IPPROTO_OSPFIGP 89 /* OSPFIGP */ +#define IPPROTO_SRPC 90 /* Strite RPC protocol */ +#define IPPROTO_LARP 91 /* Locus Address Resoloution */ +#define IPPROTO_MTP 92 /* Multicast Transport */ +#define IPPROTO_AX25 93 /* AX.25 Frames */ +#define IPPROTO_IPEIP 94 /* IP encapsulated in IP */ +#define IPPROTO_MICP 95 /* Mobile Int.ing control */ +#define IPPROTO_SCCSP 96 /* Semaphore Comm. security */ +#define IPPROTO_ETHERIP 97 /* Ethernet IP encapsulation */ +#define IPPROTO_ENCAP 98 /* encapsulation header */ +#define IPPROTO_APES 99 /* any private encr. scheme */ +#define IPPROTO_GMTP 100 /* GMTP*/ +#define IPPROTO_IPCOMP 108 /* payload compression (IPComp) */ +/* 101-254: Partly Unassigned */ +#define IPPROTO_PIM 103 /* Protocol Independent Mcast */ +#define IPPROTO_PGM 113 /* PGM */ +/* 255: Reserved */ +/* BSD Private, local use, namespace incursion */ +#define IPPROTO_DIVERT 254 /* divert pseudo-protocol */ +#define IPPROTO_RAW 255 /* raw IP packet */ +#define IPPROTO_MAX 256 + +/* last return value of *_input(), meaning "all job for this pkt is done". */ +#define IPPROTO_DONE 257 + +/* + * Local port number conventions: + * + * When a user does a bind(2) or connect(2) with a port number of zero, + * a non-conflicting local port address is chosen. + * The default range is IPPORT_RESERVED through + * IPPORT_USERRESERVED, although that is settable by sysctl. + * + * A user may set the IPPROTO_IP option IP_PORTRANGE to change this + * default assignment range. + * + * The value IP_PORTRANGE_DEFAULT causes the default behavior. + * + * The value IP_PORTRANGE_HIGH changes the range of candidate port numbers + * into the "high" range. These are reserved for client outbound connections + * which do not want to be filtered by any firewalls. + * + * The value IP_PORTRANGE_LOW changes the range to the "low" are + * that is (by convention) restricted to privileged processes. This + * convention is based on "vouchsafe" principles only. It is only secure + * if you trust the remote host to restrict these ports. + * + * The default range of ports and the high range can be changed by + * sysctl(3). (net.inet.ip.port{hi,low}{first,last}_auto) + * + * Changing those values has bad security implications if you are + * using a a stateless firewall that is allowing packets outside of that + * range in order to allow transparent outgoing connections. + * + * Such a firewall configuration will generally depend on the use of these + * default values. If you change them, you may find your Security + * Administrator looking for you with a heavy object. + * + * For a slightly more orthodox text view on this: + * + * ftp://ftp.isi.edu/in-notes/iana/assignments/port-numbers + * + * port numbers are divided into three ranges: + * + * 0 - 1023 Well Known Ports + * 1024 - 49151 Registered Ports + * 49152 - 65535 Dynamic and/or Private Ports + * + */ + +/* + * Ports < IPPORT_RESERVED are reserved for + * privileged processes (e.g. root). (IP_PORTRANGE_LOW) + * Ports > IPPORT_USERRESERVED are reserved + * for servers, not necessarily privileged. (IP_PORTRANGE_DEFAULT) + */ +#define IPPORT_RESERVED 1024 +#define IPPORT_USERRESERVED 5000 + +/* + * Default local port range to use by setting IP_PORTRANGE_HIGH + */ +#define IPPORT_HIFIRSTAUTO 49152 +#define IPPORT_HILASTAUTO 65535 + +/* + * Scanning for a free reserved port return a value below IPPORT_RESERVED, + * but higher than IPPORT_RESERVEDSTART. Traditionally the start value was + * 512, but that conflicts with some well-known-services that firewalls may + * have a fit if we use. + */ +#define IPPORT_RESERVEDSTART 600 + +/* + * Internet address (a structure for historical reasons) + */ +struct in_addr { + in_addr_t s_addr; +}; + +/* + * Definitions of bits in internet address integers. + * On subnets, the decomposition of addresses to host and net parts + * is done according to subnet mask, not the masks here. + */ +#define IN_CLASSA(i) (((u_int32_t)(i) & 0x80000000) == 0) +#define IN_CLASSA_NET 0xff000000 +#define IN_CLASSA_NSHIFT 24 +#define IN_CLASSA_HOST 0x00ffffff +#define IN_CLASSA_MAX 128 + +#define IN_CLASSB(i) (((u_int32_t)(i) & 0xc0000000) == 0x80000000) +#define IN_CLASSB_NET 0xffff0000 +#define IN_CLASSB_NSHIFT 16 +#define IN_CLASSB_HOST 0x0000ffff +#define IN_CLASSB_MAX 65536 + +#define IN_CLASSC(i) (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) +#define IN_CLASSC_NET 0xffffff00 +#define IN_CLASSC_NSHIFT 8 +#define IN_CLASSC_HOST 0x000000ff + +#define IN_CLASSD(i) (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) +#define IN_CLASSD_NET 0xf0000000 /* These ones aren't really */ +#define IN_CLASSD_NSHIFT 28 /* net and host fields, but */ +#define IN_CLASSD_HOST 0x0fffffff /* routing needn't know. */ +#define IN_MULTICAST(i) IN_CLASSD(i) + +#define IN_EXPERIMENTAL(i) (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) +#define IN_BADCLASS(i) (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) + +#define INADDR_ANY (u_int32_t)0x00000000 +#define INADDR_LOOPBACK (u_int32_t)0x7f000001 +#define INADDR_BROADCAST (u_int32_t)0xffffffff /* must be masked */ +#ifndef _KERNEL +#define INADDR_NONE 0xffffffff /* -1 return */ +#endif + +#define INADDR_UNSPEC_GROUP (u_int32_t)0xe0000000 /* 224.0.0.0 */ +#define INADDR_ALLHOSTS_GROUP (u_int32_t)0xe0000001 /* 224.0.0.1 */ +#define INADDR_ALLRTRS_GROUP (u_int32_t)0xe0000002 /* 224.0.0.2 */ +#define INADDR_MAX_LOCAL_GROUP (u_int32_t)0xe00000ff /* 224.0.0.255 */ + +#define IN_LOOPBACKNET 127 /* official! */ + +/* + * Socket address, internet style. + */ +struct sockaddr_in { + u_char sin_len; + u_char sin_family; + u_short sin_port; + struct in_addr sin_addr; + char sin_zero[8]; +}; + +#define INET_ADDRSTRLEN 16 + +/* + * Options for use with [gs]etsockopt at the IP level. + * First word of comment is data type; bool is stored in int. + */ +#define IP_OPTIONS 1 /* buf/ip_opts; set/get IP options */ +#define IP_HDRINCL 2 /* int; header is included with data */ +#define IP_TOS 3 /* int; IP type of service and preced. */ +#define IP_TTL 4 /* int; IP time to live */ +#define IP_RECVOPTS 5 /* bool; receive all IP opts w/dgram */ +#define IP_RECVRETOPTS 6 /* bool; receive IP opts for response */ +#define IP_RECVDSTADDR 7 /* bool; receive IP dst addr w/dgram */ +#define IP_RETOPTS 8 /* ip_opts; set/get IP options */ +#define IP_MULTICAST_IF 9 /* u_char; set/get IP multicast i/f */ +#define IP_MULTICAST_TTL 10 /* u_char; set/get IP multicast ttl */ +#define IP_MULTICAST_LOOP 11 /* u_char; set/get IP multicast loopback */ +#define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */ +#define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop an IP group membership */ +#define IP_MULTICAST_VIF 14 /* set/get IP mcast virt. iface */ +#define IP_RSVP_ON 15 /* enable RSVP in kernel */ +#define IP_RSVP_OFF 16 /* disable RSVP in kernel */ +#define IP_RSVP_VIF_ON 17 /* set RSVP per-vif socket */ +#define IP_RSVP_VIF_OFF 18 /* unset RSVP per-vif socket */ +#define IP_PORTRANGE 19 /* int; range to choose for unspec port */ +#define IP_RECVIF 20 /* bool; receive reception if w/dgram */ +/* for IPSEC */ +#define IP_IPSEC_POLICY 21 /* int; set/get security policy */ +#define IP_FAITH 22 /* bool; accept FAITH'ed connections */ + +#define IP_ONESBCAST 23 /* bool: send all-ones broadcast */ + +#define IP_FW_TABLE_ADD 40 /* add entry */ +#define IP_FW_TABLE_DEL 41 /* delete entry */ +#define IP_FW_TABLE_FLUSH 42 /* flush table */ +#define IP_FW_TABLE_GETSIZE 43 /* get table size */ +#define IP_FW_TABLE_LIST 44 /* list table contents */ + +#define IP_FW_ADD 50 /* add a firewall rule to chain */ +#define IP_FW_DEL 51 /* delete a firewall rule from chain */ +#define IP_FW_FLUSH 52 /* flush firewall rule chain */ +#define IP_FW_ZERO 53 /* clear single/all firewall counter(s) */ +#define IP_FW_GET 54 /* get entire firewall rule chain */ +#define IP_FW_RESETLOG 55 /* reset logging counters */ + +#define IP_DUMMYNET_CONFIGURE 60 /* add/configure a dummynet pipe */ +#define IP_DUMMYNET_DEL 61 /* delete a dummynet pipe from chain */ +#define IP_DUMMYNET_FLUSH 62 /* flush dummynet */ +#define IP_DUMMYNET_GET 64 /* get entire dummynet pipes */ + +/* + * Defaults and limits for options + */ +#define IP_DEFAULT_MULTICAST_TTL 1 /* normally limit m'casts to 1 hop */ +#define IP_DEFAULT_MULTICAST_LOOP 1 /* normally hear sends if a member */ +#define IP_MAX_MEMBERSHIPS 20 /* per socket */ + +/* + * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP. + */ +struct ip_mreq { + struct in_addr imr_multiaddr; /* IP multicast address of group */ + struct in_addr imr_interface; /* local IP address of interface */ +}; + +/* + * Argument for IP_PORTRANGE: + * - which range to search when port is unspecified at bind() or connect() + */ +#define IP_PORTRANGE_DEFAULT 0 /* default range */ +#define IP_PORTRANGE_HIGH 1 /* "high" - request firewall bypass */ +#define IP_PORTRANGE_LOW 2 /* "low" - vouchsafe security */ + +/* + * Definitions for inet sysctl operations. + * + * Third level is protocol number. + * Fourth level is desired variable within that protocol. + */ +#define IPPROTO_MAXID (IPPROTO_AH + 1) /* don't list to IPPROTO_MAX */ + +#define CTL_IPPROTO_NAMES { \ + { "ip", CTLTYPE_NODE }, \ + { "icmp", CTLTYPE_NODE }, \ + { "igmp", CTLTYPE_NODE }, \ + { "ggp", CTLTYPE_NODE }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { "tcp", CTLTYPE_NODE }, \ + { 0, 0 }, \ + { "egp", CTLTYPE_NODE }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { "pup", CTLTYPE_NODE }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { "udp", CTLTYPE_NODE }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { "idp", CTLTYPE_NODE }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { "ipsec", CTLTYPE_NODE }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { 0, 0 }, \ + { "pim", CTLTYPE_NODE }, \ +} + +/* + * Names for IP sysctl objects + */ +#define IPCTL_FORWARDING 1 /* act as router */ +#define IPCTL_SENDREDIRECTS 2 /* may send redirects when forwarding */ +#define IPCTL_DEFTTL 3 /* default TTL */ +#ifdef notyet +#define IPCTL_DEFMTU 4 /* default MTU */ +#endif +#define IPCTL_RTEXPIRE 5 /* cloned route expiration time */ +#define IPCTL_RTMINEXPIRE 6 /* min value for expiration time */ +#define IPCTL_RTMAXCACHE 7 /* trigger level for dynamic expire */ +#define IPCTL_SOURCEROUTE 8 /* may perform source routes */ +#define IPCTL_DIRECTEDBROADCAST 9 /* may re-broadcast received packets */ +#define IPCTL_INTRQMAXLEN 10 /* max length of netisr queue */ +#define IPCTL_INTRQDROPS 11 /* number of netisr q drops */ +#define IPCTL_STATS 12 /* ipstat structure */ +#define IPCTL_ACCEPTSOURCEROUTE 13 /* may accept source routed packets */ +#define IPCTL_FASTFORWARDING 14 /* use fast IP forwarding code */ +#define IPCTL_KEEPFAITH 15 /* FAITH IPv4->IPv6 translater ctl */ +#define IPCTL_GIF_TTL 16 /* default TTL for gif encap packet */ +#define IPCTL_MAXID 17 + +#define IPCTL_NAMES { \ + { 0, 0 }, \ + { "forwarding", CTLTYPE_INT }, \ + { "redirect", CTLTYPE_INT }, \ + { "ttl", CTLTYPE_INT }, \ + { "mtu", CTLTYPE_INT }, \ + { "rtexpire", CTLTYPE_INT }, \ + { "rtminexpire", CTLTYPE_INT }, \ + { "rtmaxcache", CTLTYPE_INT }, \ + { "sourceroute", CTLTYPE_INT }, \ + { "directed-broadcast", CTLTYPE_INT }, \ + { "intr-queue-maxlen", CTLTYPE_INT }, \ + { "intr-queue-drops", CTLTYPE_INT }, \ + { "stats", CTLTYPE_STRUCT }, \ + { "accept_sourceroute", CTLTYPE_INT }, \ + { "fastforwarding", CTLTYPE_INT }, \ +} + +#ifdef _KERNEL +struct ifnet; struct mbuf; /* forward declarations for Standard C */ +#endif + +/* INET6 stuff */ +#define __KAME_NETINET_IN_H_INCLUDED_ +#include +#undef __KAME_NETINET_IN_H_INCLUDED_ + +#ifdef _KERNEL + +int in_broadcast __P((struct in_addr, struct ifnet *)); +int in_canforward __P((struct in_addr)); +int in_cksum __P((struct mbuf *, int)); +int in_localaddr __P((struct in_addr)); +char *inet_ntoa __P((struct in_addr)); /* in libkern */ + +int prison_ip __P((struct proc *p, int flag, u_int32_t *ip)); +void prison_remote_ip __P((struct proc *p, int flag, u_int32_t *ip)); + +#define in_hosteq(s, t) ((s).s_addr == (t).s_addr) +#define in_nullhost(x) ((x).s_addr == INADDR_ANY) + +#define satosin(sa) ((struct sockaddr_in *)(sa)) +#define sintosa(sin) ((struct sockaddr *)(sin)) +#define ifatoia(ifa) ((struct in_ifaddr *)(ifa)) + +#endif + +#endif diff --git a/wip/raster3d/options.mk b/wip/raster3d/options.mk new file mode 100644 index 000000000000..9f0e5ef123d2 --- /dev/null +++ b/wip/raster3d/options.mk @@ -0,0 +1,7 @@ +# $NetBSD$ + +PKG_OPTIONS_VAR= PKG_OPTIONS.raster3d +PKG_SUPPORTED_OPTIONS= magick +PKG_SUGGESTED_OPTIONS= magick + +.include "../../mk/bsd.options.mk" diff --git a/wip/raster3d/patches/patch-aa b/wip/raster3d/patches/patch-aa new file mode 100644 index 000000000000..7cf14c4ecb6c --- /dev/null +++ b/wip/raster3d/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD$ + +--- Makefile.orig Wed Apr 12 19:46:10 2006 ++++ Makefile Fri Apr 28 02:48:06 2006 +@@ -156,6 +156,16 @@ + @echo FFLAGS = \${CFLAGS} >> Makefile.incl + @echo RM = /bin/rm -f >> Makefile.incl + ++netbsd: strip-for-g77 ++ @cp Makefile.template Makefile.incl ++ @echo OS = ${OPSYS} >> Makefile.incl ++ @echo CC = ${CC} >> Makefile.incl ++ @echo CFLAGS = ${CFLAGS} >> Makefile.incl ++ @echo FC = ${F77} >> Makefile.incl ++ @echo FFLAGS = ${FFLAGS} >> Makefile.incl ++ @echo RM = /bin/rm -f >> Makefile.incl ++ @echo OSDEFS = ${OSDEFS} >> Makefile.incl ++ @echo include Makefile.package >> Makefile.incl + + strip-for-g77: render.f.bak normal3d.f.bak rastep.f.bak + render.f.bak: diff --git a/wip/raster3d/patches/patch-ab b/wip/raster3d/patches/patch-ab new file mode 100644 index 000000000000..24c81e083f65 --- /dev/null +++ b/wip/raster3d/patches/patch-ab @@ -0,0 +1,27 @@ +$NetBSD$ + +--- avs2ps.c.orig 2006-04-11 19:47:39.000000000 +0100 ++++ avs2ps.c 2006-08-17 17:52:17.000000000 +0100 +@@ -5,12 +5,21 @@ + * but I see no reason it shouldn't work with any other AVS input file. + * Ethan A Merritt - Aug 1994 + */ ++#if defined (__FreeBSD__) ++# include ++#endif ++ + #include + #include + #include + #include + #include +-#include ++ ++#if defined (__FreeBSD__) && __FreeBSD_version < 500000 ++# include "in.h" ++#else ++# include ++#endif + + #ifdef WIN32 + #define random rand diff --git a/wip/slashem/DESCR b/wip/slashem/DESCR new file mode 100644 index 000000000000..26e15210f45e --- /dev/null +++ b/wip/slashem/DESCR @@ -0,0 +1,2 @@ +Slash'EM (Super Lotsa Added Stuff Hack - Extended Magic) +is a Nethack variant with more stuff. diff --git a/wip/slashem/Makefile b/wip/slashem/Makefile new file mode 100644 index 000000000000..3390ca254088 --- /dev/null +++ b/wip/slashem/Makefile @@ -0,0 +1,32 @@ +# $NetBSD$ +# + +DISTNAME= se${VERSION:tl:S/.//g} +PKGNAME= slashem-${VERSION} +CATEGORIES= games +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slashem/} + +MAINTAINER= lifanov@mail.lifanov.com +HOMEPAGE= http://slashem.sourceforge.net/ +COMMENT= Slash'EM is a Nethack variant with more stuff +LICENSE= gnu-gpl-v2 + +PKG_DESTDIR_SUPPORT= user-destdir + +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +USE_LANGUAGES= c c++ +HAS_CONFIGURE= yes + +CONFIGURE_SCRIPT= setup.sh +CONFIGURE_DIRS= sys/unix +BUILD_DIRS= . + +VERSION= 0.0.7E7F3 + +SUBST_CLASSES+= dirs +SUBST_STAGE.dirs= post-configure +SUBST_FILES.dirs= Makefile +SUBST_SED.dirs= -e 's|/usr|${PREFIX}|' +SUBST_SED.dirs+= -e 's|/local||' + +.include "../../mk/bsd.pkg.mk" diff --git a/wip/slashem/PLIST b/wip/slashem/PLIST new file mode 100644 index 000000000000..e3ecd015cafc --- /dev/null +++ b/wip/slashem/PLIST @@ -0,0 +1,208 @@ +@comment $NetBSD$ +bin/slashem +slashemdir/Arc-fila.lev +slashemdir/Arc-filb.lev +slashemdir/Arc-goal.lev +slashemdir/Arc-loca.lev +slashemdir/Arc-strt.lev +slashemdir/Bar-fila.lev +slashemdir/Bar-filb.lev +slashemdir/Bar-goal.lev +slashemdir/Bar-loca.lev +slashemdir/Bar-strt.lev +slashemdir/Cav-fila.lev +slashemdir/Cav-filb.lev +slashemdir/Cav-goal.lev +slashemdir/Cav-loca.lev +slashemdir/Cav-strt.lev +slashemdir/Fla-fila.lev +slashemdir/Fla-filb.lev +slashemdir/Fla-goal.lev +slashemdir/Fla-loca.lev +slashemdir/Fla-strt.lev +slashemdir/Guidebook.txt +slashemdir/Hea-fila.lev +slashemdir/Hea-filb.lev +slashemdir/Hea-goal.lev +slashemdir/Hea-loca.lev +slashemdir/Hea-strt.lev +slashemdir/Ice-fila.lev +slashemdir/Ice-filb.lev +slashemdir/Ice-goal.lev +slashemdir/Ice-loca.lev +slashemdir/Ice-strt.lev +slashemdir/Kni-fila.lev +slashemdir/Kni-filb.lev +slashemdir/Kni-goal.lev +slashemdir/Kni-loca.lev +slashemdir/Kni-strt.lev +slashemdir/Mon-fila.lev +slashemdir/Mon-filb.lev +slashemdir/Mon-goal.lev +slashemdir/Mon-loca.lev +slashemdir/Mon-strt.lev +slashemdir/Nec-fila.lev +slashemdir/Nec-filb.lev +slashemdir/Nec-goal.lev +slashemdir/Nec-loca.lev +slashemdir/Nec-strt.lev +slashemdir/Pri-fila.lev +slashemdir/Pri-filb.lev +slashemdir/Pri-goal.lev +slashemdir/Pri-loca.lev +slashemdir/Pri-strt.lev +slashemdir/Ran-fila.lev +slashemdir/Ran-filb.lev +slashemdir/Ran-goal.lev +slashemdir/Ran-loca.lev +slashemdir/Ran-strt.lev +slashemdir/Rog-fila.lev +slashemdir/Rog-filb.lev +slashemdir/Rog-goal.lev +slashemdir/Rog-loca.lev +slashemdir/Rog-strt.lev +slashemdir/Sam-fila.lev +slashemdir/Sam-filb.lev +slashemdir/Sam-goal.lev +slashemdir/Sam-loca.lev +slashemdir/Sam-strt.lev +slashemdir/Tou-fila.lev +slashemdir/Tou-filb.lev +slashemdir/Tou-goal.lev +slashemdir/Tou-loca.lev +slashemdir/Tou-strt.lev +slashemdir/Und-fila.lev +slashemdir/Und-filb.lev +slashemdir/Und-goal.lev +slashemdir/Und-loca.lev +slashemdir/Und-strt.lev +slashemdir/Val-fila.lev +slashemdir/Val-filb.lev +slashemdir/Val-goal.lev +slashemdir/Val-loca.lev +slashemdir/Val-strt.lev +slashemdir/Wiz-fila.lev +slashemdir/Wiz-filb.lev +slashemdir/Wiz-goal.lev +slashemdir/Wiz-loca.lev +slashemdir/Wiz-strt.lev +slashemdir/Yeo-fila.lev +slashemdir/Yeo-filb.lev +slashemdir/Yeo-goal.lev +slashemdir/Yeo-loca.lev +slashemdir/Yeo-strt.lev +slashemdir/air.lev +slashemdir/asmodeus.lev +slashemdir/astral.lev +slashemdir/baalz.lev +slashemdir/beholder.lev +slashemdir/bigrm-1.lev +slashemdir/bigrm-2.lev +slashemdir/bigrm-3.lev +slashemdir/bigrm-4.lev +slashemdir/bigrm-5.lev +slashemdir/blkmar.lev +slashemdir/castle.lev +slashemdir/cav2fill.lev +slashemdir/cmdhelp +slashemdir/data +slashemdir/demogorg.lev +slashemdir/dispater.lev +slashemdir/dragons.lev +slashemdir/dungeon +slashemdir/earth.lev +slashemdir/fakewiz1.lev +slashemdir/fakewiz2.lev +slashemdir/fire.lev +slashemdir/frnknstn.lev +slashemdir/geryon.lev +slashemdir/grund-1.lev +slashemdir/grund-2.lev +slashemdir/grund-3.lev +slashemdir/guild.lev +slashemdir/gypsy.txt +slashemdir/help +slashemdir/hh +slashemdir/history +slashemdir/juiblex.lev +slashemdir/knox.lev +slashemdir/kobold-1.lev +slashemdir/kobold-2.lev +slashemdir/license +slashemdir/lich.lev +slashemdir/logfile +slashemdir/mall-1.lev +slashemdir/mall-2.lev +slashemdir/mall.lev +slashemdir/medusa-1.lev +slashemdir/medusa-2.lev +slashemdir/medusa-3.lev +slashemdir/medusa-4.lev +slashemdir/minefill.lev +slashemdir/mineking.lev +slashemdir/minend-1.lev +slashemdir/minend-2.lev +slashemdir/minend-3.lev +slashemdir/minetn-1.lev +slashemdir/minetn-2.lev +slashemdir/minetn-3.lev +slashemdir/minetn-4.lev +slashemdir/minetn-5.lev +slashemdir/minetn-6.lev +slashemdir/minetn-7.lev +slashemdir/mtemple.lev +slashemdir/nightmar.lev +slashemdir/nymph.lev +slashemdir/opthelp +slashemdir/options +slashemdir/oracle.lev +slashemdir/oracles +slashemdir/orcus.lev +slashemdir/perm +slashemdir/quest.dat +slashemdir/rats.lev +slashemdir/record +slashemdir/recover +slashemdir/rumors +slashemdir/sanctum.lev +slashemdir/sea.lev +slashemdir/slashem +slashemdir/soko1-1.lev +slashemdir/soko1-2.lev +slashemdir/soko1-3.lev +slashemdir/soko1-4.lev +slashemdir/soko2-1.lev +slashemdir/soko2-2.lev +slashemdir/soko2-3.lev +slashemdir/soko2-4.lev +slashemdir/soko2-5.lev +slashemdir/soko2-6.lev +slashemdir/soko2-7.lev +slashemdir/soko3-1.lev +slashemdir/soko3-2.lev +slashemdir/soko3-3.lev +slashemdir/soko3-4.lev +slashemdir/soko3-5.lev +slashemdir/soko3-6.lev +slashemdir/soko3-7.lev +slashemdir/soko4-1.lev +slashemdir/soko4-2.lev +slashemdir/soko4-3.lev +slashemdir/soko4-4.lev +slashemdir/soko4-5.lev +slashemdir/spiders.lev +slashemdir/stor-1.lev +slashemdir/stor-2.lev +slashemdir/stor-3.lev +slashemdir/tomb.lev +slashemdir/tower1.lev +slashemdir/tower2.lev +slashemdir/tower3.lev +slashemdir/valley.lev +slashemdir/water.lev +slashemdir/wizard1.lev +slashemdir/wizard2.lev +slashemdir/wizard3.lev +slashemdir/wizhelp +slashemdir/yeenoghu.lev +@pkgdir slashemdir/save diff --git a/wip/slashem/TODO b/wip/slashem/TODO new file mode 100644 index 000000000000..0474a4b98e2b --- /dev/null +++ b/wip/slashem/TODO @@ -0,0 +1,5 @@ +PR#43253 + +* Need to adjust include/unixconf.h conditionally +* In addition, Maybe, need to depend on termcap/terminfo/curses conditionally. +* Not ready to user-destdir. diff --git a/wip/slashem/distinfo b/wip/slashem/distinfo new file mode 100644 index 000000000000..44dda45730ea --- /dev/null +++ b/wip/slashem/distinfo @@ -0,0 +1,7 @@ +$NetBSD$ + +SHA1 (se007e7f3.tar.gz) = 24009b87ec13067647c6d23c80671d99e763e2cb +RMD160 (se007e7f3.tar.gz) = 0fd50b31ce952991b194fbf7b59b6e53353ce991 +Size (se007e7f3.tar.gz) = 5288791 bytes +SHA1 (patch-aa) = c49e7182fff8b545235b1016456e3d08f97aba6c +SHA1 (patch-ab) = 8b59e6fde291859d7cda097d678512df103140bf diff --git a/wip/slashem/patches/patch-aa b/wip/slashem/patches/patch-aa new file mode 100644 index 000000000000..5fab99bac6ec --- /dev/null +++ b/wip/slashem/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD$ + +--- win/tty/termcap.c.orig 2006-12-30 13:08:31.000000000 +0000 ++++ win/tty/termcap.c +@@ -960,10 +960,6 @@ cl_eos() /* free after Robert Viduya * + + #include + +-#if !defined(LINUX) && !defined(__FreeBSD__) +-extern char *tparm(); +-#endif +- + # ifdef COLOR_BLACK /* trust include file */ + #ifndef VIDEOSHADES + #undef COLOR_BLACK diff --git a/wip/slashem/patches/patch-ab b/wip/slashem/patches/patch-ab new file mode 100644 index 000000000000..e883f1e5725f --- /dev/null +++ b/wip/slashem/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD$ + +--- include/system.h.orig 2006-12-30 13:08:31.000000000 +0000 ++++ include/system.h +@@ -81,10 +81,10 @@ typedef long off_t; + # if !defined(__SC__) && !defined(__CYGWIN__) && !defined(LINUX) + E long NDECL(random); + # endif +-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM) ++# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__) && !defined(__NetBSD__)) || defined(RANDOM) + E void FDECL(srandom, (unsigned int)); + # else +-# if !defined(bsdi) && !defined(LINUX) && !defined(__CYGWIN__) && !defined(__FreeBSD__) ++# if !defined(bsdi) && !defined(LINUX) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__NetBSD__) + E int FDECL(srandom, (unsigned int)); + # endif + # endif -- 2.41.0