[MacPorts] #24927: update: Update highlight Portfile to release 2.16
#24927: update: Update highlight Portfile to release 2.16 ---------------------------------------+------------------------------------ Reporter: lists@… | Owner: macports-tickets@… Type: update | Status: new Priority: Normal | Milestone: Component: ports | Version: 1.8.2 Keywords: | Port: highlight ---------------------------------------+------------------------------------ Update the highlight Portfile to the latest release. {{{ --- Portfile +++ (clipboard) @@ -3,7 +3,7 @@ PortSystem 1.0 name highlight -version 2.4.8 +version 2.16 categories textproc devel platforms darwin maintainers groovie.org:pjenvey @@ -12,14 +12,16 @@ 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,16 +29,15 @@ 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,8 +47,8 @@ ${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,13 +56,14 @@ 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,4 +86,3 @@ } } } }}} -- Ticket URL: <http://trac.macports.org/ticket/24927> MacPorts <http://www.macports.org/> Ports system for Mac OS
#24927: update: Update highlight Portfile to release 2.16 ---------------------------------------+------------------------------------ Reporter: lists@… | Owner: pjenvey@… Type: update | Status: new Priority: Normal | Milestone: Component: ports | Version: Keywords: haspatch | Port: highlight ---------------------------------------+------------------------------------ Changes (by jmr@…): * keywords: => haspatch * cc: pjenvey@… (removed) * version: 1.8.2 => * owner: macports-tickets@… => pjenvey@… -- Ticket URL: <http://trac.macports.org/ticket/24927#comment:1> MacPorts <http://www.macports.org/> Ports system for Mac OS
#24927: update: Update highlight Portfile to release 2.16 ---------------------------------------+------------------------------------ Reporter: lists@… | Owner: pjenvey@… Type: update | Status: new Priority: Normal | Milestone: Component: ports | Version: Keywords: haspatch | Port: highlight ---------------------------------------+------------------------------------ Comment(by profjim@…): Here is a new patch, that brings highlight from 2.4.8 up to 3.4.0, and additionally adds a +perl variant to build the perl bindings from the examples/swig subdirectory. (They are needed at least by the IkiWiki highlight plugin.) -- Ticket URL: <https://trac.macports.org/ticket/24927#comment:2> MacPorts <http://www.macports.org/> Ports system for Mac OS
#24927: highlight: update to 3.4.0 ---------------------------------------+------------------------------------ Reporter: lists@… | Owner: pjenvey@… Type: update | Status: new Priority: Normal | Milestone: Component: ports | Version: Keywords: haspatch | Port: highlight ---------------------------------------+------------------------------------ Changes (by ryandesign@…): * cc: ryandesign@… (added) Comment: I'm attaching a revised patch with these changes from yours: * moved everything related to the perl variant into the perl variant * removed swig and perl5 dependencies from perl variant since the remaining swig-perl dependency already has dependencies on them * simplified how documentation files are installed in post-destroot to avoid the need for a foreach loop * removed md5 checksum * adjusted whitespace of additions to conform to portfile's existing whitespace conventions * removed unnecessary quotes around things I have not committed it yet because it references a patchfile that has not been attached to this ticket. Can you attach "makefiles.patch"? -- Ticket URL: <https://trac.macports.org/ticket/24927#comment:3> MacPorts <http://www.macports.org/> Ports system for Mac OS
#24927: highlight: update to 3.4.0 ------------------------+----------------------- Reporter: lists@… | Owner: pjenvey@… Type: update | Status: closed Priority: Normal | Milestone: Component: ports | Version: Resolution: fixed | Keywords: haspatch Port: highlight | ------------------------+----------------------- Changes (by g5pw@…): * status: new => closed * resolution: => fixed Comment: Since highlight is now at version 3.9 and this ticket has been sitting here for 18 months, I'll just go ahead and resolve it as fixed. -- Ticket URL: <https://trac.macports.org/ticket/24927#comment:4> MacPorts <http://www.macports.org/> Ports system for Mac OS
#24927: highlight: update to 3.4.0 ------------------------+----------------------- Reporter: lists@… | Owner: pjenvey@… Type: update | Status: reopened Priority: Normal | Milestone: Component: ports | Version: Resolution: | Keywords: haspatch Port: highlight | ------------------------+----------------------- Changes (by ryandesign@…): * cc: g5pw@… (added) * status: closed => reopened * resolution: fixed => Comment: The perl variant added by the patch in this ticket does not appear to have made it into the port yet. -- Ticket URL: <https://trac.macports.org/ticket/24927#comment:5> MacPorts <http://www.macports.org/> Ports system for Mac OS
#24927: highlight: update to 3.4.0 ------------------------+----------------------- Reporter: lists@… | Owner: pjenvey@… Type: update | Status: reopened Priority: Normal | Milestone: Component: ports | Version: Resolution: | Keywords: haspatch Port: highlight | ------------------------+----------------------- Comment (by g5pw@…): Adding the perl variant to current highlight breaks the build, would you mind adding a patch against the current portfile? -- Ticket URL: <https://trac.macports.org/ticket/24927#comment:6> MacPorts <http://www.macports.org/> Ports system for OS X
participants (1)
-
MacPorts