Ticket #1372: net_rrdtool.patch

File net_rrdtool.patch, 5.1 KB (added by opendarwin.org@…, 21 years ago)

cvs diff -u (pwd = dports/net/rrdtool) - upgrade to 1.0.46, make the install cleaner

  • Portfile 

    RCS file: /Volumes/src/cvs/od/projects/darwinports/dports/net/rrdtool/Portfile,v
retrieving revision 1.5
diff -u -r1.5 Portfile
     
    22
    33PortSystem 1.0
    44name            rrdtool
    5 version         1.0.40
     5version         1.0.46
    66revision        1
    77categories      net
    8 maintainers     ricci@opendarwin.org
     8maintainers     opendarwin.org@darkart.com
    99description     Round Robin Database
    1010long_description        RRDtool is a system to store and display time-series data
    1111homepage        http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
    1212platforms       darwin
    1313master_sites    http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
    14 checksums       md5 6754a550c788e9cea626dec4a3a25219
    15 configure.args  --prefix=${prefix} --enable-shared=yes
     14checksums       md5 718676770c06b25d1471cec1e4f0bbdc
     15configure.args  --prefix=${prefix} --mandir=${prefix}/share/man --enable-shared=yes
    1616build.type      gnu
    17 patchfiles      patch-Makefile.in \
    18                 patch-contrib-Makefile.in \
     17patchfiles      patch-contrib-Makefile.in \
     18                patch-contrib-trytime-Makefile.in \
    1919                patch-doc-Makefile.in \
    2020                patch-examples-Makefile.in
    2121
    22 destroot.destdir        prefix=${destroot}/${prefix}/

  • files/patch-contrib-Makefile.in 

    RCS file: /Volumes/src/cvs/od/projects/darwinports/dports/net/rrdtool/files/patch-contrib-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-contrib-Makefile.in
     
    1 --- contrib/Makefile.in.orig    Fri Feb 28 17:47:48 2003
    2 +++ contrib/Makefile.in Thu Mar  6 18:38:48 2003
    3 @@ -87,10 +87,14 @@
    4  ZLIB_CFLAGS = @ZLIB_CFLAGS@
    5  ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
     1--- contrib/Makefile.in.orig    Wed Jan  7 16:41:03 2004
     2+++ contrib/Makefile.in Wed Jan  7 16:41:28 2004
     3@@ -162,7 +162,11 @@
     4 target_vendor = @target_vendor@
    65 
    7 -SUBDIRS = trytime
     6 SUBDIRS = trytime
    87-contribdir = $(prefix)/contrib
    9 +SUBDIRS =
    108+## XYZZY: hack for now, hard code our name and version into the
    119+## contribdir path.  It'd be better to pick name and version up
    1210+## from automake/configure.
    1311+## contribdir = $(prefix)/contrib
    1412+contribdir = $(prefix)/share/rrdtool-${VERSION}/contrib
    1513 contrib_DATA = README
    16 -EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
    17 +EXTRA_DIST = trytime rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
    18  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
    19  CONFIG_HEADER = ../config/config.h
    20  CONFIG_CLEAN_FILES =
     14 EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
     15 subdir = contrib

  • files/patch-doc-Makefile.in 

    RCS file: /Volumes/src/cvs/od/projects/darwinports/dports/net/rrdtool/files/patch-doc-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-doc-Makefile.in
     
    1 --- doc/Makefile.in.orig        Fri Feb 28 09:58:58 2003
    2 +++ doc/Makefile.in     Fri Feb 28 10:02:03 2003
    3 @@ -110,11 +110,15 @@
     1--- doc/Makefile.in.orig        Wed Jan  7 16:42:51 2004
     2+++ doc/Makefile.in     Wed Jan  7 16:43:50 2004
     3@@ -187,11 +187,15 @@
    44 EXTRA_DIST = $(POD) $(HTML) $(TXT)
    55 
    66 # some install rules
    … …  
    1717-imandir = $(prefix)/man/man1
    1818+imandir = $(prefix)/share/man/man1
    1919 iman_DATA = $(MAN)
    20  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
    21  CONFIG_HEADER = ../config/config.h
     20 subdir = doc
     21 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

  • files/patch-examples-Makefile.in 

    RCS file: /Volumes/src/cvs/od/projects/darwinports/dports/net/rrdtool/files/patch-examples-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-examples-Makefile.in
     
    1 --- examples/Makefile.in.orig   Fri Feb 28 17:58:12 2003
    2 +++ examples/Makefile.in        Mon Mar  3 17:39:32 2003
    3 @@ -93,7 +93,11 @@
     1--- examples/Makefile.in.orig   Wed Jan  7 16:44:32 2004
     2+++ examples/Makefile.in        Wed Jan  7 16:44:58 2004
     3@@ -167,7 +167,11 @@
    44 
    55 EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
    66 
    … …  
    99+## examplesdir path.  It'd be better to pick name and version up
    1010+## from automake/configure.
    1111+## examplesdir = $(prefix)/examples
    12 +examplesdir = $(prefix)/share/examples/rrdtool-${VERSION}
     12+examplesdir = $(prefix)/share/rrdtool-${VERSION}/examples
    1313 examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
    14  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
    15  CONFIG_HEADER = ../config/config.h
     14 subdir = examples
     15 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4