[61827] trunk/dports/graphics/xfig

ryandesign at macports.org ryandesign at macports.org
Mon Dec 21 12:45:35 PST 2009 

Revision: 61827
          http://trac.macports.org/changeset/61827
Author:   ryandesign at macports.org
Date:     2009-12-21 12:45:34 -0800 (Mon, 21 Dec 2009)
Log Message:
-----------
xfig: delete patch-Imakefile.diff which was copied from patch-Imakefile and added recently without history; put its changes back in patch-Imakefile

Modified Paths:
--------------
    trunk/dports/graphics/xfig/Portfile
    trunk/dports/graphics/xfig/files/patch-Imakefile

Removed Paths:
-------------
    trunk/dports/graphics/xfig/files/patch-Imakefile.diff

Modified: trunk/dports/graphics/xfig/Portfile
===================================================================
--- trunk/dports/graphics/xfig/Portfile	2009-12-21 20:12:08 UTC (rev 61826)
+++ trunk/dports/graphics/xfig/Portfile	2009-12-21 20:45:34 UTC (rev 61827)
@@ -31,7 +31,7 @@
 use_xmkmf		yes
 xmkmf.args-append	\
 				-DUseSeparateConfDir=NO -DBuildHtmlManPages=NO
-patchfiles		patch-Imakefile.diff \
+patchfiles		patch-Imakefile \
 				patch-fig.h \
                 patch-f_util.c \
 				patch-w_keyboard.c \

Modified: trunk/dports/graphics/xfig/files/patch-Imakefile
===================================================================
--- trunk/dports/graphics/xfig/files/patch-Imakefile	2009-12-21 20:12:08 UTC (rev 61826)
+++ trunk/dports/graphics/xfig/files/patch-Imakefile	2009-12-21 20:45:34 UTC (rev 61827)
@@ -1,6 +1,6 @@
---- Imakefile.orig	2007-11-07 09:35:59.000000000 +0100
-+++ Imakefile	2007-11-07 09:37:22.000000000 +0100
-@@ -30,9 +30,10 @@
+--- Imakefile.orig~	2006-10-10 17:19:22.000000000 -0600
++++ Imakefile	2009-01-30 14:15:10.000000000 -0700
+@@ -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
@@ -9,12 +9,14 @@
 -MKDIRHIER = mkdirhier 
 +BINDIR = __PREFIX/bin
 +DESTDIR = __DESTROOT
-+MKDIRHIER = /bin/sh /usr/X11R6/bin/mkdirhier
++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 +46,7 @@
+@@ -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.
  
@@ -23,7 +25,7 @@
  
  XCOMM Uncomment the following definition for XAW3D if you want to use
  XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -55,11 +56,11 @@
+@@ -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"
  
@@ -37,7 +39,7 @@
  #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 +73,9 @@
+@@ -72,9 +75,9 @@
  XCOMM Redefine the following if your PNG library, zlib library and/or include file
  XCOMM are in different places
  
@@ -50,7 +52,7 @@
  
  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 +94,8 @@
+@@ -93,8 +96,8 @@
  
  #ifdef USEJPEG
  #ifdef USEINSTALLEDJPEG
@@ -61,7 +63,7 @@
  #else
  JPEGLIBDIR = ../jpeg
  JPEGINC = -I$(JPEGLIBDIR)
-@@ -116,8 +117,8 @@
+@@ -116,8 +119,8 @@
  #define USEXPM_ICON
  
  #ifdef USEXPM
@@ -72,7 +74,7 @@
  #endif
  
  XCOMM Uncomment the following definiton if you want to use the small icons
-@@ -166,16 +167,16 @@
+@@ -166,16 +169,16 @@
  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-Imakefile.diff
===================================================================
--- trunk/dports/graphics/xfig/files/patch-Imakefile.diff	2009-12-21 20:12:08 UTC (rev 61826)
+++ trunk/dports/graphics/xfig/files/patch-Imakefile.diff	2009-12-21 20:45:34 UTC (rev 61827)
@@ -1,96 +0,0 @@
---- Imakefile.orig~	2006-10-10 17:19:22.000000000 -0600
-+++ Imakefile	2009-01-30 14:15:10.000000000 -0700
-@@ -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 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 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 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
--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
-@@ -93,8 +96,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 @@
- #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
- #endif
- 
- XCOMM Uncomment the following definiton if you want to use the small icons
-@@ -166,16 +169,16 @@
- 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
- XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
--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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091221/7a3b6d54/attachment.html>

More information about the macports-changes mailing list