Changeset 80155

Timestamp:

07/05/11 09:38:19 (4 years ago)

Author:

ryandesign@…

Message:

scite: avoid .. components in patchfile; see #30034

Location:

trunk/dports/editors/scite

Files:

• Portfile (modified) (3 diffs)
• files/patch-scite-makefile.diff (modified) (2 diffs)

trunk/dports/editors/scite/Portfile

@@ -27 +27 @@
                 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
@@ -68 +72 @@
 
 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}
@@ -79 +83 @@
             ${workpath}/scintilla/gtk/makefile
         reinplace -E "/^CXXBASEFLAGS/s|\$| ${configure.universal_cflags}|" \
-            ${worksrcpath}/makefile
+            ${build.dir}/makefile
     }
 

trunk/dports/editors/scite/files/patch-scite-makefile.diff

@@ -1 @@
-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
@@ -11 +10 @@
  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 @@