Ticket #24927: highlight-2.4.8-2.16.patch

(a) Portfile vs. (b) (clipboard)

@@ -3 +3 @@
 PortSystem 1.0
 
 name                    highlight
-version                 2.4.8
+version                 2.16
 categories              textproc devel
 platforms               darwin
 maintainers             groovie.org:pjenvey
@@ -12 +12 @@
 
 homepage                http://www.andre-simon.de
 master_sites            ${homepage}/zip/
-checksums               sha1 091689fde96c9f4e3de75ea1b7c1838e8d25708c
+checksums               sha1 b5fed14bb1a973fe134dd2133766bb86fdc7494e
 use_bzip2               yes
 
+use_configure   no
+
 configure {
-        reinplace "s|/usr/share/highlight/|${prefix}/share/${name}/|g" \
-                ${worksrcpath}/highlight/datadir.cpp
-        reinplace "s|/etc/highlight/|${prefix}/etc/highlight/|g" \
-                ${worksrcpath}/highlight/datadir.cpp
+        reinplace "s|^PREFIX = /usr$|PREFIX = ${prefix}|g" \
+                ${worksrcpath}/makefile
+        reinplace "s|^conf_dir = /etc/highlight/$|conf_dir = ${prefix}/etc/highlight/|g" \
+                ${worksrcpath}/makefile
 }
 
 # Avoid stripping the binary (-s flag) during linking as this corrupts the executable.
@@ -27 +29 @@
 platform darwin 8 { build.args LDFLAGS="" }
 
 set conf_file "filetypes.conf"
-set old_conf_files { "scriptre.conf" "extensions.conf" }
 destroot {
-        xinstall -m 755 ${worksrcpath}/highlight/highlight ${destroot}${prefix}/bin
+        xinstall -m 755 ${worksrcpath}/src/highlight ${destroot}${prefix}/bin
 
         xinstall -m 755 -d ${destroot}${prefix}/etc/${name}
-        xinstall -m 644 ${worksrcpath}/${conf_file} \
-                ${destroot}${prefix}/etc/${name}/${conf_file}.sample
+  xinstall -m 644 ${worksrcpath}/${conf_file} \
+                ${destroot}${prefix}/etc/${name}/${conf_file}.sample
 
         xinstall -m 755 -d ${destroot}${prefix}/share/${name}
-        foreach dir { "langDefs" "themes" "indentSchemes" "helpmsg" } {
+        foreach dir { "langDefs" "themes" } {
                 file copy ${worksrcpath}/${dir} ${destroot}${prefix}/share/${name}
                         system "chmod 644 ${destroot}${prefix}/share/${name}/${dir}/*"
         }
@@ -46 +47 @@
                 ${destroot}${prefix}/share/man/man1
 
         xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
-        foreach file { "AUTHORS" "README" "README_DE" "README_INDENT" "ChangeLog" \
-                "COPYING" "INSTALL" } {
+        foreach file { "AUTHORS" "README" "README_DE" "ChangeLog" \
+                "COPYING" "INSTALL" "README_LANGLIST" "README_REGEX" } {
                 xinstall -m 644 ${worksrcpath}/${file} \
                         ${destroot}${prefix}/share/doc/${name}
         }
@@ -55 +56 @@
         file copy ${worksrcpath}/examples ${destroot}${prefix}/share/doc/${name}
 }
 
+set old_conf_files { "scriptre.conf" "extensions.conf" }
 post-activate {
         # copy over the sample conf file if necessary
         if { ![file exists ${prefix}/etc/${name}/${conf_file}] } {
                 file copy ${prefix}/etc/${name}/${conf_file}.sample \
                         ${prefix}/etc/${name}/${conf_file}
         }
-        
+
         # warn the user of deprecated conf files
         set deprecated_conf_files {}
         foreach file $old_conf_files {
@@ -84 +86 @@
                 }
         }
 }