Bug 179254 - [patch update] databases/p5-DBD-cego 1.2.0 -> 1.2.3
Summary: [patch update] databases/p5-DBD-cego 1.2.0 -> 1.2.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Frederic Culot
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-03 10:50 UTC by Kurt Jaeger
Modified: 2013-07-30 15:00 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (4.29 KB, patch)
2013-06-03 10:50 UTC, Kurt Jaeger
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kurt Jaeger 2013-06-03 10:50:00 UTC
	databases/p5-DBD-cego 1.2.0 -> 1.2.3

How-To-Repeat: 	-
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-03 10:50:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->perl

perl@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Frederic Culot freebsd_committer freebsd_triage 2013-06-04 06:08:39 UTC
Responsible Changed
From-To: perl->culot

I'll take it.
Comment 3 Frederic Culot freebsd_committer freebsd_triage 2013-06-05 08:17:02 UTC
Hi Kurt,

thanks for this update (I also took PR 178755 as zeising@ is busy right now).
It seems that there are still issues with the latest version of DBD::cego,
both for FreeBSD 9.1 and 10:

https://redports.org/~culot/20130604134801-5766-124435/p5-DBD-cego-1.2.3.log
https://redports.org/~culot/20130604134801-5766-124436/p5-DBD-cego-1.2.3.log

For 9.1 it seems to be a simple incompatible compilation option but for 10
it looks like that was reported here:

https://rt.cpan.org/Ticket/Display.html?id=84285

and that should have been fixed with PR 177473 is still present. Indeed, I
have a similar error:

./Cego.xsi:96:11: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'

Could you please have a look at it?

Thanks for your help!
Frederic
Comment 4 Kurt Jaeger 2013-07-30 09:37:49 UTC
Hi!

> > > > > https://rt.cpan.org/Ticket/Display.html?id=84285
> > > > 
> > > > should fix DBI, but I do not know how to push harder at upstream 8-)
> > > > or the p5-DBI port 8-}
> > 
> > Tim Bunce has included the patch to Driver.xst and it will be in the
> > next version of DBI.
> > 
> > I'm sorry that it is a mess, but there's no easy way to fix it without
> > the DBI update.
> 
> DBI was updated a few days ago. I submitted 
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=180902
> 
> to update it.
> 
> With that, DBD::cego compiles.

Included is a slightly newer patch which includes the upgraded
DBI requirement.

--------------
diff -r -u -N databases/p5-DBD-cego/Makefile /usr/home/pi/myp/databases/p5-DBD-cego/Makefile
--- databases/p5-DBD-cego/Makefile	2013-07-10 23:25:35.000000000 +0200
+++ /usr/home/pi/myp/databases/p5-DBD-cego/Makefile	2013-07-30 10:34:09.000000000 +0200
@@ -1,21 +1,24 @@
 # Created by: Kurt Jaeger <fbsd-ports@opsec.eu>
-# $FreeBSD: head/databases/p5-DBD-cego/Makefile 322681 2013-07-10 12:25:52Z bapt $
+# $FreeBSD: head/databases/p5-DBD-cego/Makefile 317340 2013-05-04 20:02:52Z bapt $
 
 PORTNAME=	DBD-cego
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.6
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://www.lemke-it.com/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fbsd-ports@opsec.eu
-COMMENT=	Cego DBI driver for Perl 5
+COMMENT=	A Cego DBI driver for Perl 5
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-DBI>=1.61:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=1.61:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.628:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=1.628:${PORTSDIR}/databases/p5-DBI
 LIB_DEPENDS=	cego.1:${PORTSDIR}/databases/cego
-MAKE_JOBS_UNSAFE=	yes
+
+.if defined(.PARSEDIR)
+USE_GMAKE=	yes
+.endif
 
 PERL_CONFIGURE=	yes
 CC:=		${CXX}
