]> git.pld-linux.org Git - packages/rrdtool.git/commitdiff
projects / packages / rrdtool.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 89044b7)
- orphaned, outdated
authorJan Rękorajski <baggins@pld-linux.org>
Sat, 22 Apr 2006 09:46:11 +0000 (09:46 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rrdtool-acfix.patch -> 1.2.2.1
    rrdtool-libdir.patch -> 1.1.2.1
    rrdtool-perl-install.patch -> 1.7.2.1
    rrdtool-system-libs.patch -> 1.5.2.1

rrdtool-acfix.patch [deleted file] patch | blob | blame | history
rrdtool-libdir.patch [deleted file] patch | blob | blame | history
rrdtool-perl-install.patch [deleted file] patch | blob | blame | history
rrdtool-system-libs.patch [deleted file] patch | blob | blame | history

diff --git a/rrdtool-acfix.patch b/rrdtool-acfix.patch
deleted file mode 100644 (file)
index 14efb1a..0000000
--- a/rrdtool-acfix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rrdtool-1.0.39/configure.in.orig   Thu Jun 20 08:20:52 2002
-+++ rrdtool-1.0.39/configure.ac        Tue Jul 23 22:21:31 2002
-@@ -201,6 +201,7 @@
- 
- dnl add pic flag in any case this makes sure all our code is relocatable
- dnl TO: CFLAGS="$CFLAGS "`grep pic_flag= libtool | sed -e 's/.*pic_flag=//' -e 's/"//g'`
-+CFLAGS="$CFLAGS "`grep pic_flag= libtool | sed -e 's/.*pic_flag=//' -e 's/"//g' | tr '\n' ' '`
- 
- dnl it seems that hpux chockes on -fPIC for some reason
- ZLIB_CFLAGS="$CFLAGS"
diff --git a/rrdtool-libdir.patch b/rrdtool-libdir.patch
deleted file mode 100644 (file)
index b70368a..0000000
--- a/rrdtool-libdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- contrib/php4/acinclude.m4~ 2003-08-27 21:23:50.000000000 +0200
-+++ contrib/php4/acinclude.m4  2004-08-26 13:53:07.000000000 +0200
-@@ -193,8 +193,8 @@
-     if test -r $i/include/openssl/evp.h; then
-       OPENSSL_INCDIR=$i/include
-     fi
--    if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
--      OPENSSL_LIBDIR=$i/lib
-+    if test -r $libdir/libssl.a -o -r $libdir/libssl.$SHLIB_SUFFIX_NAME; then
-+      OPENSSL_LIBDIR=$libdir
-     fi
-   done
- 
-@@ -699,7 +699,7 @@
- AC_MSG_CHECKING([if compiler supports -R])
- AC_CACHE_VAL(php_cv_cc_dashr,[
-       SAVE_LIBS=$LIBS
--      LIBS="-R /usr/lib $LIBS"
-+      LIBS="-R $libdir $LIBS"
-       AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
-       LIBS=$SAVE_LIBS])
- AC_MSG_RESULT([$php_cv_cc_dashr])
-@@ -709,7 +709,7 @@
-       AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
-       AC_CACHE_VAL(php_cv_cc_rpath,[
-               SAVE_LIBS=$LIBS
--              LIBS="-Wl,-rpath,/usr/lib $LIBS"
-+              LIBS="-Wl,-rpath,$libdir $LIBS"
-               AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
-               LIBS=$SAVE_LIBS])
-       AC_MSG_RESULT([$php_cv_cc_rpath])
-@@ -893,7 +893,7 @@
- dnl add a library to linkpath/runpath
- dnl
- AC_DEFUN([PHP_ADD_LIBPATH],[
--  if test "$1" != "/usr/lib"; then
-+  if test "$1" != "$libdir"; then
-     PHP_EXPAND_PATH($1, ai_p)
-     ifelse([$2],,[
-       _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
diff --git a/rrdtool-perl-install.patch b/rrdtool-perl-install.patch
deleted file mode 100644 (file)
index 1eefa9a..0000000
--- a/rrdtool-perl-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.am.orig   2004-08-25 09:13:57.560284152 +0200
-+++ Makefile.am        2004-08-25 09:18:37.910664416 +0200
-@@ -35,18 +35,18 @@
- # mac os X has its perl module in bundles so it seems
- install-data-local:
-       @if test "x$(PERL)" != "xno"; then \
--        echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
--        $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
--        echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
--        $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
--        echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
--        $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
--        echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
--        $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
--        echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
--        test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
--        echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
--        test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
-+        echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(perl_sitearch)/auto/RRDs"; \
-+        $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(perl_sitearch)/auto/RRDs; \
-+        echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(perl_sitearch)"; \
-+        $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(perl_sitearch); \
-+        echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(perl_sitearch)"; \
-+        $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(perl_sitearch); \
-+        echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(perl_sitearch)/auto/RRDs"; \
-+        $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(perl_sitearch)/auto/RRDs; \
-+        echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(perl_sitearch)/auto/RRDs || true"; \
-+        test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(perl_sitearch)/auto/RRDs || true; \
-+        echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(perl_sitearch)/auto/RRDs|| true"; \
-+        test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(perl_sitearch)/auto/RRDs|| true; \
-       fi
- 
- 
diff --git a/rrdtool-system-libs.patch b/rrdtool-system-libs.patch
deleted file mode 100644 (file)
index 1db7f9e..0000000
--- a/rrdtool-system-libs.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -urN rrdtool-1.0.48.org/configure.ac rrdtool-1.0.48/configure.ac
---- rrdtool-1.0.48.org/configure.ac    2004-05-10 21:54:23.926860912 +0200
-+++ rrdtool-1.0.48/configure.ac        2004-05-10 21:54:50.507819992 +0200
-@@ -366,7 +366,7 @@
- ]))])])])])])])])])])
- 
- 
--AC_CONFIG_FILES([cgilib-0.4/Makefile                          \
-+AC_CONFIG_FILES([ \
-           examples/shared-demo.pl                     \
-           examples/piped-demo.pl                      \
-           examples/stripes.pl                         \
-@@ -383,9 +383,6 @@
-           contrib/add_ds/add_ds.pl                    \
-         contrib/add_ds/batch.pl                       \
-           doc/Makefile                                        \
--          gd1.3/Makefile                              \
--          libpng-1.0.9/Makefile                               \
--          zlib-1.1.4/Makefile                         \
-           src/Makefile                                        \
-           tcl/Makefile                                        \
-           perl-shared/Makefile.PL                     \
-diff -urN rrdtool-1.0.48.org/gd1.3/Makefile.am rrdtool-1.0.48/gd1.3/Makefile.am
---- rrdtool-1.0.48.org/gd1.3/Makefile.am       2004-05-10 21:54:23.833875048 +0200
-+++ rrdtool-1.0.48/gd1.3/Makefile.am   2004-05-10 21:54:50.509819688 +0200
-@@ -3,15 +3,14 @@
- noinst_LTLIBRARIES  = librrd_gd.la
- 
- librrd_gd_la_SOURCES = \
--      gd.c            gdfontg.c       gdfontl.c       gdfontmb.c      \
--      gdfonts.c       gdfontt.c       gdlucidab10.c   gdlucidab12.c   \
-+      gdlucidab10.c   gdlucidab12.c   \
-       gdlucidab14.c   gdlucidan10.c   gdlucidan12.c   gdlucidan14.c \
-       gdlucidan10l2.c  gdlucidab12l2.c \
--      gd.h           gdfontmb.h     gdlucidab10.h  gdlucidan10.h \
--      gdfontg.h      gdfonts.h      gdlucidab12.h  gdlucidan12.h \
--      gdfontl.h      gdfontt.h      gdlucidab14.h  gdlucidan14.h \
-+      gdlucidab10.h  gdlucidan10.h \
-+      gdlucidab12.h  gdlucidan12.h \
-+      gdlucidab14.h  gdlucidan14.h \
-       gdlucidan10l2.h  gdlucidab12l2.h
--
-+librrd_gd_la_LIBADD = -lgd
- 
- EXTRA_DIST= README.rrdtool demoin.gif gd.dsp gd.dsw index.html readme.txt \
-       webgif.c mtables.c mathmake.c giftogd.c gd.vcproj
-diff -urN rrdtool-1.0.48.org/Makefile.am rrdtool-1.0.48/Makefile.am
---- rrdtool-1.0.48.org/Makefile.am     2004-05-10 21:54:23.926860912 +0200
-+++ rrdtool-1.0.48/Makefile.am 2004-05-10 21:54:50.511819384 +0200
-@@ -3,20 +3,11 @@
- 
- # allow to use shipped code with rrdtool or local OS's version
- # see configure.in or do a ./configure --help
--if USE_INSTALLED_ZLIB
- SUBDIRS_1 =
--else
--SUBDIRS_1 = zlib-1.1.4
--endif
--
--if USE_INSTALLED_LIBPNG
- SUBDIRS_2 =
--else
--SUBDIRS_2 = libpng-1.0.9
--endif
- 
- # build the following subdirectories
--SUBDIRS = cgilib-0.4 gd1.3 $(SUBDIRS_1) $(SUBDIRS_2) \
-+SUBDIRS = \
-           src doc examples contrib tcl
- 
- # the following files are not mentioned in any other Makefile
-diff -urN rrdtool-1.0.48.org/perl-shared/Makefile.PL.in rrdtool-1.0.48/perl-shared/Makefile.PL.in
---- rrdtool-1.0.48.org/perl-shared/Makefile.PL.in      2004-05-10 21:54:23.814877936 +0200
-+++ rrdtool-1.0.48/perl-shared/Makefile.PL.in  2004-05-10 21:54:50.512819232 +0200
-@@ -4,7 +4,7 @@
- # the contents of the Makefile that is written.
- 
- # Specify the location of the archive containing PIC compiled object files.
--my $librrd = "-L../src/.libs/ @RRD_PRIVATE_LINK@"  ;
-+my $librrd = "-L../src/.libs/ -lrrd"  ;
- 
- WriteMakefile(
-     'NAME'         => 'RRDs',
-@@ -14,7 +14,6 @@
-     'CCFLAGS'      => '-DHAVE_CONFIG_H',
-     # where to look for the necessary libraries 
-     # Perl will figure out which one is valid
--    'depend'     => {'RRDs.c' => "@top_srcdir@/src/.libs/librrd_private.a"},
-     'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
-     'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' }
- );
-diff -urN rrdtool-1.0.48.org/src/Makefile.am rrdtool-1.0.48/src/Makefile.am
---- rrdtool-1.0.48.org/src/Makefile.am 2004-05-10 21:54:23.886866992 +0200
-+++ rrdtool-1.0.48/src/Makefile.am     2004-05-10 21:55:10.680753240 +0200
-@@ -34,7 +34,7 @@
- 
- 
- 
--AM_CPPFLAGS = -I$(CGI_INC_DIR) -I$(GD_INC_DIR) $(PNG_INC) $(ZLIB_INC)
-+AM_CPPFLAGS = -I$(CGI_INC_DIR) -I$(GD_INC_DIR)
- 
- #COMPILE   = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
- #LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
-@@ -73,10 +73,9 @@
- # files.
- 
- RRD_LIBS =                            \
--      $(CGI_LIB_DIR)/librrd_cgi.la    \
--      $(GD_LIB_DIR)/librrd_gd.la      \
--      $(PNG_LIB)                      \
--      $(ZLIB_LIB)
-+      -lcgic \
-+      -lgd \
-+      -lpng -lz
- 
- lib_LTLIBRARIES           = librrd.la
- noinst_LTLIBRARIES        = librrd_private.la
-diff -urN rrdtool-1.0.48.org/src/rrd_graph.c rrdtool-1.0.48/src/rrd_graph.c
---- rrdtool-1.0.48.org/src/rrd_graph.c 2004-05-10 21:54:23.890866384 +0200
-+++ rrdtool-1.0.48/src/rrd_graph.c     2004-05-10 22:14:26.099102952 +0200
-@@ -14,13 +14,8 @@
- #include "rrd_graph.h"
- #include <gd.h>
- 
--#ifdef LATIN2_ENABLE
--#include <gdlucidan10l2.h>
--#include <gdlucidab12l2.h>
--#else
--#include <gdlucidan10.h>
--#include <gdlucidab12.h>
--#endif
-+#include <gdfonts.h>
-+#include <gdfontl.h>
- 
- #include <sys/stat.h>
- #ifdef WIN32
-@@ -36,13 +31,8 @@
- #include <locale.h>
- #endif
- 
--#ifdef LATIN2_ENABLE
--#define SmallFont gdLucidaNormal10l2
--#define LargeFont gdLucidaBold12l2
--#else    
--#define SmallFont gdLucidaNormal10
--#define LargeFont gdLucidaBold12
--#endif
-+#define SmallFont gdFontSmall
-+#define LargeFont gdFontLarge
- 
- xlab_t xlab[] = {
-     {0,        TMT_SECOND,30, TMT_MINUTE,5,  TMT_MINUTE,5,         0,"%H:%M"},
-diff -urN rrdtool-1.0.48.org/tcl/Makefile.am rrdtool-1.0.48/tcl/Makefile.am
---- rrdtool-1.0.48.org/tcl/Makefile.am 2004-05-10 21:54:23.925861064 +0200
-+++ rrdtool-1.0.48/tcl/Makefile.am     2004-05-10 21:54:50.519818168 +0200
-@@ -22,7 +22,7 @@
- if COMP_TCL
- 
- $(TCL_LIB_FILE): tclrrd.o
--      $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
-+      $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd -lm -ltcl
- 
- tclrrd.o: tclrrd.c
-       $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) $(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\"
RRDtool - round robin database
This page took 0.067416 seconds and 4 git commands to generate.