[120698] trunk/dports/science/arb
mf2k at macports.org
mf2k at macports.org
Thu Jun 5 14:14:58 PDT 2014
Revision: 120698
https://trac.macports.org/changeset/120698
Author: mf2k at macports.org
Date: 2014-06-05 14:14:58 -0700 (Thu, 05 Jun 2014)
Log Message:
-----------
arb: Update to version 6.0-rc3. (#43762). Remove unused patchfiles.
Modified Paths:
--------------
trunk/dports/science/arb/Portfile
Removed Paths:
-------------
trunk/dports/science/arb/files/patch-ARB-ARBDB.diff
trunk/dports/science/arb/files/patch-ARB-DARWIN.pl.diff
trunk/dports/science/arb/files/patch-ARB-Makefile.diff
trunk/dports/science/arb/files/patch-ARB-RNA3D_GlobalHeader.hxx.diff
trunk/dports/science/arb/files/patch-ARB-RNA3D_Textures.cxx.diff
trunk/dports/science/arb/files/patch-ARB-glpng.c.diff
trunk/dports/science/arb/files/patch-ARB-glpng.h.diff
trunk/dports/science/arb/files/patch-GDEHELP-Makefile.diff
Modified: trunk/dports/science/arb/Portfile
===================================================================
--- trunk/dports/science/arb/Portfile 2014-06-05 21:13:41 UTC (rev 120697)
+++ trunk/dports/science/arb/Portfile 2014-06-05 21:14:58 UTC (rev 120698)
@@ -5,7 +5,7 @@
name arb
epoch 1
-version 6.0-rc1
+version 6.0-rc3
categories science
maintainers mac.com:matt.cottrell
platforms darwin
@@ -26,12 +26,12 @@
license Restrictive/Distributable
master_sites http://download.arb-home.de/build/$name-${version}/
-distname arb-${version}-source-hotfix1
+distname arb-${version}-source
extract.suffix .tgz
-worksrcdir arbsrc_11977
+worksrcdir arbsrc_12316
-checksums rmd160 9ef6edf8e2e386794cfc204519bb00f4394549ee \
- sha256 cb9bcbd999d6f8b3c06bde70a1d1e5a61ca564e80c16da4bb01bb7820f396e10
+checksums rmd160 5775a28787a3a72ccfb848b39240ced8dc8c811c \
+ sha256 8924c99d16a1b8562e5c92d2ba971e8a9a499dc8f3e1cb553ec0b64156ff4d54
depends_build port:imake \
port:makedepend
@@ -53,8 +53,7 @@
patchfiles patch-ARB-config.makefile.diff \
patch-ARB-intro.fig.diff \
- patch-ARB-arb.diff \
- patch-ARB-ARBDB.diff
+ patch-ARB-arb.diff
configure {
if {${build_arch} eq "ppc" || ${build_arch} eq "i386"} {
@@ -74,8 +73,8 @@
compiler.blacklist *llvm-gcc-4.2
-build.args GCC=${configure.cc} \
- GPP=${configure.cxx}
+build.args-append CXX=${configure.cxx} \
+ CC=${configure.cc}
destroot.keepdirs ${destroot}${prefix}/share/arb/lib/pts
Deleted: trunk/dports/science/arb/files/patch-ARB-ARBDB.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-ARBDB.diff 2014-06-05 21:13:41 UTC (rev 120697)
+++ trunk/dports/science/arb/files/patch-ARB-ARBDB.diff 2014-06-05 21:14:58 UTC (rev 120698)
@@ -1,20 +0,0 @@
-Index: ARBDB/arbdb.cxx
-===================================================================
---- ARBDB/arbdb.cxx (revision 11958)
-+++ ARBDB/arbdb.cxx (working copy)
-@@ -447,6 +447,7 @@
- return inside_shell;
- }
-
-+#if 0
- struct GB_test_shell_closed {
- ~GB_test_shell_closed() {
- if (GB_shell::in_shell()) { // leave that call
-@@ -455,6 +456,7 @@
- }
- };
- static GB_test_shell_closed test;
-+#endif
-
- #if defined(UNIT_TESTS)
- static bool closed_open_shell_for_unit_tests() {
Deleted: trunk/dports/science/arb/files/patch-ARB-DARWIN.pl.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-DARWIN.pl.diff 2014-06-05 21:13:41 UTC (rev 120697)
+++ trunk/dports/science/arb/files/patch-ARB-DARWIN.pl.diff 2014-06-05 21:14:58 UTC (rev 120698)
@@ -1,12 +0,0 @@
---- PERL2ARB/DARWIN.PL (revision 6192)
-+++ PERL2ARB/DARWIN.PL (working copy)
-@@ -4,8 +4,7 @@
- WriteMakefile(
- 'NAME' => 'ARB',
- 'VERSION_FROM' => 'ARB.pm', # finds $VERSION
-- #'LIBS' => '-L../ARBDB2 -lARBDB -L/usr/local/lib/perl5/5.10.0/darwin-2level/CORE/ -lperl', # e.g., '-lm'
-- 'LIBS' => '-L../ARBDB2 -lARBDB -L/System/Library/Perl/lib/5.10/ -lperl', #System provides 64-bit Perl with Snow Leopard
-+ 'LIBS' => '-L../ARBDB2 -lARBDB -L@@LIBPERLDIR@@ -lperl',
- 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING'
- 'INC' => '-I../INCLUDE', # e.g., '-I/usr/include/other'
- 'CCFLAGS' => '-arch x86_64',
Deleted: trunk/dports/science/arb/files/patch-ARB-Makefile.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-Makefile.diff 2014-06-05 21:13:41 UTC (rev 120697)
+++ trunk/dports/science/arb/files/patch-ARB-Makefile.diff 2014-06-05 21:14:58 UTC (rev 120698)
@@ -1,11 +0,0 @@
---- Makefile.orig 2012-11-15 08:03:15.000000000 -0600
-+++ Makefile 2013-02-25 12:14:54.000000000 -0600
-@@ -103,7 +103,7 @@
-
- ifeq ($(DEBUG),0)
- dflags := -DNDEBUG# defines
-- cflags := -O4# compiler flags (C and C++)
-+ cflags := -O0# compiler flags (C and C++)
- ifndef DARWIN
- lflags += -O99# linker flags
- endif
Deleted: trunk/dports/science/arb/files/patch-ARB-RNA3D_GlobalHeader.hxx.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-RNA3D_GlobalHeader.hxx.diff 2014-06-05 21:13:41 UTC (rev 120697)
+++ trunk/dports/science/arb/files/patch-ARB-RNA3D_GlobalHeader.hxx.diff 2014-06-05 21:14:58 UTC (rev 120698)
@@ -1,14 +0,0 @@
---- RNA3D/RNA3D_GlobalHeader.hxx.orig 2012-03-23 19:13:07.000000000 -0400
-+++ RNA3D/RNA3D_GlobalHeader.hxx 2012-03-27 20:24:27.000000000 -0400
-@@ -31,7 +31,11 @@
- // working on ralfs machine
- // working on waltz too
- #include <GL/glew.h>
-+#ifdef DARWIN
-+#include <GLUT/glut.h>
-+#else
- #include <GL/glut.h>
-+#endif
- #include <GL/glpng.h>
-
- // @@@ HACK @@@
Deleted: trunk/dports/science/arb/files/patch-ARB-RNA3D_Textures.cxx.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-RNA3D_Textures.cxx.diff 2014-06-05 21:13:41 UTC (rev 120697)
+++ trunk/dports/science/arb/files/patch-ARB-RNA3D_Textures.cxx.diff 2014-06-05 21:14:58 UTC (rev 120698)
@@ -1,11 +0,0 @@
---- RNA3D/RNA3D_Textures.cxx.orig 2012-11-17 17:33:22.000000000 -0500
-+++ RNA3D/RNA3D_Textures.cxx 2012-11-17 17:33:30.000000000 -0500
-@@ -61,7 +61,7 @@
- pngInfo info;
-
- // Using pngLoadAndBind to set texture parameters automatically.
-- texture[i] = pngBind(ImageFile, PNG_NOMIPMAP, PNG_ALPHA, &info, GL_CLAMP, GL_NEAREST, GL_NEAREST);
-+ texture[i] = pngBind(ImageFile, GLPNG_NOMIPMAP, GLPNG_ALPHA, &info, GL_CLAMP, GL_NEAREST, GL_NEAREST);
-
- if (texture[i] == 0) {
- throw string(GBS_global_string("Error loading %s", ImageFile));
Deleted: trunk/dports/science/arb/files/patch-ARB-glpng.c.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-glpng.c.diff 2014-06-05 21:13:41 UTC (rev 120697)
+++ trunk/dports/science/arb/files/patch-ARB-glpng.c.diff 2014-06-05 21:14:58 UTC (rev 120698)
@@ -1,169 +0,0 @@
---- GL/glpng/glpng.c.orig 2012-11-17 16:28:36.000000000 -0500
-+++ GL/glpng/glpng.c 2012-11-17 17:26:13.000000000 -0500
-@@ -38,9 +38,9 @@
- #include <png.h>
-
- #if 0
--#define PNG_CHECK_SIG(header,size) png_check_sig(header,size) // old libpng
-+#define GLPNG_CHECK_SIG(header,size) png_check_sig(header,size) // old libpng
- #else
--#define PNG_CHECK_SIG(header,size) (png_sig_cmp(header,0,size)==0)
-+#define GLPNG_CHECK_SIG(header,size) (png_sig_cmp(header,0,size)==0)
- #endif
-
- /* Used to decide if GL/gl.h supports the paletted extension */
-@@ -284,14 +284,14 @@
- if (pinfo == NULL) return 0;
-
- fread(header, 1, 8, fp);
-- if (!PNG_CHECK_SIG(header, 8)) return 0;
-+ if (!GLPNG_CHECK_SIG(header, 8)) return 0;
-
- png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- info = png_create_info_struct(png);
- endinfo = png_create_info_struct(png);
-
- // DH: added following lines
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- {
- png_destroy_read_struct(&png, &info, &endinfo);
- return 0;
-@@ -389,7 +389,7 @@
- png_uint_32 i;
-
- fread(header, 1, 8, fp);
-- if (!PNG_CHECK_SIG(header, 8)) return 0;
-+ if (!GLPNG_CHECK_SIG(header, 8)) return 0;
-
- png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- info = png_create_info_struct(png);
-@@ -437,12 +437,12 @@
- if (color == PNG_COLOR_TYPE_GRAY || color == PNG_COLOR_TYPE_GRAY_ALPHA)
- png_set_gray_to_rgb(png);
-
-- if (color&PNG_COLOR_MASK_ALPHA && trans != PNG_ALPHA) {
-+ if (color&PNG_COLOR_MASK_ALPHA && trans != GLPNG_ALPHA) {
- png_set_strip_alpha(png);
- color &= ~PNG_COLOR_MASK_ALPHA;
- }
-
-- if (!(PalettedTextures && mipmap >= 0 && trans == PNG_SOLID))
-+ if (!(PalettedTextures && mipmap >= 0 && trans == GLPNG_SOLID))
- if (color == PNG_COLOR_TYPE_PALETTE)
- png_set_expand(png);
-
-@@ -493,7 +493,7 @@
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
- #ifdef SUPPORTS_PALETTE_EXT
-- if (PalettedTextures && mipmap >= 0 && trans == PNG_SOLID && color == PNG_COLOR_TYPE_PALETTE) {
-+ if (PalettedTextures && mipmap >= 0 && trans == GLPNG_SOLID && color == PNG_COLOR_TYPE_PALETTE) {
- png_colorp pal;
- int cols;
- GLint intf;
-@@ -517,7 +517,7 @@
- }
- else
- #endif
-- if (trans == PNG_SOLID || trans == PNG_ALPHA || color == PNG_COLOR_TYPE_RGB_ALPHA || color == PNG_COLOR_TYPE_GRAY_ALPHA) {
-+ if (trans == GLPNG_SOLID || trans == GLPNG_ALPHA || color == PNG_COLOR_TYPE_RGB_ALPHA || color == PNG_COLOR_TYPE_GRAY_ALPHA) {
- GLenum glformat;
- GLint glcomponent;
-
-@@ -542,9 +542,9 @@
- return 0;
- }
-
-- if (mipmap == PNG_BUILDMIPMAPS)
-+ if (mipmap == GLPNG_BUILDMIPMAPS)
- Build2DMipmaps(glcomponent, width, height, glformat, data, 1);
-- else if (mipmap == PNG_SIMPLEMIPMAPS)
-+ else if (mipmap == GLPNG_SIMPLEMIPMAPS)
- Build2DMipmaps(glcomponent, width, height, glformat, data, 0);
- else
- glTexImage2D(GL_TEXTURE_2D, mipmap, glcomponent, width, height, 0, glformat, GL_UNSIGNED_BYTE, data);
-@@ -574,13 +574,13 @@
- #define ALPHA *q
-
- switch (trans) {
-- case PNG_CALLBACK:
-+ case GLPNG_CALLBACK:
- FORSTART
- ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
- FOREND
- break;
-
-- case PNG_STENCIL:
-+ case GLPNG_STENCIL:
- FORSTART
- if (r == StencilRed && g == StencilGreen && b == StencilBlue)
- ALPHA = 0;
-@@ -589,48 +589,48 @@
- FOREND
- break;
-
-- case PNG_BLEND1:
-+ case GLPNG_BLEND1:
- FORSTART
- a = r+g+b;
- if (a > 255) ALPHA = 255; else ALPHA = a;
- FOREND
- break;
-
-- case PNG_BLEND2:
-+ case GLPNG_BLEND2:
- FORSTART
- a = r+g+b;
- if (a > 255*2) ALPHA = 255; else ALPHA = a/2;
- FOREND
- break;
-
-- case PNG_BLEND3:
-+ case GLPNG_BLEND3:
- FORSTART
- ALPHA = (r+g+b)/3;
- FOREND
- break;
-
-- case PNG_BLEND4:
-+ case GLPNG_BLEND4:
- FORSTART
- a = r*r+g*g+b*b;
- if (a > 255) ALPHA = 255; else ALPHA = a;
- FOREND
- break;
-
-- case PNG_BLEND5:
-+ case GLPNG_BLEND5:
- FORSTART
- a = r*r+g*g+b*b;
- if (a > 255*2) ALPHA = 255; else ALPHA = a/2;
- FOREND
- break;
-
-- case PNG_BLEND6:
-+ case GLPNG_BLEND6:
- FORSTART
- a = r*r+g*g+b*b;
- if (a > 255*3) ALPHA = 255; else ALPHA = a/3;
- FOREND
- break;
-
-- case PNG_BLEND7:
-+ case GLPNG_BLEND7:
- FORSTART
- a = r*r+g*g+b*b;
- if (a > 255*255) ALPHA = 255; else ALPHA = (int) sqrt(a);
-@@ -642,9 +642,9 @@
- #undef FOREND
- #undef ALPHA
-
-- if (mipmap == PNG_BUILDMIPMAPS)
-+ if (mipmap == GLPNG_BUILDMIPMAPS)
- Build2DMipmaps(4, width, height, GL_RGBA, data2, 1);
-- else if (mipmap == PNG_SIMPLEMIPMAPS)
-+ else if (mipmap == GLPNG_SIMPLEMIPMAPS)
- Build2DMipmaps(4, width, height, GL_RGBA, data2, 0);
- else
- glTexImage2D(GL_TEXTURE_2D, mipmap, 4, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data2);
Deleted: trunk/dports/science/arb/files/patch-ARB-glpng.h.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-glpng.h.diff 2014-06-05 21:13:41 UTC (rev 120697)
+++ trunk/dports/science/arb/files/patch-ARB-glpng.h.diff 2014-06-05 21:14:58 UTC (rev 120698)
@@ -1,49 +0,0 @@
---- GL/glpng/glpng.h.orig 2012-11-17 16:18:10.000000000 -0500
-+++ GL/glpng/glpng.h 2012-11-17 16:20:13.000000000 -0500
-@@ -47,28 +47,28 @@
- #endif
-
- /* Mipmapping parameters */
--#define PNG_NOMIPMAPS 0 /* No mipmapping */
--#define PNG_BUILDMIPMAPS -1 /* Calls a clone of gluBuild2DMipmaps() */
--#define PNG_SIMPLEMIPMAPS -2 /* Generates mipmaps without filtering */
-+#define GLPNG_NOMIPMAPS 0 /* No mipmapping */
-+#define GLPNG_BUILDMIPMAPS -1 /* Calls a clone of gluBuild2DMipmaps() */
-+#define GLPNG_SIMPLEMIPMAPS -2 /* Generates mipmaps without filtering */
-
- /* Who needs an "S" anyway? */
--#define PNG_NOMIPMAP PNG_NOMIPMAPS
--#define PNG_BUILDMIPMAP PNG_BUILDMIPMAPS
--#define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
-+#define GLPNG_NOMIPMAP GLPNG_NOMIPMAPS
-+#define GLPNG_BUILDMIPMAP GLPNG_BUILDMIPMAPS
-+#define GLPNG_SIMPLEMIPMAP GLPNG_SIMPLEMIPMAPS
-
- /* Transparency parameters */
--#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */
--#define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */
--#define PNG_SOLID -1 /* No transparency */
--#define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */
--#define PNG_BLEND1 1 /* a = r+g+b */
--#define PNG_BLEND2 2 /* a = (r+g+b)/2 */
--#define PNG_BLEND3 3 /* a = (r+g+b)/3 */
--#define PNG_BLEND4 4 /* a = r*r+g*g+b*b */
--#define PNG_BLEND5 5 /* a = (r*r+g*g+b*b)/2 */
--#define PNG_BLEND6 6 /* a = (r*r+g*g+b*b)/3 */
--#define PNG_BLEND7 7 /* a = (r*r+g*g+b*b)/4 */
--#define PNG_BLEND8 8 /* a = sqrt(r*r+g*g+b*b) */
-+#define GLPNG_CALLBACK -3 /* Call the callback function to generate alpha */
-+#define GLPNG_ALPHA -2 /* Use alpha channel in GLPNG file, if there is one */
-+#define GLPNG_SOLID -1 /* No transparency */
-+#define GLPNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */
-+#define GLPNG_BLEND1 1 /* a = r+g+b */
-+#define GLPNG_BLEND2 2 /* a = (r+g+b)/2 */
-+#define GLPNG_BLEND3 3 /* a = (r+g+b)/3 */
-+#define GLPNG_BLEND4 4 /* a = r*r+g*g+b*b */
-+#define GLPNG_BLEND5 5 /* a = (r*r+g*g+b*b)/2 */
-+#define GLPNG_BLEND6 6 /* a = (r*r+g*g+b*b)/3 */
-+#define GLPNG_BLEND7 7 /* a = (r*r+g*g+b*b)/4 */
-+#define GLPNG_BLEND8 8 /* a = sqrt(r*r+g*g+b*b) */
-
- typedef struct {
- unsigned int Width;
Deleted: trunk/dports/science/arb/files/patch-GDEHELP-Makefile.diff
===================================================================
--- trunk/dports/science/arb/files/patch-GDEHELP-Makefile.diff 2014-06-05 21:13:41 UTC (rev 120697)
+++ trunk/dports/science/arb/files/patch-GDEHELP-Makefile.diff 2014-06-05 21:14:58 UTC (rev 120698)
@@ -1,11 +0,0 @@
---- GDEHELP/Makefile.orig 2011-11-13 09:47:34.000000000 -0500
-+++ GDEHELP/Makefile 2011-11-13 11:03:22.000000000 -0500
-@@ -17,7 +17,7 @@
-
- $(TARGET) : $(SOURCE) $(GENMENUS)
- -chmod a+w $(TARGET)
-- $(PP) -IMENUS $(SOURCE) >$(TARGET)
-+ $(GCC) -E -x c-header -IMENUS $(SOURCE) >$(TARGET)
- chmod a-w $(TARGET)
-
- # ------------------------------------------------------------
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140605/8e4ec8b0/attachment.html>
More information about the macports-changes
mailing list