diff -r -u -N databases/p5-DBD-cego/distinfo /usr/home/pi/myp/databases/p5-DBD-cego/distinfo
--- databases/p5-DBD-cego/distinfo	2013-01-01 18:29:55.000000000 +0100
+++ /usr/home/pi/myp/databases/p5-DBD-cego/distinfo	2013-07-18 09:32:58.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (DBD-cego-1.2.0.tar.gz) = 37f4cbc997abeb8d089b63ae863e186f38349f04d1045a45c0b414361a7c1436
-SIZE (DBD-cego-1.2.0.tar.gz) = 16433
+SHA256 (DBD-cego-1.2.6.tar.gz) = d944addd62cb3c6bdc853269a7f645f99a7fa255113c7279c81e06313d4b98e9
+SIZE (DBD-cego-1.2.6.tar.gz) = 28192
diff -r -u -N databases/p5-DBD-cego/files/patch-makefile-pl /usr/home/pi/myp/databases/p5-DBD-cego/files/patch-makefile-pl
--- databases/p5-DBD-cego/files/patch-makefile-pl	2013-03-30 23:24:27.000000000 +0100
+++ /usr/home/pi/myp/databases/p5-DBD-cego/files/patch-makefile-pl	2013-07-09 09:48:49.000000000 +0200
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	2010-09-17 10:14:49.000000000 +0200
-+++ Makefile.PL	2013-03-29 14:42:20.000000000 +0100
-@@ -25,30 +25,22 @@
+--- Makefile.PL-orig	2013-07-09 09:44:14.000000000 +0200
++++ Makefile.PL	2013-07-09 09:48:24.000000000 +0200
+@@ -28,33 +28,23 @@
  Getopt::Long::GetOptions(
      $opt,
      "help",
@@ -16,29 +16,33 @@
 -
 -use vars qw($loadlibs);
 -$loadlibs= "-L" . $opt->{'prefix'} . " -llfc";
-+# use vars qw($loadlibs);
-+# $loadlibs= "-L/usr/local/lib";
+ my $so = $Config{so};
  
  WriteMakefile(
      'NAME'          => 'DBD::Cego',
      'VERSION_FROM'  => 'Cego.pm',
-     'PREREQ_PM'     => {DBI => 1.03},
+-    'PREREQ_PM'     => {DBI => 1.03},
++    'PREREQ_PM'     => {DBI => 1.628},
      'OBJECT'        => '$(O_FILES)',
 -    'INC'           => '-I$(DBI_INSTARCH_DIR) -I' . $opt->{'prefix'} . '/include -I' . $opt->{'prefix'} . '/include',
--    'MYEXTLIB'    => $opt->{'prefix'} . "/lib/libcego.a " 
--	      . $opt->{'prefix'} . "/lib/liblfcxml.a " 
--	      . $opt->{'prefix'} . "/lib/liblfc.a",
+-    'MYEXTLIB'    => $opt->{'prefix'} . "/lib/libcego.$so* " 
+-	      . $opt->{'prefix'} . "/lib/liblfcxml.$so* " 
+-	      . $opt->{'prefix'} . "/lib/liblfcbase.$so",
 -    "CC" => "g++",
 -    "LD" => "g++",
+-    "XSPROTOARG" => "-noprototypes",
+-    'OPTIMIZE'      => '-O6 -DNDEBUG=1',
 +    'INC'           => '-I$(DBI_INSTARCH_DIR) -I/usr/local/include',
-+    'MYEXTLIB'      => '-lcego -llfcxml -llfc',
-+    'CC' => 'g++',
-+    'CCFLAGS' => '-O2 -pipe -fno-strict-aliasing -fpermissive',
-+    "LD" => "g++ -L/usr/local/lib",
-     "XSPROTOARG" => "-noprototypes",
-     'OPTIMIZE'      => '-O6 -DNDEBUG=1',
++    'MYEXTLIB'      => '-lcego -llfcxml -llfcbase',
++    'CC'            => 'g++',
++    'CCFLAGS'       => '-O2 -pipe -fno-strict-aliasing -fpermissive',
++    'LD'            => 'g++ -L/usr/local/lib',
++    'XSPROTOARG'    => '-noprototypes',
++    'OPTIMIZE'      => '-O3 -DNDEBUG=1',
      'XSOPT'             => '-C++',
-@@ -59,12 +51,6 @@
+     'TYPEMAPS'          => ['perlobject.map' ],
+     'clean'         => { FILES => 'config.h' },
+@@ -63,12 +53,6 @@
  sub Usage {
    print STDERR <<"USAGE";
  Usage: perl $0 [options]

--------------
-- 
pi@opsec.eu            +49 171 3101372                         7 years to go !
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-07-30 14:50:36 UTC
Author: culot
Date: Tue Jul 30 13:50:28 2013
New Revision: 323968
URL: http://svnweb.freebsd.org/changeset/ports/323968

Log:
  - Update to 1.2.6
  - Update LICENSE (now GPLv3, was GPLv2)
  
  PR:		ports/179254
  Submitted by:	Kurt Jaeger <fbsd-ports@opsec.eu> (maintainer)

Modified:
  head/databases/p5-DBD-cego/Makefile
  head/databases/p5-DBD-cego/distinfo
  head/databases/p5-DBD-cego/files/patch-makefile-pl

Modified: head/databases/p5-DBD-cego/Makefile
==============================================================================
--- head/databases/p5-DBD-cego/Makefile	Tue Jul 30 13:45:39 2013	(r323967)
+++ head/databases/p5-DBD-cego/Makefile	Tue Jul 30 13:50:28 2013	(r323968)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	DBD-cego
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.6
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://www.lemke-it.com/
 PKGNAMEPREFIX=	p5-
@@ -10,12 +10,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fbsd-ports@opsec.eu
 COMMENT=	Cego DBI driver for Perl 5
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-DBI>=1.61:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=1.61:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.628:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=1.628:${PORTSDIR}/databases/p5-DBI
 LIB_DEPENDS=	cego.1:${PORTSDIR}/databases/cego
-MAKE_JOBS_UNSAFE=	yes
+
+.if defined(.PARSEDIR)
+USE_GMAKE=	yes
+.endif
 
 PERL_CONFIGURE=	yes
 CC:=		${CXX}

Modified: head/databases/p5-DBD-cego/distinfo
==============================================================================
--- head/databases/p5-DBD-cego/distinfo	Tue Jul 30 13:45:39 2013	(r323967)
+++ head/databases/p5-DBD-cego/distinfo	Tue Jul 30 13:50:28 2013	(r323968)
@@ -1,2 +1,2 @@
-SHA256 (DBD-cego-1.2.0.tar.gz) = 37f4cbc997abeb8d089b63ae863e186f38349f04d1045a45c0b414361a7c1436
-SIZE (DBD-cego-1.2.0.tar.gz) = 16433
+SHA256 (DBD-cego-1.2.6.tar.gz) = d944addd62cb3c6bdc853269a7f645f99a7fa255113c7279c81e06313d4b98e9
+SIZE (DBD-cego-1.2.6.tar.gz) = 28192

Modified: head/databases/p5-DBD-cego/files/patch-makefile-pl
==============================================================================
--- head/databases/p5-DBD-cego/files/patch-makefile-pl	Tue Jul 30 13:45:39 2013	(r323967)
+++ head/databases/p5-DBD-cego/files/patch-makefile-pl	Tue Jul 30 13:50:28 2013	(r323968)
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	2010-09-17 10:14:49.000000000 +0200
-+++ Makefile.PL	2013-03-29 14:42:20.000000000 +0100
-@@ -25,30 +25,22 @@
+--- Makefile.PL-orig	2013-07-09 09:44:14.000000000 +0200
++++ Makefile.PL	2013-07-09 09:48:24.000000000 +0200
+@@ -28,33 +28,23 @@
  Getopt::Long::GetOptions(
      $opt,
      "help",
@@ -16,29 +16,33 @@
 -
 -use vars qw($loadlibs);
 -$loadlibs= "-L" . $opt->{'prefix'} . " -llfc";
-+# use vars qw($loadlibs);
-+# $loadlibs= "-L/usr/local/lib";
+ my $so = $Config{so};
  
  WriteMakefile(
      'NAME'          => 'DBD::Cego',
      'VERSION_FROM'  => 'Cego.pm',
-     'PREREQ_PM'     => {DBI => 1.03},
+-    'PREREQ_PM'     => {DBI => 1.03},
++    'PREREQ_PM'     => {DBI => 1.628},
      'OBJECT'        => '$(O_FILES)',
 -    'INC'           => '-I$(DBI_INSTARCH_DIR) -I' . $opt->{'prefix'} . '/include -I' . $opt->{'prefix'} . '/include',
--    'MYEXTLIB'    => $opt->{'prefix'} . "/lib/libcego.a " 
--	      . $opt->{'prefix'} . "/lib/liblfcxml.a " 
--	      . $opt->{'prefix'} . "/lib/liblfc.a",
+-    'MYEXTLIB'    => $opt->{'prefix'} . "/lib/libcego.$so* " 
+-	      . $opt->{'prefix'} . "/lib/liblfcxml.$so* " 
+-	      . $opt->{'prefix'} . "/lib/liblfcbase.$so",
 -    "CC" => "g++",
 -    "LD" => "g++",
+-    "XSPROTOARG" => "-noprototypes",
+-    'OPTIMIZE'      => '-O6 -DNDEBUG=1',
 +    'INC'           => '-I$(DBI_INSTARCH_DIR) -I/usr/local/include',
-+    'MYEXTLIB'      => '-lcego -llfcxml -llfc',
-+    'CC' => 'g++',
-+    'CCFLAGS' => '-O2 -pipe -fno-strict-aliasing -fpermissive',
-+    "LD" => "g++ -L/usr/local/lib",
-     "XSPROTOARG" => "-noprototypes",
-     'OPTIMIZE'      => '-O6 -DNDEBUG=1',
++    'MYEXTLIB'      => '-lcego -llfcxml -llfcbase',
++    'CC'            => 'g++',
++    'CCFLAGS'       => '-O2 -pipe -fno-strict-aliasing -fpermissive',
++    'LD'            => 'g++ -L/usr/local/lib',
++    'XSPROTOARG'    => '-noprototypes',
++    'OPTIMIZE'      => '-O3 -DNDEBUG=1',
      'XSOPT'             => '-C++',
-@@ -59,12 +51,6 @@
+     'TYPEMAPS'          => ['perlobject.map' ],
+     'clean'         => { FILES => 'config.h' },
+@@ -63,12 +53,6 @@
  sub Usage {
    print STDERR <<"USAGE";
  Usage: perl $0 [options]
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Frederic Culot freebsd_committer freebsd_triage 2013-07-30 14:50:41 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!