[70347] trunk/dports/graphics/xfig
ryandesign at macports.org
ryandesign at macports.org
Fri Aug 6 17:39:23 PDT 2010
Revision: 70347
http://trac.macports.org/changeset/70347
Author: ryandesign at macports.org
Date: 2010-08-06 17:39:22 -0700 (Fri, 06 Aug 2010)
Log Message:
-----------
xfig: update to 3.2.5b (#22967, #25458), install additional documentation, add dependency on xorg-libXi (#22946), remove references to /usr/X11R6 (#17985)
Modified Paths:
--------------
trunk/dports/graphics/xfig/Portfile
trunk/dports/graphics/xfig/files/patch-Imakefile
trunk/dports/graphics/xfig/files/patch-fig.h
trunk/dports/graphics/xfig/files/patch-w_keyboard.c
Removed Paths:
-------------
trunk/dports/graphics/xfig/files/patch-w_library.c
Modified: trunk/dports/graphics/xfig/Portfile
===================================================================
--- trunk/dports/graphics/xfig/Portfile 2010-08-07 00:08:09 UTC (rev 70346)
+++ trunk/dports/graphics/xfig/Portfile 2010-08-07 00:39:22 UTC (rev 70347)
@@ -3,8 +3,7 @@
PortSystem 1.0
name xfig
-version 3.2.5
-revision 8
+version 3.2.5b
categories graphics x11
maintainers nomaintainer
description Facility for Interactive Generation of figures under X11
@@ -19,29 +18,52 @@
master_sites sourceforge:mcj
distname ${name}.${version}
distfiles ${distname}.full${extract.suffix}
-checksums md5 fae0c67a3951bd41c057deb63b6aa47a \
- sha1 ce09d1a74dbddf0bc6b20fe9c558db584fbfed17 \
- rmd160 0d5ada9e4b7f1dbd8dab8a09fd5946ec0211904c
+checksums md5 499b0ce103a6b353453bf7e327f9a3b9 \
+ sha1 0730d7e6bc217c0de02682efb0078821512bb542 \
+ rmd160 aad4cfd808c116d34218e9890a898652e4f52ab6
depends_lib port:Xaw3d \
+ port:xorg-libXi \
port:libpng \
port:jpeg \
port:zlib
-depends_run bin:gs:ghostscript \
- bin:fig2dev:transfig
+depends_run port:ghostscript \
+ port:transfig
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_library.c
+ patch-w_keyboard.c
+post-extract {
+ foreach d "${worksrcpath}/Doc ${worksrcpath}/Libraries" {
+ fs-traverse x ${d} {
+ if {[file isdirectory ${x}]} {
+ file attributes ${x} -permissions 0755
+ } else {
+ file attributes ${x} -permissions 0644
+ }
+ }
+ }
+}
+
post-patch {
reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/Imakefile
reinplace "s|__DESTROOT|${destroot}|g" ${worksrcpath}/Imakefile
}
destroot.target install.all install.man
+post-destroot {
+ set docdir ${destroot}${prefix}/share/doc/${name}
+ xinstall -d ${docdir}
+ eval xinstall -m 644 -W ${worksrcpath} \
+ CHANGES \
+ Doc/TODO \
+ [glob ${worksrcpath}/Doc/FORMAT*] \
+ FIGAPPS \
+ README \
+ ${docdir}
+}
livecheck.type regex
livecheck.regex {>Xfig/Transfig (.*) Download</a>}
Modified: trunk/dports/graphics/xfig/files/patch-Imakefile
===================================================================
--- trunk/dports/graphics/xfig/files/patch-Imakefile 2010-08-07 00:08:09 UTC (rev 70346)
+++ trunk/dports/graphics/xfig/files/patch-Imakefile 2010-08-07 00:39:22 UTC (rev 70347)
@@ -1,10 +1,10 @@
---- Imakefile.orig~ 2006-10-10 17:19:22.000000000 -0600
-+++ Imakefile 2009-01-30 14:15:10.000000000 -0700
+--- Imakefile.orig 2009-03-30 10:53:05.000000000 -0500
++++ Imakefile 2009-12-21 15:31:35.000000000 -0600
@@ -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
--BINDIR = /usr/bin
+-XCOMM BINDIR = /usr/bin
-XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
-MKDIRHIER = mkdirhier
+BINDIR = __PREFIX/bin
@@ -23,23 +23,9 @@
-XCOMM XAPPLOADDIR = /home/user/xfig
+XAPPLOADDIR = __PREFIX/lib/X11/app-defaults
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -55,11 +58,11 @@
- XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
- XCOMM some new features, including "Tips", which replace xfig's "help balloons"
-
--XCOMM #define XAW3D1_5E
-+#define XAW3D1_5E
-
- #ifdef XAW3D1_5E
- DUSEXAW3D = -DXAW3D -DXAW3D1_5E
-- XAWLIB = -lXaw3d15e
-+ XAWLIB = -lXaw3d
- #else
- XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
- XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
-@@ -72,9 +75,9 @@
+ 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
@@ -52,29 +38,29 @@
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
-@@ -93,8 +96,8 @@
+@@ -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)
-@@ -116,8 +119,8 @@
+ #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/local/include/X11
-+XPMLIBDIR = /usr/X11R6/lib
-+XPMINC = -I/usr/X11R6/include/X11
++XPMLIBDIR = __PREFIX/lib
++XPMINC = -I__PREFIX/include/X11
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
-@@ -166,16 +169,16 @@
+@@ -169,16 +172,15 @@
XCOMM XFIGLIBDIR = $(LIBDIR)
XCOMM use this if you want the multi-key data base file in the standard X11 tree
@@ -88,8 +74,8 @@
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
- XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
--MANDIR = /usr/local/xfig/man
+-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
Modified: trunk/dports/graphics/xfig/files/patch-fig.h
===================================================================
--- trunk/dports/graphics/xfig/files/patch-fig.h 2010-08-07 00:08:09 UTC (rev 70346)
+++ trunk/dports/graphics/xfig/files/patch-fig.h 2010-08-07 00:39:22 UTC (rev 70347)
@@ -1,11 +1,12 @@
---- fig.h.orig 2007-11-06 17:31:17.000000000 +0100
-+++ fig.h 2007-11-06 17:31:57.000000000 +0100
-@@ -383,6 +383,9 @@
+--- 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)
+ #elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__)
extern void srandom(int);
+
Modified: trunk/dports/graphics/xfig/files/patch-w_keyboard.c
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_keyboard.c 2010-08-07 00:08:09 UTC (rev 70346)
+++ trunk/dports/graphics/xfig/files/patch-w_keyboard.c 2010-08-07 00:39:22 UTC (rev 70347)
@@ -1,7 +1,7 @@
---- w_keyboard.c.orig 2007-04-15 08:12:17.000000000 +0900
-+++ w_keyboard.c 2007-04-15 08:12:21.000000000 +0900
-@@ -37,6 +37,10 @@
- #define REG_NOERROR REG_OKAY
+--- 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
Deleted: trunk/dports/graphics/xfig/files/patch-w_library.c
===================================================================
--- trunk/dports/graphics/xfig/files/patch-w_library.c 2010-08-07 00:08:09 UTC (rev 70346)
+++ trunk/dports/graphics/xfig/files/patch-w_library.c 2010-08-07 00:39:22 UTC (rev 70347)
@@ -1,13 +0,0 @@
---- w_library.c.orig 2007-11-06 16:39:32.000000000 +0100
-+++ w_library.c 2007-11-06 16:40:16.000000000 +0100
-@@ -1029,9 +1029,9 @@
- Widget menu, entry;
- #ifndef XAW3D1_5E
- Widget submenu;
-- char submenu_name[200];
- #endif /* XAW3D1_5E */
- char menu_name[200];
-+ char submenu_name[200];
- int i;
-
- menu = XtCreatePopupShell(name, simpleMenuWidgetClass,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100806/7f84cf90/attachment-0001.html>
More information about the macports-changes
mailing list