[148728] trunk/dports/graphics/xfig
khindenburg at macports.org
khindenburg at macports.org
Sun May 15 14:40:44 PDT 2016
Revision: 148728
https://trac.macports.org/changeset/148728
Author: khindenburg at macports.org
Date: 2016-05-15 14:40:44 -0700 (Sun, 15 May 2016)
Log Message:
-----------
xfig: update to 3.2.5c
Modified Paths:
--------------
trunk/dports/graphics/xfig/Portfile
trunk/dports/graphics/xfig/files/patch-Imakefile
trunk/dports/graphics/xfig/files/patch-fig.h
Removed Paths:
-------------
trunk/dports/graphics/xfig/files/patch-f_readeps.c
trunk/dports/graphics/xfig/files/patch-libpng-1.5.diff
Modified: trunk/dports/graphics/xfig/Portfile
===================================================================
--- trunk/dports/graphics/xfig/Portfile 2016-05-15 20:46:18 UTC (rev 148727)
+++ trunk/dports/graphics/xfig/Portfile 2016-05-15 21:40:44 UTC (rev 148728)
@@ -4,8 +4,7 @@
PortSystem 1.0
name xfig
-version 3.2.5b
-revision 8
+version 3.2.5c
categories graphics x11
license Permissive
maintainers nomaintainer
@@ -25,9 +24,8 @@
distname ${name}.${version}
distfiles ${distname}.full${extract.suffix}
-checksums md5 499b0ce103a6b353453bf7e327f9a3b9 \
- sha1 0730d7e6bc217c0de02682efb0078821512bb542 \
- rmd160 aad4cfd808c116d34218e9890a898652e4f52ab6
+checksums rmd160 e1c496dabd70520319f18bf1f591ecd910feff3c \
+ sha256 ea628f975b79ab175ab29220cc118274466497f6217f2989928317be2993a1f9
depends_lib port:Xaw3d \
port:xorg-libXi \
@@ -45,12 +43,10 @@
patch-fig.h \
patch-f_util.c \
patch-w_keyboard.c \
- patch-f_readeps.c \
patch-w_export.c \
patch-w_print.c \
patch-w_util.c \
- patch-main_c.diff \
- patch-libpng-1.5.diff
+ patch-main_c.diff
post-extract {
foreach d "${worksrcpath}/Doc ${worksrcpath}/Libraries" {
@@ -90,6 +86,4 @@
}
}
-livecheck.type regex
-livecheck.url http://xfig.org/art17.html
-livecheck.regex xfig.(\[0-9.a-z\]+)${extract.suffix}
+livecheck.regex xfig.(\[0-9.a-z\]+).full${extract.suffix}
Modified: trunk/dports/graphics/xfig/files/patch-Imakefile
===================================================================
--- trunk/dports/graphics/xfig/files/patch-Imakefile 2016-05-15 20:46:18 UTC (rev 148727)
+++ trunk/dports/graphics/xfig/files/patch-Imakefile 2016-05-15 21:40:44 UTC (rev 148728)
@@ -1,5 +1,5 @@
---- Imakefile.orig 2009-03-30 10:53:05.000000000 -0500
-+++ Imakefile 2010-08-06 20:22:28.000000000 -0500
+--- Imakefile 2016-05-15 11:06:29.000000000 -0400
++++ Imakefile 2016-05-15 13:11:06.000000000 -0400
@@ -30,9 +30,12 @@
XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks
XCOMM for it relative to the BINDIR variable.
@@ -25,21 +25,12 @@
XCOMM Comment out the following definition for XAW3D if you don't to want to use
XCOMM the 3d Athena Widget Set
-@@ -60,7 +63,7 @@
- XCOMM some new features, including "Tips", which replace xfig's "help balloons"
- XCOMM NOTE: This is the default for many X systems now.
-
--XCOMM #define XAW3D1_5E
-+#define XAW3D1_5E
-
- #ifdef XAW3D1_5E
- DUSEXAW3D = -DXAW3D -DXAW3D1_5E
@@ -75,9 +78,9 @@
XCOMM Redefine the following if your PNG library, zlib library and/or include file
XCOMM are in different places
-PNGLIBDIR = $(USRLIBDIR)
--PNGINC = -I/usr/local/include
+-PNGINC = -I/usr/include
-ZLIBDIR = $(USRLIBDIR)
+PNGLIBDIR = __PREFIX/lib
+PNGINC = -I__PREFIX/include
@@ -50,12 +41,12 @@
@@ -96,8 +99,8 @@
#ifdef USEJPEG
- #ifdef USEINSTALLEDJPEG
+ # ifdef USEINSTALLEDJPEG
- JPEGLIBDIR = /usr/local/lib
- JPEGINC = -I/usr/include/X11
-+ JPEGLIBDIR = __PREFIX/lib
-+ JPEGINC = -I__PREFIX/include
- #else
++ JPEGLIBDIR = __PREFIX/lib
++ JPEGINC = -I__PREFIX/include
+ # else
JPEGLIBDIR = ../jpeg
JPEGINC = -I$(JPEGLIBDIR)
@@ -119,8 +122,8 @@
@@ -63,13 +54,13 @@
#ifdef USEXPM
-XPMLIBDIR = /usr/local/lib
--XPMINC = -I/usr/local/include/X11
+-XPMINC = -I/usr/include/X11
+XPMLIBDIR = __PREFIX/lib
+XPMINC = -I__PREFIX/include/X11
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
-@@ -169,16 +172,15 @@
+@@ -170,16 +173,15 @@
XCOMM XFIGLIBDIR = $(LIBDIR)
XCOMM use this if you want the multi-key data base file in the standard X11 tree
Deleted: trunk/dports/graphics/xfig/files/patch-f_readeps.c
===================================================================
--- trunk/dports/graphics/xfig/files/patch-f_readeps.c 2016-05-15 20:46:18 UTC (rev 148727)
+++ trunk/dports/graphics/xfig/files/patch-f_readeps.c 2016-05-15 21:40:44 UTC (rev 148728)
@@ -1,13 +0,0 @@
---- f_readeps.c.orig 2005-10-31 18:40:38.000000000 +0100
-+++ f_readeps.c 2010-11-16 11:58:03.000000000 +0100
-@@ -305,8 +305,8 @@
- gscom[0] = '\0';
- }
- sprintf(&gscom[strlen(gscom)],
-- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1",
-- appres.ghostscript, driver, wid, ht, pixnam, errnam);
-+ "%s -r72x72 -dNOSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -c '<</PermitFileReading[(%s)]>> setuserparams .locksafe' -q - > %s 2>&1",
-+ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam);
- if (appres.DEBUG)
- fprintf(stderr,"calling: %s\n",gscom);
- if ((gsfile = popen(gscom, "w")) == 0) {
Modified: trunk/dports/graphics/xfig/files/patch-fig.h
===================================================================
--- trunk/dports/graphics/xfig/files/patch-fig.h 2016-05-15 20:46:18 UTC (rev 148727)
+++ trunk/dports/graphics/xfig/files/patch-fig.h 2016-05-15 21:40:44 UTC (rev 148728)
@@ -1,12 +1,12 @@
---- fig.h.orig 2008-05-27 12:39:00.000000000 -0500
-+++ fig.h 2009-12-21 15:07:15.000000000 -0600
-@@ -374,6 +374,9 @@
- extern long random();
- extern void srandom(unsigned int);
-
-+#elif defined(__DARWIN__)
-+extern void srandom();
-+
- #elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__)
- extern void srandom(int);
-
+--- fig.h 2016-05-15 13:32:23.000000000 -0400
++++ fig.h 2016-05-15 13:33:51.000000000 -0400
+@@ -375,6 +375,9 @@
+ extern long random();
+ extern void srandom(unsigned int);
+
++#elif defined(__DARWIN__)
++extern void srandom();
++
+ #elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__)
+ extern void srandom(int);
+
Deleted: trunk/dports/graphics/xfig/files/patch-libpng-1.5.diff
===================================================================
--- trunk/dports/graphics/xfig/files/patch-libpng-1.5.diff 2016-05-15 20:46:18 UTC (rev 148727)
+++ trunk/dports/graphics/xfig/files/patch-libpng-1.5.diff 2016-05-15 21:40:44 UTC (rev 148728)
@@ -1,72 +0,0 @@
---- f_readpng.c.orig
-+++ f_readpng.c
-@@ -43,7 +43,7 @@
- char *ptr;
- int num_palette;
- png_colorp palette;
-- png_color_16 background;
-+ png_color_16 background, *image_background;
-
- /* make scale factor smaller for metric */
- float scale = (appres.INCHES ?
-@@ -73,7 +73,7 @@
- }
-
- /* set long jump recovery here */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
- /* if we get here there was a problem reading the file */
- png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- close_picfile(file,filetype);
-@@ -90,14 +90,18 @@
- png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- &interlace_type, &compression_type, &filter_type);
-
-- if (info_ptr->valid & PNG_INFO_gAMA)
-- png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
-- else
-+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA)) {
-+ double gamma;
-+ png_get_gAMA(png_ptr, info_ptr, &gamma);
-+ png_set_gamma(png_ptr, 2.2, gamma);
-+ } else {
- png_set_gamma(png_ptr, 2.2, 0.45);
-+ }
-
-- if (info_ptr->valid & PNG_INFO_bKGD)
-+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD) &&
-+ png_get_bKGD(png_ptr, info_ptr, &image_background))
- /* set the background to the one supplied */
-- png_set_background(png_ptr, &info_ptr->background,
-+ png_set_background(png_ptr, image_background,
- PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
- else {
- /* blend the canvas background using the alpha channel */
-@@ -136,7 +140,7 @@
-
- if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
- png_get_hIST(png_ptr, info_ptr, &histogram);
-- png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
-+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
- }
- }
- if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
---- f_wrpng.c.orig
-+++ f_wrpng.c
-@@ -20,6 +20,7 @@
- #include "w_msgpanel.h"
- #include "w_setup.h"
- #include <png.h>
-+#include <zlib.h>
-
- /*
- * Write PNG file from rgb data
-@@ -59,7 +60,7 @@
- }
-
- /* set long jump recovery here */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
- /* if we get here there was a problem reading the file */
- png_destroy_write_struct(&png_ptr, &info_ptr);
- return False;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160515/32060bb4/attachment.html>
More information about the macports-changes
mailing list