Date: Thu, 11 Sep 2014 20:57:56 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367980 - in head/databases/rrdtool10: . files Message-ID: <201409112057.s8BKvuMA051339@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Sep 11 20:57:56 2014 New Revision: 367980 URL: http://svnweb.freebsd.org/changeset/ports/367980 QAT: https://qat.redports.org/buildarchive/r367980/ Log: - Remove USE_AUTOTOOLS=libtool - Add USE_AUTOTOOLS=libtoolize (and others) because the configure script hasn't been generated with the same version of libtool as the bundled ltmain.sh script - Remove -fPIC and --with-pic Added: head/databases/rrdtool10/files/patch-Makefile.am - copied, changed from r367910, head/databases/rrdtool10/files/patch-Makefile.in head/databases/rrdtool10/files/patch-configure.ac - copied, changed from r367910, head/databases/rrdtool10/files/patch-configure head/databases/rrdtool10/files/patch-contrib__Makefile.am - copied, changed from r367910, head/databases/rrdtool10/files/patch-contrib__Makefile.in head/databases/rrdtool10/files/patch-contrib__trytime__Makefile.am - copied, changed from r367910, head/databases/rrdtool10/files/patch-contrib__trytime__Makefile.in head/databases/rrdtool10/files/patch-doc__Makefile.am - copied, changed from r367910, head/databases/rrdtool10/files/patch-doc__Makefile.in head/databases/rrdtool10/files/patch-examples__Makefile.am - copied, changed from r367910, head/databases/rrdtool10/files/patch-examples__Makefile.in head/databases/rrdtool10/files/patch-src-Makefile.am (contents, props changed) Deleted: head/databases/rrdtool10/files/patch-Makefile.in head/databases/rrdtool10/files/patch-configure head/databases/rrdtool10/files/patch-contrib__Makefile.in head/databases/rrdtool10/files/patch-contrib__trytime__Makefile.in head/databases/rrdtool10/files/patch-doc__Makefile.in head/databases/rrdtool10/files/patch-examples__Makefile.in head/databases/rrdtool10/files/patch-perl-shared__Makefile.PL.in Modified: head/databases/rrdtool10/Makefile head/databases/rrdtool10/pkg-plist Modified: head/databases/rrdtool10/Makefile ============================================================================== --- head/databases/rrdtool10/Makefile Thu Sep 11 20:54:14 2014 (r367979) +++ head/databases/rrdtool10/Makefile Thu Sep 11 20:57:56 2014 (r367980) @@ -3,7 +3,7 @@ PORTNAME= rrdtool PORTVERSION= 1.0.50 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/ PKGNAMESUFFIX= 10 @@ -16,15 +16,16 @@ MAKE_ENV= PERL=${PERL} CONFLICTS= rrdtool12-* rrdtool-1.* USES= pkgconfig perl5 libtool +USE_AUTOTOOLS= libtoolize aclocal autoconf autoheader automake +AUTOMAKE_ARGS= -a -c -f USE_PERL5= build run fixpacklist -USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-shared --enable-local-zlib \ - --program-transform-name='' +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-shared --enable-local-zlib CONFIGURE_ENV= PERL=${PERL} PERL_MAKE_OPTIONS="PREFIX=${PREFIX}" -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC -LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-ffast-math} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip @@ -33,22 +34,6 @@ LATIN2_DESC= ISO-8859-2 fonts support LATIN2_CONFIGURE_ENABLE= latin2 -.include <bsd.port.options.mk> - -.if ${ARCH} == "amd64" -CONFIGURE_ARGS+=--with-pic -.endif - -.if ${ARCH} == "ia64" -BROKEN= Does not build on ia64 -.endif - -post-install: -.if !defined(BATCH) - @${ECHO_MSG} "" - @${ECHO_MSG} "############################################################################" - @${ECHO_MSG} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code #" - @${ECHO_MSG} "############################################################################" -.endif +BROKEN_ia64= Does not build on ia64 .include <bsd.port.mk> Copied and modified: head/databases/rrdtool10/files/patch-Makefile.am (from r367910, head/databases/rrdtool10/files/patch-Makefile.in) ============================================================================== --- head/databases/rrdtool10/files/patch-Makefile.in Thu Sep 11 08:40:58 2014 (r367910, copy source) +++ head/databases/rrdtool10/files/patch-Makefile.am Thu Sep 11 20:57:56 2014 (r367980) @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sun Aug 8 12:40:15 2004 -+++ Makefile.in Wed Mar 16 21:26:50 2005 -@@ -701,21 +701,7 @@ +--- Makefile.am.orig 2004-08-04 15:20:32 UTC ++++ Makefile.am +@@ -33,21 +33,7 @@ # lets schedule the perl stuff for installation # the special call to install-sh is because the -d switch is not portable # mac os X has its perl module in bundles so it seems @@ -21,9 +21,9 @@ - fi +install-data-local: site-perl-inst - # rules for building the perl module -@@ -795,8 +781,8 @@ + # use relaxed rules when building dists +@@ -137,8 +123,8 @@ site-perl-inst: site-perl-install site-perl-install: all perl-piped/Makefile perl-shared/Makefile Copied and modified: head/databases/rrdtool10/files/patch-configure.ac (from r367910, head/databases/rrdtool10/files/patch-configure) ============================================================================== --- head/databases/rrdtool10/files/patch-configure Thu Sep 11 08:40:58 2014 (r367910, copy source) +++ head/databases/rrdtool10/files/patch-configure.ac Thu Sep 11 20:57:56 2014 (r367980) @@ -1,20 +1,25 @@ ---- ./configure.orig 2014-07-23 22:31:53.000000000 +0200 -+++ ./configure 2014-07-23 22:32:14.000000000 +0200 -@@ -24873,17 +24873,12 @@ - echo "${ECHO_T}and out again" >&6 +--- configure.ac.orig 2005-04-25 20:46:33 UTC ++++ configure.ac +@@ -393,22 +393,6 @@ + chmod +x examples/*.cgi examples/*.pl contrib/*/*.pl]],[[]]) + AC_OUTPUT - echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6 +-AC_MSG_CHECKING(in) +-AC_MSG_RESULT(and out again) +- +-echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6 -sleep 1 - echo $ECHO_N ".$ac_c" 1>&6 +-echo $ECHO_N ".$ac_c" 1>&6 -sleep 2 - echo $ECHO_N ".$ac_c" 1>&6 +-echo $ECHO_N ".$ac_c" 1>&6 -sleep 1 - echo $ECHO_N ".$ac_c" 1>&6 +-echo $ECHO_N ".$ac_c" 1>&6 -sleep 3 - echo $ECHO_N ".$ac_c" 1>&6 - echo $ECHO_N ".$ac_c" 1>&6 - echo $ECHO_N ".$ac_c" 1>&6 +-echo $ECHO_N ".$ac_c" 1>&6 +-echo $ECHO_N ".$ac_c" 1>&6 +-echo $ECHO_N ".$ac_c" 1>&6 -sleep 2 - echo "$as_me:$LINENO: result: just kidding ;-)" >&5 - echo "${ECHO_T} just kidding ;-)" >&6 +-AC_MSG_RESULT([ just kidding ;-)]) echo + echo "----------------------------------------------------------------" + echo "Config is DONE!" Copied and modified: head/databases/rrdtool10/files/patch-contrib__Makefile.am (from r367910, head/databases/rrdtool10/files/patch-contrib__Makefile.in) ============================================================================== --- head/databases/rrdtool10/files/patch-contrib__Makefile.in Thu Sep 11 08:40:58 2014 (r367910, copy source) +++ head/databases/rrdtool10/files/patch-contrib__Makefile.am Thu Sep 11 20:57:56 2014 (r367980) @@ -1,11 +1,10 @@ ---- ./contrib/Makefile.in.orig 2005-04-25 22:47:51.000000000 +0200 -+++ ./contrib/Makefile.in 2014-08-31 16:52:48.000000000 +0200 -@@ -195,7 +195,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ +--- contrib/Makefile.am.orig 2002-02-26 10:21:19 UTC ++++ contrib/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + SUBDIRS = trytime -contribdir = $(prefix)/contrib +contribdir = $(prefix)/share/examples/rrdtool contrib_DATA = README - EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4 - all: all-recursive + EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4 Copied and modified: head/databases/rrdtool10/files/patch-contrib__trytime__Makefile.am (from r367910, head/databases/rrdtool10/files/patch-contrib__trytime__Makefile.in) ============================================================================== --- head/databases/rrdtool10/files/patch-contrib__trytime__Makefile.in Thu Sep 11 08:40:58 2014 (r367910, copy source) +++ head/databases/rrdtool10/files/patch-contrib__trytime__Makefile.am Thu Sep 11 20:57:56 2014 (r367980) @@ -1,11 +1,11 @@ ---- ./contrib/trytime/Makefile.in.orig 2005-04-25 22:47:51.000000000 +0200 -+++ ./contrib/trytime/Makefile.in 2014-08-31 16:52:48.000000000 +0200 -@@ -209,7 +209,7 @@ - target_vendor = @target_vendor@ +--- contrib/trytime/Makefile.am.orig 2003-11-30 22:00:24 UTC ++++ contrib/trytime/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3 EXTRA_DIST = trytime.c -contribdir = $(prefix)/contrib/trytime +contribdir = $(prefix)/share/examples/rrdtool/trytime contrib_DATA = README trytime.c - trytime_SOURCES = trytime.c - trytime_LDADD = ../../src/librrd.la + bin_PROGRAMS = trytime + trytime_SOURCES = trytime.c Copied and modified: head/databases/rrdtool10/files/patch-doc__Makefile.am (from r367910, head/databases/rrdtool10/files/patch-doc__Makefile.in) ============================================================================== --- head/databases/rrdtool10/files/patch-doc__Makefile.in Thu Sep 11 08:40:58 2014 (r367910, copy source) +++ head/databases/rrdtool10/files/patch-doc__Makefile.am Thu Sep 11 20:57:56 2014 (r367980) @@ -1,11 +1,11 @@ ---- ./doc/Makefile.in.orig 2005-04-25 23:02:47.000000000 +0200 -+++ ./doc/Makefile.in 2014-08-31 16:52:48.000000000 +0200 -@@ -210,9 +210,9 @@ - EXTRA_DIST = $(POD) $(HTML) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd +--- doc/Makefile.am.orig 2005-04-25 21:02:27 UTC ++++ doc/Makefile.am +@@ -25,9 +25,9 @@ + EXTRA_DIST= $(POD) $(HTML) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd # some install rules -idocdir = $(prefix)/doc -+idocdir = $(prefix)/share/doc/rrdtool/ ++idocdir = $(prefix)/share/doc/rrdtool idoc_DATA = $(POD) $(TXT) -ihtmldir = $(prefix)/html +ihtmldir = $(prefix)/share/doc/rrdtool/html Copied and modified: head/databases/rrdtool10/files/patch-examples__Makefile.am (from r367910, head/databases/rrdtool10/files/patch-examples__Makefile.in) ============================================================================== --- head/databases/rrdtool10/files/patch-examples__Makefile.in Thu Sep 11 08:40:58 2014 (r367910, copy source) +++ head/databases/rrdtool10/files/patch-examples__Makefile.am Thu Sep 11 20:57:56 2014 (r367980) @@ -1,11 +1,9 @@ ---- examples/Makefile.in.orig Sat Jul 23 13:27:58 2005 -+++ examples/Makefile.in Sat Jul 23 13:29:30 2005 -@@ -188,7 +188,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in +--- examples/Makefile.am.orig 2002-02-26 10:21:25 UTC ++++ examples/Makefile.am +@@ -6,5 +6,5 @@ + + EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in + -examplesdir = $(prefix)/examples +examplesdir = $(prefix)/share/examples/rrdtool examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl - all: all-am - Added: head/databases/rrdtool10/files/patch-src-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rrdtool10/files/patch-src-Makefile.am Thu Sep 11 20:57:56 2014 (r367980) @@ -0,0 +1,10 @@ +--- src/Makefile.am.orig 2005-03-12 16:59:41 UTC ++++ src/Makefile.am +@@ -91,7 +91,6 @@ librrd_la_LDFLAGS = -version-inf + include_HEADERS = rrd.h + + librrd_private_la_LIBADD = $(RRD_LIBS) +-librrd_private_la_LDFLAGS = -static + + bin_PROGRAMS = rrdcgi rrdtool rrdupdate + Modified: head/databases/rrdtool10/pkg-plist ============================================================================== --- head/databases/rrdtool10/pkg-plist Thu Sep 11 20:54:14 2014 (r367979) +++ head/databases/rrdtool10/pkg-plist Thu Sep 11 20:57:56 2014 (r367980) @@ -6,6 +6,7 @@ include/rrd.h lib/librrd.a lib/librrd.so lib/librrd.so.0 +lib/librrd.so.0.0.0 %%PERL5_MAN3%%/RRDp.3.gz %%PERL5_MAN3%%/RRDs.3.gz %%SITE_PERL%%/RRDp.pm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409112057.s8BKvuMA051339>