aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cad/brlcad/Makefile99
-rw-r--r--cad/brlcad/distinfo4
-rw-r--r--cad/brlcad/files/patch-Makefile.in30
-rw-r--r--cad/brlcad/files/patch-include+raytrace.h11
-rw-r--r--cad/brlcad/files/patch-sh_vers.sh11
-rw-r--r--cad/brlcad/files/patch-src+librt+g_bot_include.c11
-rw-r--r--cad/brlcad/pkg-plist18
7 files changed, 65 insertions, 119 deletions
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 971aab3c487a..b29432aee02b 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -6,18 +6,19 @@
#
PORTNAME= brlcad
-PORTVERSION= 7.0.4
+PORTVERSION= 7.2.2
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= brlcad
-MAINTAINER= giffunip@asme.org
+MAINTAINER= erik@smluc.org
COMMENT= CSG modelling system from the US Ballistic Research Laboratory
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_GL= yes
+USE_GMAKE= yes
PREFIX?= ${LOCALBASE}/${PORTNAME}
USE_LIBTOOL_VER= 15
@@ -44,53 +45,53 @@ MAN1= aliastorle.1 all_sf.1 alias-pix.1 anim_cascade.1 anim_fly.1 \
bwstat.1 bwthresh.1 cad_boundp.1 cad_parea.1 cat-fb.1 cell-fb.1 \
chan_mult.1 chan_permute.1 cmap-fb.1 comgeom-g.1 conv-vg2g.1 \
crop.1 cubitorle.1 cy-g.1 cv.1 dbclean.1 dbcp.1 decimate.1 \
- display.1 dpix-pix.1 dunncolor.1 dunnsnap.1 dvirle.1 dxf-g.1 \
- enf-g.1 euclid-g.1 fant.1 fast4-g.1 fb-bw.1 fb-cmap.1 fb-fb.1 \
- fb-orle.1 fb-pix.1 fb-png.1 fb-rle.1 fbanim.1 fbcbars.1 \
- fbclear.1 fbcmap.1 fbcmrot.1 fbcolor.1 fbed.1 fbfade.1 \
- fbframe.1 fbfree.1 fbgamma.1 fbgrid.1 fbhelp.1 fblabel.1 \
- fbline.1 fbpoint.1 fbscanplot.1 fbserv.1 fbstretch.1 fbzoom.1 \
- firpass.1 g-acad.1 g-dxf.1 g-euclid.1 g-iges.1 g-nff.1 g-nmg.1 \
- g-shell.rect.1 g-stl.1 g-tankill.1 g-vrml.1 g-wave.1 g-x3d.1 \
- g2asc.1 g_diff.1 g_lint.1 gencolor.1 get4d.1 get_orion.1 \
- getami.1 getap.1 getbob.1 getcx3d.1 getfb.1 getgmr.1 getiris.1 \
- getmac.1 getmex.1 getqcr.1 getren.1 getsun.1 gettaac.1 getx10.1 \
- getx11.1 gif-fb.1 gif2fb.1 giftorle.1 graytorle.1 halftone.1 \
- hd.1 iges-g.1 imgdims.1 into.1 ir-X.1 ir-sgi.1 irdisp.1 lgt.1 \
- loop.1 mac-pix.1 mcut.1 mergechan.1 mged.1 mk_bolt.1 \
- mk_gastank.1 mk_handle.1 mk_window.1 mk_winfrm.1 mk_wire.1 \
- morphedit.1 nastran-g.1 nirt.1 nmg-bot.1 nmg-rib.1 op-bw.1 \
- orle-fb.1 orle-pix.1 painttorle.1 patch-g.1 pcd-pix.1 \
- picket_fence.1 pix-alias.1 pix-bw.1 pix-bw3.1 pix-fb.1 \
- pix-orle.1 pix-png.1 pix-ps.1 pix-rle.1 pix-sun.1 pix2asc.1 \
- pixautosize.1 pixbackgnd.1 pixbgstrip.1 pixblend.1 pixborder.1 \
- pixbustup.1 pixclump.1 pixcolors.1 pixcut.1 pixdiff.1 \
- pixdsplit.1 pixfade.1 pixfilter.1 pixhalve.1 pixhist.1 \
- pixhist3d-pl.1 pixhist3d.1 pixinterp2x.1 pixmatte.1 pixmerge.1 \
- pixmorph.1 pixrect.1 pixrot.1 pixsaturate.1 pixscale.1 \
- pixshrink.1 pixstat.1 pixsubst.1 pixtile.1 pixuntile.1 pl-X.1 \
- pl-X10.1 pl-asc.1 pl-fb.1 pl-hpgl.1 pl-pl.1 pl-ps.1 pl-sgi.1 \
- pl-starbase.1 pl-tek.1 plcolor.1 pldebug.1 plgetframe.1 \
- plline2.1 plrot.1 ply-g.1 png-bw.1 png-pix.1 png_info.1 \
- png-fb.1 polar-fb.1 poly-bot.1 pp-fb.1 ppmtorle.1 proe-g.1 \
- pyrmask.1 query.1 rastorle.1 rawtorle.1 read98721.1 remrt.1 \
- repos.1 rlatorle.1 rle-fb.1 rleClock.1 rleaddcom.1 rleaddeof.1 \
- rlebg.1 rlebox.1 rlecat.1 rleccube.1 rle-pix.1 rlecomp.1 \
- rledither.1 rleflip.1 rlegrid.1 rlehdr.1 rlehisto.1 rleinterp.1 \
- rleldmap.1 rlemandl.1 rlenoise.1 rlepatch.1 rleprint.1 \
- rlequant.1 rlescale.1 rleselect.1 rlesetbg.1 rleskel.1 \
- rlespiff.1 rlesplice.1 rlesplit.1 rlestereo.1 rleswap.1 \
- rletoabA60.1 rletoabA62.1 rletoalias.1 rletoascii.1 rletocgm.1 \
- rletogif.1 rletogray.1 rletopaint.1 rletoppm.1 rletops.1 \
- rletorast.1 rletoraw.1 rletorla.1 rletotarga.1 rletotiff.1 \
- rlezoom.1 rpatch.1 rt.1 rt_bot_faces.1 rtcheck.1 rtedge.1 \
- rtg3.1 rthide.1 rtpp.1 rtrange.1 rtray.1 rtregis.1 rtscale.1 \
- rtshot.1 rttherm.1 rtwalk.1 rtweight.1 rtxray.1 scriptsort.1 \
- secpass.1 shapefact.1 show3.1 showshot.1 smush.1 ssamp-bw.1 \
- stl-g.1 sun-pix.1 tabinterp.1 tabsub.1 tankill-g.1 targatorle.1 \
- tclsh.1 template.1 terrain.1 tifftorle.1 to8.1 tobw.1 ug-g.1 \
- unexp.1 unslice.1 urt.1 vas4.1 vdeck.1 viewpoint-g.1 \
- wasatchrle.1 wavelet.1 wish.1
+ dpix-pix.1 dunncolor.1 dunnsnap.1 dvirle.1 dxf-g.1 enf-g.1 \
+ euclid-g.1 fant.1 fast4-g.1 fb-bw.1 fb-cmap.1 fb-fb.1 fb-orle.1 \
+ fb-pix.1 fb-png.1 fb-rle.1 fbanim.1 fbcbars.1 fbclear.1 \
+ fbcmap.1 fbcmrot.1 fbcolor.1 fbed.1 fbfade.1 fbframe.1 fbfree.1 \
+ fbgamma.1 fbgrid.1 fbhelp.1 fblabel.1 fbline.1 fbpoint.1 \
+ fbscanplot.1 fbserv.1 fbstretch.1 fbzoom.1 firpass.1 g-acad.1 \
+ g-dxf.1 g-euclid.1 g-iges.1 g-nff.1 g-nmg.1 g-shell.rect.1 \
+ g-stl.1 g-tankill.1 g-vrml.1 g-wave.1 g-x3d.1 g2asc.1 g_diff.1 \
+ g_lint.1 gencolor.1 get4d.1 get_orion.1 getami.1 getap.1 \
+ getbob.1 getcx3d.1 getfb.1 getgmr.1 getiris.1 getmac.1 getmex.1 \
+ getqcr.1 getren.1 getsun.1 gettaac.1 getx10.1 getx11.1 gif-fb.1 \
+ gif2fb.1 giftorle.1 graytorle.1 halftone.1 hd.1 iges-g.1 \
+ imgdims.1 into.1 ir-X.1 ir-sgi.1 irdisp.1 lgt.1 loop.1 \
+ mac-pix.1 mcut.1 mergechan.1 mged.1 mk_bolt.1 mk_gastank.1 \
+ mk_handle.1 mk_window.1 mk_winfrm.1 mk_wire.1 morphedit.1 \
+ nastran-g.1 nirt.1 nmg-bot.1 nmg-rib.1 op-bw.1 orle-fb.1 \
+ orle-pix.1 painttorle.1 patch-g.1 pcd-pix.1 picket_fence.1 \
+ pix-alias.1 pix-bw.1 pix-bw3.1 pix-fb.1 pix-orle.1 pix-png.1 \
+ pix-ps.1 pix-rle.1 pix-sun.1 pix2asc.1 pixautosize.1 \
+ pixbackgnd.1 pixbgstrip.1 pixblend.1 pixborder.1 pixbustup.1 \
+ pixclump.1 pixcolors.1 pixcut.1 pixdiff.1 pixdsplit.1 pixfade.1 \
+ pixfilter.1 pixhalve.1 pixhist.1 pixhist3d-pl.1 pixhist3d.1 \
+ pixinterp2x.1 pixmatte.1 pixmerge.1 pixmorph.1 pixrect.1 \
+ pixrot.1 pixsaturate.1 pixscale.1 pixshrink.1 pixstat.1 \
+ pixsubst.1 pixtile.1 pixuntile.1 pl-X.1 pl-X10.1 pl-asc.1 \
+ pl-fb.1 pl-hpgl.1 pl-pl.1 pl-ps.1 pl-sgi.1 pl-starbase.1 \
+ pl-tek.1 plcolor.1 pldebug.1 plgetframe.1 plline2.1 plrot.1 \
+ ply-g.1 png-bw.1 png-pix.1 png_info.1 png-fb.1 polar-fb.1 \
+ poly-bot.1 pp-fb.1 ppmtorle.1 proe-g.1 pyrmask.1 query.1 \
+ rastorle.1 rawtorle.1 read98721.1 remrt.1 repos.1 rlatorle.1 \
+ rle-fb.1 rleClock.1 rleaddcom.1 rleaddeof.1 rlebg.1 rlebox.1 \
+ rlecat.1 rleccube.1 rle-pix.1 rlecomp.1 rledither.1 rleflip.1 \
+ rlegrid.1 rlehdr.1 rlehisto.1 rleinterp.1 rleldmap.1 rlemandl.1 \
+ rlenoise.1 rlepatch.1 rleprint.1 rlequant.1 rlescale.1 \
+ rleselect.1 rlesetbg.1 rleskel.1 rlespiff.1 rlesplice.1 \
+ rlesplit.1 rlestereo.1 rleswap.1 rletoabA60.1 rletoabA62.1 \
+ rletoalias.1 rletoascii.1 rletocgm.1 rletogif.1 rletogray.1 \
+ rletopaint.1 rletoppm.1 rletops.1 rletorast.1 rletoraw.1 \
+ rletorla.1 rletotarga.1 rletotiff.1 rlezoom.1 rpatch.1 rt.1 \
+ rt_bot_faces.1 rtcheck.1 rtedge.1 rtg3.1 rthide.1 rtpp.1 \
+ rtrange.1 rtray.1 rtregis.1 rtscale.1 rtshot.1 rttherm.1 \
+ rtwalk.1 rtweight.1 rtxray.1 scriptsort.1 secpass.1 shapefact.1 \
+ show3.1 showshot.1 showtherm.1 smush.1 ssamp-bw.1 stl-g.1 \
+ sun-pix.1 tabinterp.1 tabsub.1 tankill-g.1 targatorle.1 tclsh.1 \
+ template.1 terrain.1 tifftorle.1 to8.1 tobw.1 ug-g.1 unexp.1 \
+ unslice.1 urt.1 vas4.1 vdeck.1 viewpoint-g.1 wasatchrle.1 \
+ wavelet.1 wish.1
MAN3 = 3DBorder.3 Access.3 AddErrInfo.3 AddOption.3 Alloc.3 AllowExc.3 \
AppInit.3 AssocData.3 Async.3 BackgdErr.3 Backslash.3 \
diff --git a/cad/brlcad/distinfo b/cad/brlcad/distinfo
index 9baac82b5df2..6d28a1e2fe26 100644
--- a/cad/brlcad/distinfo
+++ b/cad/brlcad/distinfo
@@ -1,2 +1,2 @@
-MD5 (brlcad-7.0.4.tar.bz2) = 8ae83a2ea9ad1196f3a6cecb103eb77d
-SIZE (brlcad-7.0.4.tar.bz2) = 16904452
+MD5 (brlcad-7.2.2.tar.bz2) = 1ee4ecda91598e04c145f16b21ab28f4
+SIZE (brlcad-7.2.2.tar.bz2) = 16900307
diff --git a/cad/brlcad/files/patch-Makefile.in b/cad/brlcad/files/patch-Makefile.in
deleted file mode 100644
index 66e9bd7e4e67..000000000000
--- a/cad/brlcad/files/patch-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.orig Thu Jan 27 07:54:18 2005
-+++ Makefile.in Sun Feb 13 16:22:41 2005
-@@ -654,19 +654,6 @@
- @ECHO@ "---" ;\
- @ECHO@ "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
- @ECHO@ ;\
-- line1=" BRL-CAD @BRLCAD_VERSION@ is now installed into $(prefix)" ;\
-- line2=" Be sure to add $(prefix)/bin to your PATH" ;\
-- length="`@ECHO@ $(prefix)@BRLCAD_VERSION@ | wc -c`" ;\
-- length="`expr $$length + 34`" ;\
-- separator="" ;\
-- while test $$length -gt 0 ; do \
-- separator="$${separator}***" ;\
-- length="`expr $$length - 3`" ;\
-- done ;\
-- @ECHO@ "$$separator" ;\
-- @ECHO@ "$$line1" ;\
-- @ECHO@ "$$line2" ;\
-- @ECHO@ "$$separator" ;\
- elif test "x$(MAKECMDGOALS)" = "x" -a "x$(.TARGETS)" = "x" ; then \
- @ECHO@ @ECHO_N@ "Elapsed time: " ;\
- sh $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/brlcad_version.h | grep Compilation` ;\
-@@ -676,6 +663,7 @@
- @ECHO@ "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
- fi
- @@ECHO@
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/cad/brlcad/files/patch-include+raytrace.h b/cad/brlcad/files/patch-include+raytrace.h
deleted file mode 100644
index 7fd857f1ab3f..000000000000
--- a/cad/brlcad/files/patch-include+raytrace.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/raytrace.h.orig Fri Mar 11 00:20:44 2005
-+++ include/raytrace.h Fri Mar 11 00:21:55 2005
-@@ -5001,7 +5001,7 @@
- (struct bu_list *vhead,
- const struct faceuse *fu,
- int poly_markers));
--RT_EXPORT BU_EXTERN(voidnmg_s_to_vlist,
-+RT_EXPORT BU_EXTERN(void nmg_s_to_vlist,
- (struct bu_list *vhead,
- const struct shell *s,
- int poly_markers));
diff --git a/cad/brlcad/files/patch-sh_vers.sh b/cad/brlcad/files/patch-sh_vers.sh
deleted file mode 100644
index 04d649a74f65..000000000000
--- a/cad/brlcad/files/patch-sh_vers.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- sh/vers.sh.orig Fri Dec 17 22:01:05 2004
-+++ sh/vers.sh Sun Feb 13 13:50:59 2005
-@@ -85,7 +85,7 @@
- awk '{version = $1 + 1; };END{printf "%d\n", version > "version"; }' < version
-
- VERSION=`cat version`
--DATE=`date`
-+DATE=`LC_ALL=C date`
- PATH=$PATH:/usr/ucb:/usr/bsd
- export PATH
-
diff --git a/cad/brlcad/files/patch-src+librt+g_bot_include.c b/cad/brlcad/files/patch-src+librt+g_bot_include.c
deleted file mode 100644
index 82ff384cb504..000000000000
--- a/cad/brlcad/files/patch-src+librt+g_bot_include.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/librt/g_bot_include.c.orig Thu Feb 10 22:36:31 2005
-+++ src/librt/g_bot_include.c Thu Feb 10 22:38:50 2005
-@@ -280,7 +280,7 @@
- VMOVE( p2, &bot_ip->vertices[bot_ip->faces[tri_index*3 + 1]*3] );
- VMOVE( p3, &bot_ip->vertices[bot_ip->faces[tri_index*3 + 2]*3] );
-
-- if( rt_bot_minpieces <= 0 || bot_ip->num_faces < rt_bot_minpieces ) {
-+ if( rt_bot_minpieces <= 0 || bot_ip->num_faces <= rt_bot_minpieces ) {
- VMINMAX( stp->st_min, stp->st_max, p1 );
- VMINMAX( stp->st_min, stp->st_max, p2 );
- VMINMAX( stp->st_min, stp->st_max, p3 );
diff --git a/cad/brlcad/pkg-plist b/cad/brlcad/pkg-plist
index aca8c4bd0267..908a07106847 100644
--- a/cad/brlcad/pkg-plist
+++ b/cad/brlcad/pkg-plist
@@ -32,7 +32,6 @@ bin/bot-raw
bin/bot_shell-vtk
bin/bottest
bin/brickwall
-bin/brlcad-check.sh
bin/brlman
bin/btclsh
bin/buffer
@@ -94,7 +93,6 @@ bin/dconv
bin/ddisp
bin/decimate
bin/dfft
-bin/display
bin/dmod
bin/double-asc
bin/dpeak
@@ -147,6 +145,7 @@ bin/fence
bin/fhor
bin/files-tape
bin/firpass
+bin/footer.sh
bin/g-acad
bin/g-dxf
bin/g-euclid
@@ -173,6 +172,7 @@ bin/globe
bin/graytorle
bin/halftone
bin/hd
+bin/header.sh
bin/i-a
bin/i-d
bin/i-f
@@ -180,6 +180,7 @@ bin/iges-g
bin/ihist
bin/imgdims
bin/imod
+bin/indent.sh
bin/into
bin/ir-X
bin/ir-sgi
@@ -192,6 +193,14 @@ bin/lgt
bin/loop
bin/mac-pix
bin/machinetype.sh
+bin/make_bz2.sh
+bin/make_deb.sh
+bin/make_dmg.sh
+bin/make_pkg.sh
+bin/make_rpm.sh
+bin/make_tar.sh
+bin/make_tgz.sh
+bin/make_zip.sh
bin/mcut
bin/mergechan
bin/mged
@@ -303,7 +312,6 @@ bin/proe-g
bin/pyramid
bin/pyrmask
bin/query
-bin/ranlib5.sh
bin/rawbot
bin/rawtorle
bin/remapid
@@ -383,10 +391,9 @@ bin/secpass
bin/sgi-pix
bin/sgisnap.sh
bin/shapefact
-bin/sharedliblink.sh
-bin/sharedlibvers.sh
bin/show.sh
bin/showshot
+bin/showtherm
bin/sketch
bin/smush
bin/solshoot
@@ -785,6 +792,7 @@ include/brlcad/nmg.h
include/brlcad/noalias-prag.h
include/brlcad/noalias.h
include/brlcad/nurb.h
+include/brlcad/optical.h
include/brlcad/orle.h
include/brlcad/photonmap.h
include/brlcad/pkg.h
generated by cgit (git 2.34.1) at 2024-11-20 02:37:33 +0800