[80155] trunk/dports/editors/scite

[ryandesign at macports.org]

Revision: 80155
          http://trac.macports.org/changeset/80155
Author:   ryandesign at macports.org
Date:     2011-07-05 09:38:19 -0700 (Tue, 05 Jul 2011)
Log Message:
-----------
scite: avoid .. components in patchfile; see #30034

Modified Paths:
--------------
    trunk/dports/editors/scite/Portfile
    trunk/dports/editors/scite/files/patch-scite-makefile.diff

Modified: trunk/dports/editors/scite/Portfile
===================================================================
--- trunk/dports/editors/scite/Portfile	2011-07-05 16:29:01 UTC (rev 80154)
+++ trunk/dports/editors/scite/Portfile	2011-07-05 16:38:19 UTC (rev 80155)
@@ -26,12 +26,16 @@
 checksums       sha1    4e624655c28481507d44126a3c6dbf5bf9a7a244 \
                 rmd160  a11dfc9251d804cd5f699bf1fe15688b65106544
 
-worksrcdir      ${name}/gtk
+worksrcdir      ${name}
 
+patch.dir       ${workpath}
+
 patchfiles      patch-scite-makefile.diff
 
 use_configure   no
 
+build.dir       ${worksrcpath}/gtk
+
 build.args      prefix=${prefix} GTK2=yes
 
 use_parallel_build  yes
@@ -67,7 +71,7 @@
 destroot.destdir    prefix=${destroot}${prefix}
 
 post-destroot {
-    xinstall -m 444 ${worksrcpath}/../doc/scite.1 ${destroot}${prefix}/share/man/man1
+    xinstall -m 444 ${worksrcpath}/doc/scite.1 ${destroot}${prefix}/share/man/man1
     set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}
     xinstall -m 644 -W ${workpath}/scite License.txt README ${destroot}${docdir}
@@ -78,7 +82,7 @@
         reinplace -E "/^CXXBASEFLAGS/s|\$| \$(UNIVERSAL_CFLAGS)|" \
             ${workpath}/scintilla/gtk/makefile
         reinplace -E "/^CXXBASEFLAGS/s|\$| ${configure.universal_cflags}|" \
-            ${worksrcpath}/makefile
+            ${build.dir}/makefile
     }
 
     build.args-append   "UNIVERSAL_LDFLAGS=\"${configure.universal_ldflags}\""

Modified: trunk/dports/editors/scite/files/patch-scite-makefile.diff
===================================================================
--- trunk/dports/editors/scite/files/patch-scite-makefile.diff	2011-07-05 16:29:01 UTC (rev 80154)
+++ trunk/dports/editors/scite/files/patch-scite-makefile.diff	2011-07-05 16:38:19 UTC (rev 80155)
@@ -1,7 +1,6 @@
-diff -urN ../../scintilla/gtk/makefile.orig ./../scintilla/gtk/makefile
---- ../../scintilla/gtk/makefile.orig	2010-10-27 17:15:45.000000000 -0400
-+++ ../../scintilla/gtk/makefile	2011-01-27 17:14:07.000000000 -0500
-@@ -30,7 +30,7 @@
+--- scintilla/gtk/makefile.orig	2011-01-21 17:59:10.000000000 -0600
++++ scintilla/gtk/makefile	2011-07-05 11:27:56.000000000 -0500
+@@ -38,7 +38,7 @@
  
  INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
  #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
@@ -10,9 +9,8 @@
  
  ifdef NOTHREADS
  THREADFLAGS=-DG_THREADS_IMPL_NONE
-diff -urN scite/gtk/makefile.orig scite/gtk/makefile
---- makefile.orig	2010-10-27 17:16:07.000000000 -0400
-+++ makefile	2011-01-27 17:23:27.000000000 -0500
+--- scite/gtk/makefile.orig	2010-10-27 17:16:07.000000000 -0400
++++ scite/gtk/makefile	2011-01-27 17:23:27.000000000 -0500
 @@ -42,7 +42,7 @@
  
  INCLUDEDIRS=-I ../../scintilla/include -I ../src
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110705/ccccc66f/attachment.html>