Index: head/graphics/gle-graphics/Makefile =================================================================== --- head/graphics/gle-graphics/Makefile (revision 447477) +++ head/graphics/gle-graphics/Makefile (revision 447478) @@ -1,60 +1,59 @@ # Created by: Nicola Vitale # $FreeBSD$ PORTNAME= gle-graphics DISTVERSION= 4.2.4cf -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics print MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${DISTVERSION:C,.$,,1} DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= nivit@FreeBSD.org COMMENT= Graphics language that produces images from script files LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= multi BITMAP_IMAGES_CONFIGURE_WITH= jpeg=${LOCALBASE} tiff=${LOCALBASE} png=${LOCALBASE} BITMAP_IMAGES_DESC= Support for including bitmap images BITMAP_IMAGES_LIB_DEPENDS= libpng.so:graphics/png \ libtiffxx.so:graphics/tiff BITMAP_IMAGES_USES= jpeg CONFIGURE_ARGS= --with-extrafonts=yes --with-qt=${QT_ARCHDIR} ALL_TARGET= all DOCS_ALL_TARGET= doc DOCS_USE= tex=latex:build tex=dvipsk:build GNU_CONFIGURE= yes LATEX_GS_DESC= Use LaTeX & GhostScript LATEX_GS_USE= tex=latex LATEX_GS_USES= ghostscript MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DOCS BITMAP_IMAGES LATEX_GS X11 OPTIONS_DEFAULT= BITMAP_IMAGES LATEX_GS X11 PLIST_SUB+= PORTVERSION=${PORTVERSION} REINPLACE_FILES= configure -USE_GCC= yes USE_GL= yes USE_LDCONFIG= yes USE_QT4= corelib gui moc network opengl rcc qmake_build USES= gmake ncurses pathfix CPPFLAGS+= -I${NCURSESINC} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E} X11_CONFIGURE_WITH= x X11_USE= xorg=x11 post-patch: cd ${WRKSRC} && ${REINPLACE_CMD} -E -e 's,k(freebsd),\1,1' ${REINPLACE_FILES} .include Index: head/graphics/gle-graphics/files/patch-src_gle_d__x.cpp =================================================================== --- head/graphics/gle-graphics/files/patch-src_gle_d__x.cpp (nonexistent) +++ head/graphics/gle-graphics/files/patch-src_gle_d__x.cpp (revision 447478) @@ -0,0 +1,20 @@ +--- src/gle/d_x.cpp.orig 2011-10-26 21:10:54 UTC ++++ src/gle/d_x.cpp +@@ -199,7 +199,7 @@ void X11GLEDevice::setfillstyle(int i) { + #define BM_HEIGHT 16 + Pixmap bm; + //unsigned +-const char bm_bits[][32] = { ++const unsigned char bm_bits[][32] = { + { 0x00, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00, 0x08, 0x00, 0x04, + 0x00, 0x02, 0x00, 0x01, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00, + 0x08, 0x00, 0x04, 0x00, 0x02, 0x00, 0x01, 0x00}, /* SHADE */ +@@ -238,7 +238,7 @@ const char bm_bits[][32] = { + 0x1c, 0x38, 0x0e, 0x70, 0x07, 0xe0, 0x03, 0xc0} /* GRID 5 */ + }; + +- bm = XCreateBitmapFromData(dpy,window1,bm_bits[i],BM_WIDTH,BM_HEIGHT); ++ bm = XCreateBitmapFromData(dpy,window1,(const char*)bm_bits[i],BM_WIDTH,BM_HEIGHT); + XSetStipple(dpy, gcf, bm); + XSetFillStyle(dpy, gcf, FillStippled); + XFreePixmap(dpy, bm); Property changes on: head/graphics/gle-graphics/files/patch-src_gle_d__x.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/gle-graphics/files/patch-src_gle_op__def.h =================================================================== --- head/graphics/gle-graphics/files/patch-src_gle_op__def.h (nonexistent) +++ head/graphics/gle-graphics/files/patch-src_gle_op__def.h (revision 447478) @@ -0,0 +1,11 @@ +--- src/gle/op_def.h.orig 2011-10-26 21:10:54 UTC ++++ src/gle/op_def.h +@@ -40,7 +40,7 @@ struct op_key { + char name[256]; + int typ; + int pos; +- int idx; ++ signed long idx; + }; + + #define typ_end 0 Property changes on: head/graphics/gle-graphics/files/patch-src_gle_op__def.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp =================================================================== --- head/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp (nonexistent) +++ head/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp (revision 447478) @@ -0,0 +1,18 @@ +--- src/gle/surface/ffitcontour.cpp.orig 2011-06-13 08:36:41 UTC ++++ src/gle/surface/ffitcontour.cpp +@@ -43,15 +43,9 @@ + + /* "f2c.h" defines abs() -- conflict with the definition in */ + /* changing the order solves the problem */ +-#if ( defined(__OS2__) && defined(__EMX__) ) || defined(__WIN32__) + #include + #include + #include "f2c.h" +-#else +-#include "f2c.h" +-#include +-#include +-#endif + + doublereal gutre2_(real* a, real* b); + void gd_message__(const char *s, int l); Property changes on: head/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h =================================================================== --- head/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h (nonexistent) +++ head/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h (revision 447478) @@ -0,0 +1,15 @@ +--- src/gle/tokens/StringKeyHash.h.orig 2012-02-19 21:07:34 UTC ++++ src/gle/tokens/StringKeyHash.h +@@ -75,10 +75,12 @@ + using namespace std; + + #ifndef GCC2 ++#ifndef _LIBCPP_VERSION + #ifndef _MSC_VER + using namespace __gnu_cxx; // using gnu extensions such as "hash" + #endif + #endif ++#endif + + #include "RefCount.h" + #include "BinIO.h" Property changes on: head/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property