[50768] trunk/dports/editors/nedit

[jmr at macports.org]

Revision: 50768
          http://trac.macports.org/changeset/50768
Author:   jmr at macports.org
Date:     2009-05-08 17:04:44 -0700 (Fri, 08 May 2009)
Log Message:
-----------
nedit: don't build against system X11 (#19576)

Modified Paths:
--------------
    trunk/dports/editors/nedit/Portfile
    trunk/dports/editors/nedit/files/patch-Makefile.macosx

Modified: trunk/dports/editors/nedit/Portfile
===================================================================
--- trunk/dports/editors/nedit/Portfile	2009-05-08 23:59:06 UTC (rev 50767)
+++ trunk/dports/editors/nedit/Portfile	2009-05-09 00:04:44 UTC (rev 50768)
@@ -32,6 +32,7 @@
 use_configure    no
 
 build.args      MOTIFLINK="${configure.ldflags} -lXm" \
+                MOTIFDIR=${prefix} \
                 LDFLAGS="${configure.ldflags}" \
                 CFLAGS="${configure.cppflags} ${configure.cflags} -DBUILD_UNTESTED_NEDIT" \
                 CPPFLAGS="${configure.cppflags}" \

Modified: trunk/dports/editors/nedit/files/patch-Makefile.macosx
===================================================================
--- trunk/dports/editors/nedit/files/patch-Makefile.macosx	2009-05-08 23:59:06 UTC (rev 50767)
+++ trunk/dports/editors/nedit/files/patch-Makefile.macosx	2009-05-09 00:04:44 UTC (rev 50768)
@@ -1,14 +1,5 @@
 --- makefiles/Makefile.macosx.org	2004-07-14 12:48:21.000000000 -0700
 +++ makefiles/Makefile.macosx	2007-10-29 20:27:27.000000000 -0700
-@@ -9,7 +9,7 @@
- # Change this line to point at the location your Motif libraries/headers are
- # installed.  (e.g. /usr/local or /sw)  Use "locate libXm." to find the
- # libraries, then remove the /lib suffix.
--MOTIFDIR=/usr/local
-+MOTIFDIR=/usr/X11R6
- 
- # Use the first line if you're using OpenMotif, use the second if you're using
- # LessTif from Fink.
 @@ -19,8 +19,8 @@
  # Use the first line to link to Motif statically (highly recommended) or the 
  # second line to link dynamically.  With Fink you'll probably have to use
@@ -20,12 +11,16 @@
  
  
  ############### You shouldn't need to edit anything below here ##############
-@@ -37,7 +37,7 @@
+@@ -36,9 +36,9 @@
+ # To test if the Motif library exports the runtime version
  # add -DHAVE__XMVERSIONSTRING to CFLAGS
  #
- CFLAGS=-O -no-cpp-precomp -mdynamic-no-pic -DNO_XMIM -I/usr/X11R6/include \
+-CFLAGS=-O -no-cpp-precomp -mdynamic-no-pic -DNO_XMIM -I/usr/X11R6/include \
 -        -I${MOTIFDIR}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+-LIBS= ${EXTRALINKFLAGS} -L/usr/X11R6/lib ${MOTIFLINK} -lXp \
++CFLAGS=-O -no-cpp-precomp -mdynamic-no-pic -DNO_XMIM \
 +        -I${MOTIFDIR}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DBUILD_UNTESTED_NEDIT
- LIBS= ${EXTRALINKFLAGS} -L/usr/X11R6/lib ${MOTIFLINK} -lXp \
++LIBS= ${EXTRALINKFLAGS} ${MOTIFLINK} -lXp \
          -lXpm -lXext -lXt -lSM -lICE -lX11
  
+ #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090508/e4384c9b/attachment.html>