[151503] trunk/dports/graphics/xfig
larryv at macports.org
larryv at macports.org
Tue Aug 16 22:40:58 PDT 2016
Revision: 151503
https://trac.macports.org/changeset/151503
Author: larryv at macports.org
Date: 2016-08-16 22:40:58 -0700 (Tue, 16 Aug 2016)
Log Message:
-----------
xfig: Give patches patchy extensions
Modified Paths:
--------------
trunk/dports/graphics/xfig/Portfile
Added Paths:
-----------
trunk/dports/graphics/xfig/files/patch-Imakefile.diff
trunk/dports/graphics/xfig/files/patch-f_util.c.diff
trunk/dports/graphics/xfig/files/patch-fig.h.diff
trunk/dports/graphics/xfig/files/patch-w_export.c.diff
trunk/dports/graphics/xfig/files/patch-w_keyboard.c.diff
trunk/dports/graphics/xfig/files/patch-w_print.c.diff
trunk/dports/graphics/xfig/files/patch-w_util.c.diff
Removed Paths:
-------------
trunk/dports/graphics/xfig/files/patch-Imakefile
trunk/dports/graphics/xfig/files/patch-f_util.c
trunk/dports/graphics/xfig/files/patch-fig.h
trunk/dports/graphics/xfig/files/patch-w_export.c
trunk/dports/graphics/xfig/files/patch-w_keyboard.c
trunk/dports/graphics/xfig/files/patch-w_print.c
trunk/dports/graphics/xfig/files/patch-w_util.c
Modified: trunk/dports/graphics/xfig/Portfile
===================================================================
--- trunk/dports/graphics/xfig/Portfile 2016-08-17 05:32:44 UTC (rev 151502)
+++ trunk/dports/graphics/xfig/Portfile 2016-08-17 05:40:58 UTC (rev 151503)
@@ -39,13 +39,13 @@
use_xmkmf yes
xmkmf.args-append -DUseSeparateConfDir=NO -DBuildHtmlManPages=NO
-patchfiles patch-Imakefile \
- patch-fig.h \
- patch-f_util.c \
- patch-w_keyboard.c \
- patch-w_export.c \
- patch-w_print.c \
- patch-w_util.c \
+patchfiles patch-Imakefile.diff \
+ patch-fig.h.diff \
+ patch-f_util.c.diff \
+ patch-w_keyboard.c.diff \
+ patch-w_export.c.diff \
+ patch-w_print.c.diff \
+ patch-w_util.c.diff \
patch-main_c.diff
post-extract {
Deleted: trunk/dports/graphics/xfig/files/patch-Imakefile
===================================================================
--- trunk/dports/graphics/xfig/files/patch-Imakefile 2016-08-17 05:32:44 UTC (rev 151502)
+++ trunk/dports/graphics/xfig/files/patch-Imakefile 2016-08-17 05:40:58 UTC (rev 151503)
@@ -1,82 +0,0 @@
---- 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.
- XCOMM
--XCOMM BINDIR = /usr/bin
--XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
--MKDIRHIER = mkdirhier
-+BINDIR = __PREFIX/bin
-+DESTDIR = __DESTROOT
-+MKDIRHIER = mkdirhier
-+XCOMM MKDIRHIER = mkdirhier
-+
-+EXTRA_LDOPTIONS = -L__PREFIX/lib
-
- XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
- XCOMM app-defaults resource files to go. You will have to use the environment
-@@ -45,7 +48,7 @@
- XCOMM different tree than the "correct" tree that your X system expects. The usual
- XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
-
--XCOMM XAPPLOADDIR = /home/user/xfig
-+XAPPLOADDIR = __PREFIX/lib/X11/app-defaults
-
- XCOMM Comment out the following definition for XAW3D if you don't to want to use
- XCOMM the 3d Athena Widget Set
-@@ -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/include
--ZLIBDIR = $(USRLIBDIR)
-+PNGLIBDIR = __PREFIX/lib
-+PNGINC = -I__PREFIX/include
-+ZLIBDIR = __PREFIX/lib
-
- XCOMM If don't want JPEG support, comment out the #define USEJPEG line
- XCOMM Uncomment the #define for USEJPEG if you want to be able to import
-@@ -96,8 +99,8 @@
-
- #ifdef USEJPEG
- # ifdef USEINSTALLEDJPEG
-- JPEGLIBDIR = /usr/local/lib
-- JPEGINC = -I/usr/include/X11
-+ JPEGLIBDIR = __PREFIX/lib
-+ JPEGINC = -I__PREFIX/include
- # else
- JPEGLIBDIR = ../jpeg
- JPEGINC = -I$(JPEGLIBDIR)
-@@ -119,8 +122,8 @@
- #define USEXPM_ICON
-
- #ifdef USEXPM
--XPMLIBDIR = /usr/local/lib
--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
-@@ -170,16 +173,15 @@
- XCOMM XFIGLIBDIR = $(LIBDIR)
-
- XCOMM use this if you want the multi-key data base file in the standard X11 tree
--XFIGLIBDIR = $(LIBDIR)/xfig
-+XFIGLIBDIR = __PREFIX/lib/xfig
-
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
- XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
--XFIGDOCDIR = /usr/local/xfig/doc
-+XFIGDOCDIR = __PREFIX/share/doc/xfig
-
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
--MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
--XCOMM MANDIR = /usr/local/xfig/man
-+MANDIR = __PREFIX/share/man/man$(MANSUFFIX)
-
- XCOMM If your system doesn't have strstr undefine the following definition
- XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
Copied: trunk/dports/graphics/xfig/files/patch-Imakefile.diff (from rev 151502, trunk/dports/graphics/xfig/files/patch-Imakefile)
===================================================================
--- trunk/dports/graphics/xfig/files/patch-Imakefile.diff (rev 0)
+++ trunk/dports/graphics/xfig/files/patch-Imakefile.diff 2016-08-17 05:40:58 UTC (rev 151503)
@@ -0,0 +1,82 @@
+--- 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.
+ XCOMM
+-XCOMM BINDIR = /usr/bin
+-XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
+-MKDIRHIER = mkdirhier
++BINDIR = __PREFIX/bin
++DESTDIR = __DESTROOT
++MKDIRHIER = mkdirhier
++XCOMM MKDIRHIER = mkdirhier
++
++EXTRA_LDOPTIONS = -L__PREFIX/lib
+
+ XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
+ XCOMM app-defaults resource files to go. You will have to use the environment
+@@ -45,7 +48,7 @@
+ XCOMM different tree than the "correct" tree that your X system expects. The usual
+ XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
+
+-XCOMM XAPPLOADDIR = /home/user/xfig
++XAPPLOADDIR = __PREFIX/lib/X11/app-defaults
+
+ XCOMM Comment out the following definition for XAW3D if you don't to want to use
+ XCOMM the 3d Athena Widget Set
+@@ -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/include
+-ZLIBDIR = $(USRLIBDIR)
++PNGLIBDIR = __PREFIX/lib
++PNGINC = -I__PREFIX/include
++ZLIBDIR = __PREFIX/lib
+
+ XCOMM If don't want JPEG support, comment out the #define USEJPEG line
+ XCOMM Uncomment the #define for USEJPEG if you want to be able to import
+@@ -96,8 +99,8 @@
+
+ #ifdef USEJPEG
+ # ifdef USEINSTALLEDJPEG
+- JPEGLIBDIR = /usr/local/lib
+- JPEGINC = -I/usr/include/X11
++ JPEGLIBDIR = __PREFIX/lib
++ JPEGINC = -I__PREFIX/include
+ # else
+ JPEGLIBDIR = ../jpeg
+ JPEGINC = -I$(JPEGLIBDIR)
+@@ -119,8 +122,8 @@
+ #define USEXPM_ICON
+
+ #ifdef USEXPM
+-XPMLIBDIR = /usr/local/lib
+-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
+@@ -170,16 +173,15 @@
+ XCOMM XFIGLIBDIR = $(LIBDIR)
+
+ XCOMM use this if you want the multi-key data base file in the standard X11 tree
+-XFIGLIBDIR = $(LIBDIR)/xfig
++XFIGLIBDIR = __PREFIX/lib/xfig
+
+ XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
+ XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
+-XFIGDOCDIR = /usr/local/xfig/doc
++XFIGDOCDIR = __PREFIX/share/doc/xfig
+
+ XCOMM MANDIR tells where the standard man pages should go (no need to change it
+ XCOMM if you want the man pages installed in the standard place on your system
+-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+-XCOMM MANDIR = /usr/local/xfig/man
++MANDIR = __PREFIX/share/man/man$(MANSUFFIX)
+
+ XCOMM If your system doesn't have strstr undefine the following definition
+ XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
Deleted: trunk/dports/graphics/xfig/files/patch-f_util.c
===================================================================
--- trunk/dports/graphics/xfig/files/patch-f_util.c 2016-08-17 05:32:44 UTC (rev 151502)
+++ trunk/dports/graphics/xfig/files/patch-f_util.c 2016-08-17 05:40:58 UTC (rev 151503)
@@ -1,20 +0,0 @@
---- f_util.c.orig 2007-11-06 17:30:11.000000000 +0100
-+++ f_util.c 2007-11-06 17:31:43.000000000 +0100
-@@ -781,7 +781,7 @@
- else strcpy(dirname, ".");
-
- if (access(dirname, W_OK) == 0) { /* OK - the directory is writable */
-- sprintf(unc, "gunzip -q %s", name);
-+ sprintf(unc, "gunzip -q -- %s", name);
- if (system(unc) != 0)
- file_msg("Couldn't uncompress the file: \"%s\"", unc);
- strcpy(name, plainname);
-@@ -792,7 +792,7 @@
- sprintf(tmpfile, "%s%s", TMPDIR, c);
- else
- sprintf(tmpfile, "%s/%s", TMPDIR, plainname);
-- sprintf(unc, "gunzip -q -c %s > %s", name, tmpfile);
-+ sprintf(unc, "gunzip -q -c -- %s > %s", name, tmpfile);
- if (system(unc) != 0)
- file_msg("Couldn't uncompress the file: \"%s\"", unc);
- file_msg ("Uncompressing file %s in %s because it is in a read-only directory",
Copied: trunk/dports/graphics/xfig/files/patch-f_util.c.diff (from rev 151502, trunk/dports/graphics/xfig/files/patch-f_util.c)
===================================================================
--- trunk/dports/graphics/xfig/files/patch-f_util.c.diff (rev 0)
+++ trunk/dports/graphics/xfig/files/patch-f_util.c.diff 2016-08-17 05:40:58 UTC (rev 151503)
@@ -0,0 +1,20 @@
+--- f_util.c.orig 2007-11-06 17:30:11.000000000 +0100
++++ f_util.c 2007-11-06 17:31:43.000000000 +0100
+@@ -781,7 +781,7 @@
+ else strcpy(dirname, ".");
+
+ if (access(dirname, W_OK) == 0) { /* OK - the directory is writable */
+- sprintf(unc, "gunzip -q %s", name);
++ sprintf(unc, "gunzip -q -- %s", name);
+ if (system(unc) != 0)
+ file_msg("Couldn't uncompress the file: \"%s\"", unc);
+ strcpy(name, plainname);
+@@ -792,7 +792,7 @@
+ sprintf(tmpfile, "%s%s", TMPDIR, c);
+ else
+ sprintf(tmpfile, "%s/%s", TMPDIR, plainname);
+- sprintf(unc, "gunzip -q -c %s > %s", name, tmpfile);
++ sprintf(unc, "gunzip -q -c -- %s > %s", name, tmpfile);
+ if (system(unc) != 0)
+ file_msg("Couldn't uncompress the file: \"%s\"", unc);
+ file_msg ("Uncompressing file %s in %s because it is in a read-only directory",
Deleted: trunk/dports/graphics/xfig/files/patch-fig.h
===================================================================
--- trunk/dports/graphics/xfig/files/patch-fig.h 2016-08-17 05:32:44 UTC (rev 151502)
+++ trunk/dports/graphics/xfig/files/patch-fig.h 2016-08-17 05:40:58 UTC (rev 151503)
@@ -1,12 +0,0 @@
---- 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);
-
Copied: trunk/dports/graphics/xfig/files/patch-fig.h.diff (from rev 151502, trunk/dports/graphics/xfig/files/patch-fig.h)
===================================================================
--- trunk/dports/graphics/xfig/files/patch-fig.h.diff (rev 0)
+++ trunk/dports/graphics/xfig/files/patch-fig.h.diff 2016-08-17 05:40:58 UTC (rev 151503)
@@ -0,0 +1,12 @@
+--- 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-w_export.c
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_export.c 2016-08-17 05:32:44 UTC (rev 151502)
+++ trunk/dports/graphics/xfig/files/patch-w_export.c 2016-08-17 05:40:58 UTC (rev 151503)
@@ -1,20 +0,0 @@
---- w_export.c.orig 2007-09-19 15:32:30.000000000 -0400
-+++ w_export.c 2012-07-27 17:42:49.000000000 -0400
-@@ -1016,7 +1016,7 @@
- /* set global state */
- print_hpgl_pcl_switch = state;
-
-- return;
-+ return 0;
- }
-
- static XtCallbackProc
-@@ -1038,7 +1038,7 @@
- /* set global state */
- hpgl_specified_font = state;
-
-- return;
-+ return 0;
- }
-
- void create_export_panel(Widget w)
Copied: trunk/dports/graphics/xfig/files/patch-w_export.c.diff (from rev 151502, trunk/dports/graphics/xfig/files/patch-w_export.c)
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_export.c.diff (rev 0)
+++ trunk/dports/graphics/xfig/files/patch-w_export.c.diff 2016-08-17 05:40:58 UTC (rev 151503)
@@ -0,0 +1,20 @@
+--- w_export.c.orig 2007-09-19 15:32:30.000000000 -0400
++++ w_export.c 2012-07-27 17:42:49.000000000 -0400
+@@ -1016,7 +1016,7 @@
+ /* set global state */
+ print_hpgl_pcl_switch = state;
+
+- return;
++ return 0;
+ }
+
+ static XtCallbackProc
+@@ -1038,7 +1038,7 @@
+ /* set global state */
+ hpgl_specified_font = state;
+
+- return;
++ return 0;
+ }
+
+ void create_export_panel(Widget w)
Deleted: trunk/dports/graphics/xfig/files/patch-w_keyboard.c
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_keyboard.c 2016-08-17 05:32:44 UTC (rev 151502)
+++ trunk/dports/graphics/xfig/files/patch-w_keyboard.c 2016-08-17 05:40:58 UTC (rev 151503)
@@ -1,13 +0,0 @@
---- w_keyboard.c.orig 2008-05-20 14:38:18.000000000 -0500
-+++ w_keyboard.c 2009-12-21 15:10:12.000000000 -0600
-@@ -45,6 +45,10 @@
- #define REG_NOERROR 0
- #endif
-
-+#ifndef REG_NOERROR
-+#define REG_NOERROR 0
-+#endif
-+
- Boolean keyboard_input_available = False;
- int keyboard_x;
- int keyboard_y;
Copied: trunk/dports/graphics/xfig/files/patch-w_keyboard.c.diff (from rev 151502, trunk/dports/graphics/xfig/files/patch-w_keyboard.c)
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_keyboard.c.diff (rev 0)
+++ trunk/dports/graphics/xfig/files/patch-w_keyboard.c.diff 2016-08-17 05:40:58 UTC (rev 151503)
@@ -0,0 +1,13 @@
+--- w_keyboard.c.orig 2008-05-20 14:38:18.000000000 -0500
++++ w_keyboard.c 2009-12-21 15:10:12.000000000 -0600
+@@ -45,6 +45,10 @@
+ #define REG_NOERROR 0
+ #endif
+
++#ifndef REG_NOERROR
++#define REG_NOERROR 0
++#endif
++
+ Boolean keyboard_input_available = False;
+ int keyboard_x;
+ int keyboard_y;
Deleted: trunk/dports/graphics/xfig/files/patch-w_print.c
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_print.c 2016-08-17 05:32:44 UTC (rev 151502)
+++ trunk/dports/graphics/xfig/files/patch-w_print.c 2016-08-17 05:40:58 UTC (rev 151503)
@@ -1,20 +0,0 @@
---- w_print.c.orig 2009-04-20 12:26:14.000000000 -0400
-+++ w_print.c 2012-07-27 17:47:29.000000000 -0400
-@@ -1185,7 +1185,7 @@
- /* which button */
- which = (int) XawToggleGetCurrent(w);
- if (which == 0) /* no buttons on, in transition so return now */
-- return;
-+ return 0;
- if (which == 2) /* "blank" button, invert state */
- state = !state;
-
-@@ -1193,7 +1193,7 @@
- print_all_layers = state;
- update_figure_size();
-
-- return;
-+ return 0;
- }
-
- /* when user toggles between printing all or only active layers */
Copied: trunk/dports/graphics/xfig/files/patch-w_print.c.diff (from rev 151502, trunk/dports/graphics/xfig/files/patch-w_print.c)
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_print.c.diff (rev 0)
+++ trunk/dports/graphics/xfig/files/patch-w_print.c.diff 2016-08-17 05:40:58 UTC (rev 151503)
@@ -0,0 +1,20 @@
+--- w_print.c.orig 2009-04-20 12:26:14.000000000 -0400
++++ w_print.c 2012-07-27 17:47:29.000000000 -0400
+@@ -1185,7 +1185,7 @@
+ /* which button */
+ which = (int) XawToggleGetCurrent(w);
+ if (which == 0) /* no buttons on, in transition so return now */
+- return;
++ return 0;
+ if (which == 2) /* "blank" button, invert state */
+ state = !state;
+
+@@ -1193,7 +1193,7 @@
+ print_all_layers = state;
+ update_figure_size();
+
+- return;
++ return 0;
+ }
+
+ /* when user toggles between printing all or only active layers */
Deleted: trunk/dports/graphics/xfig/files/patch-w_util.c
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_util.c 2016-08-17 05:32:44 UTC (rev 151502)
+++ trunk/dports/graphics/xfig/files/patch-w_util.c 2016-08-17 05:40:58 UTC (rev 151503)
@@ -1,38 +0,0 @@
---- w_util.c.orig 2009-03-30 11:52:38.000000000 -0400
-+++ w_util.c 2012-07-28 07:31:19.000000000 -0400
-@@ -710,7 +710,7 @@
- /* keep track of which one the user is pressing */
- cur_spin = widget;
-
-- return;
-+ return 0;
- }
-
- static XtEventHandler
-@@ -718,7 +718,7 @@
- {
- XtRemoveTimeOut(auto_spinid);
-
-- return;
-+ return 0;
- }
-
- static XtTimerCallbackProc
-@@ -729,7 +729,7 @@
- /* call the proper spinup/down routine */
- XtCallCallbacks(cur_spin, XtNcallback, 0);
-
-- return;
-+ return 0;
- }
-
- /***************************/
-@@ -1412,7 +1412,7 @@
- }
- SetValues(w);
-
-- return;
-+ return 0;
- }
-
- /* assemble main window title bar with xfig title and (base) file name */
Copied: trunk/dports/graphics/xfig/files/patch-w_util.c.diff (from rev 151502, trunk/dports/graphics/xfig/files/patch-w_util.c)
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_util.c.diff (rev 0)
+++ trunk/dports/graphics/xfig/files/patch-w_util.c.diff 2016-08-17 05:40:58 UTC (rev 151503)
@@ -0,0 +1,38 @@
+--- w_util.c.orig 2009-03-30 11:52:38.000000000 -0400
++++ w_util.c 2012-07-28 07:31:19.000000000 -0400
+@@ -710,7 +710,7 @@
+ /* keep track of which one the user is pressing */
+ cur_spin = widget;
+
+- return;
++ return 0;
+ }
+
+ static XtEventHandler
+@@ -718,7 +718,7 @@
+ {
+ XtRemoveTimeOut(auto_spinid);
+
+- return;
++ return 0;
+ }
+
+ static XtTimerCallbackProc
+@@ -729,7 +729,7 @@
+ /* call the proper spinup/down routine */
+ XtCallCallbacks(cur_spin, XtNcallback, 0);
+
+- return;
++ return 0;
+ }
+
+ /***************************/
+@@ -1412,7 +1412,7 @@
+ }
+ SetValues(w);
+
+- return;
++ return 0;
+ }
+
+ /* assemble main window title bar with xfig title and (base) file name */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160816/28900379/attachment.html>
More information about the macports-changes
mailing list