From pi@fa9.opsec.eu  Sat May 18 19:45:33 2013
Return-Path: <pi@fa9.opsec.eu>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 6BE0753B
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 18 May 2013 19:45:33 +0000 (UTC)
	(envelope-from pi@fa9.opsec.eu)
Received: from fa9.opsec.eu (zfs.opsec.eu [IPv6:2001:14f8:200:4::18])
	by mx1.freebsd.org (Postfix) with ESMTP id F2488FC8
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 18 May 2013 19:45:32 +0000 (UTC)
Received: from pi by fa9.opsec.eu with local (Exim 4.80.1 (FreeBSD))
	(envelope-from <pi@fa9.opsec.eu>)
	id 1Udn4O-000LuA-9F; Sat, 18 May 2013 21:45:32 +0200
Message-Id: <E1Udn4O-000LuA-9F@fa9.opsec.eu>
Date: Sat, 18 May 2013 21:45:32 +0200
From: Kurt Jaeger <fbsd-ports@opsec.eu>
Reply-To: Kurt Jaeger <fbsd-ports@opsec.eu>
To: FreeBSD-gnats-submit@freebsd.org
Cc: lemke@lemke-it.com
Subject: [patch update] databases/p5-DBD-cego 1.2.0 -> 1.2.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         178755
>Category:       ports
>Synopsis:       [patch update] databases/p5-DBD-cego 1.2.0 -> 1.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    culot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 18 19:50:00 UTC 2013
>Closed-Date:    Sat Jul 20 22:15:32 UTC 2013
>Last-Modified:  Sat Jul 20 22:15:32 UTC 2013
>Originator:     Kurt Jaeger
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
-
>Environment:
System: FreeBSD fa9.opsec.eu 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


>Description:
	Adaptions for renamend lfcbase class

	files/patch-CegoXS.h no longer necessary

>How-To-Repeat:
	-
>Fix:


diff -r -u -N databases/p5-DBD-cego/Makefile /usr/home/pi/myp/databases/p5-DBD-cego/Makefile
--- databases/p5-DBD-cego/Makefile	2013-05-05 23:25:17.000000000 +0200
+++ /usr/home/pi/myp/databases/p5-DBD-cego/Makefile	2013-05-18 21:22:23.000000000 +0200
@@ -2,7 +2,7 @@
 # $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.2
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://www.lemke-it.com/
 PKGNAMEPREFIX=	p5-
@@ -10,7 +10,7 @@
 MAINTAINER=	fbsd-ports@opsec.eu
 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
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-05-18 21:22:39.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.2.tar.gz) = 60e7cb46b76b48c82af45cf6a455f2155765e29cbd94d248fafed509c30429df
+SIZE (DBD-cego-1.2.2.tar.gz) = 16437
diff -r -u -N databases/p5-DBD-cego/files/patch-CegoXS.h /usr/home/pi/myp/databases/p5-DBD-cego/files/patch-CegoXS.h
--- databases/p5-DBD-cego/files/patch-CegoXS.h	2013-01-01 18:29:55.000000000 +0100
+++ /usr/home/pi/myp/databases/p5-DBD-cego/files/patch-CegoXS.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
---- CegoXS.h.orig	2010-11-21 09:25:27.000000000 +0800
-+++ CegoXS.h	2011-05-29 21:11:15.361979766 +0800
-@@ -9,4 +9,16 @@
- #include "dbdimp.h"
- #include <dbd_xsh.h>
- 
-+#ifndef sv_yes
-+#define sv_yes PL_sv_yes
-+#endif
-+
-+#ifndef sv_no
-+#define sv_no PL_sv_no
-+#endif
-+
-+#ifndef dirty
-+#define dirty PL_dirty
-+#endif
-+
- #endif
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-05-18 21:40:22.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-05-16 21:59:25.000000000 +0200
++++ Makefile.PL	2013-05-18 21:39:39.000000000 +0200
+@@ -25,30 +25,19 @@
  Getopt::Long::GetOptions(
      $opt,
      "help",
@@ -16,9 +16,7 @@
 -
 -use vars qw($loadlibs);
 -$loadlibs= "-L" . $opt->{'prefix'} . " -llfc";
-+# use vars qw($loadlibs);
-+# $loadlibs= "-L/usr/local/lib";
- 
+-
  WriteMakefile(
      'NAME'          => 'DBD::Cego',
      'VERSION_FROM'  => 'Cego.pm',
@@ -27,18 +25,18 @@
 -    '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",
+-	      . $opt->{'prefix'} . "/lib/liblfcbase.a",
 -    "CC" => "g++",
 -    "LD" => "g++",
 +    '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",
++    'MYEXTLIB'      => '-lcego -llfcxml -llfcbase',
++    "CC"            => "g++",
++    "CCFLAGS"	    => '-O2 -pipe -fno-strict-aliasing -fpermissive',
++    "LD"            => "g++ -L/usr/local/lib",
      "XSPROTOARG" => "-noprototypes",
      'OPTIMIZE'      => '-O6 -DNDEBUG=1',
      'XSOPT'             => '-C++',
-@@ -59,12 +51,6 @@
+@@ -59,12 +48,6 @@
  sub Usage {
    print STDERR <<"USAGE";
  Usage: perl $0 [options]

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perl 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat May 18 19:50:08 UTC 2013 
Responsible-Changed-Why:  
perl@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178755 
Responsible-Changed-From-To: perl->culot 
Responsible-Changed-By: culot 
Responsible-Changed-When: Sat May 18 19:56:23 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178755 
Responsible-Changed-From-To: culot->zeising 
Responsible-Changed-By: zeising 
Responsible-Changed-When: Thu May 23 09:38:32 UTC 2013 
Responsible-Changed-Why:  
Grab from culot, since he doesn't have time to work on this.  OKd by: 
culot 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178755 

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org, fbsd-ports@opsec.eu
Cc:  
Subject: Re: ports/178755: [patch update] databases/p5-DBD-cego 1.2.0 -&gt;
 1.2.2
Date: Thu, 23 May 2013 12:17:46 +0200

 This is a multi-part message in MIME format.
 --------------000600030308040409030504
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Can you please look through this again.  I get the following error when
 compiling with clang (on FreeBSD 10-current):
 
 c++ -c  -I/usr/local/lib/perl5/site_perl/5.14.2/mach/auto/DBI
 -I/usr/local/include  -O2 -pipe -fno-strict-aliasing -fpermissive -O6
 -DNDEBUG=1    -DVERSION=\"1.2.2\"  -DXS_VERSION=\"1.2.2\" -DPIC -fPIC
 "-I/usr/local/lib/perl5/5.14.2/mach/CORE"   Cego.c
 c++: warning: treating 'c' input as 'c++' when in C++ mode, this
 behavior is deprecated
 c++: warning: argument unused during compilation: '-fpermissive'
 error: invalid value '6' in '-O6'
 *** [Cego.o] Error code 1
 
 Stop in /wrkdirs/usr/ports/databases/p5-DBD-cego/work/DBD-cego-1.2.2.
 *** [do-build] Error code 1
 
 Stop in /usr/ports/databases/p5-DBD-cego.
 
 
 It seems like gcc accepts -O6, but clang doesn't.  Are you ok with
 changing it to -O3 instead?  See attached patch for Makefile.Pl.
 Regards!
 -- 
 Niclas Zeising
 
 --------------000600030308040409030504
 Content-Type: text/plain; charset=us-ascii;
  name="patch-makefile-pl"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-makefile-pl"
 
 --- Makefile.PL.orig	2013-05-16 21:59:25.000000000 +0200
 +++ Makefile.PL	2013-05-23 12:16:02.142394388 +0200
 @@ -25,32 +25,21 @@
  Getopt::Long::GetOptions(
      $opt,
      "help",
 -    "prefix=s",
      "verbose",
      ) || die Usage();
  
 -if (! exists $opt->{'prefix'}) 
 -{
 -  print "Missing prefix, use option --prefix\n"; 
 -  die Usage();
 -}
 -
 -use vars qw($loadlibs);
 -$loadlibs= "-L" . $opt->{'prefix'} . " -llfc";
 -
  WriteMakefile(
      'NAME'          => 'DBD::Cego',
      'VERSION_FROM'  => 'Cego.pm',
      'PREREQ_PM'     => {DBI => 1.03},
      '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/liblfcbase.a",
 -    "CC" => "g++",
 -    "LD" => "g++",
 +    'INC'           => '-I$(DBI_INSTARCH_DIR) -I/usr/local/include',
 +    'MYEXTLIB'      => '-lcego -llfcxml -llfcbase',
 +    "CC"            => "g++",
 +    "CCFLAGS"	    => '-O2 -pipe -fno-strict-aliasing -fpermissive',
 +    "LD"            => "g++ -L/usr/local/lib",
      "XSPROTOARG" => "-noprototypes",
 -    'OPTIMIZE'      => '-O6 -DNDEBUG=1',
 +    'OPTIMIZE'      => '-O3 -DNDEBUG=1',
      'XSOPT'             => '-C++',
      'TYPEMAPS'          => ['perlobject.map' ],
      'clean'         => { FILES => 'config.h' },
 @@ -59,12 +48,6 @@
  sub Usage {
    print STDERR <<"USAGE";
  Usage: perl $0 [options]
 -
 -Possible options are:
 -
 -  --prefix=<prefix path>       Use <prefix> for setting up the appropriate prefix path
 -                               to find cego libs and includes
 -
  USAGE
    exit 1;
  }
 
 --------------000600030308040409030504--

From: Kurt Jaeger <pi@opsec.eu>
To: Niclas Zeising <zeising@freebsd.org>
Cc: bug-followup@FreeBSD.org, fbsd-ports@opsec.eu, lemke@lemke-it.com
Subject: Re: ports/178755: [patch update] databases/p5-DBD-cego 1.2.0 -&gt;
 1.2.2
Date: Thu, 23 May 2013 12:27:22 +0200

 Hi!
 
 > Can you please look through this again.  I get the following error when
 > compiling with clang (on FreeBSD 10-current):
 > 
 > c++ -c  -I/usr/local/lib/perl5/site_perl/5.14.2/mach/auto/DBI
 > -I/usr/local/include  -O2 -pipe -fno-strict-aliasing -fpermissive -O6
 > -DNDEBUG=1    -DVERSION=\"1.2.2\"  -DXS_VERSION=\"1.2.2\" -DPIC -fPIC
 > "-I/usr/local/lib/perl5/5.14.2/mach/CORE"   Cego.c
 > c++: warning: treating 'c' input as 'c++' when in C++ mode, this
 > behavior is deprecated
 > c++: warning: argument unused during compilation: '-fpermissive'
 > error: invalid value '6' in '-O6'
 > *** [Cego.o] Error code 1
 > 
 > Stop in /wrkdirs/usr/ports/databases/p5-DBD-cego/work/DBD-cego-1.2.2.
 > *** [do-build] Error code 1
 > 
 > Stop in /usr/ports/databases/p5-DBD-cego.
 > 
 > 
 > It seems like gcc accepts -O6, but clang doesn't.  Are you ok with
 > changing it to -O3 instead?
 
 Yes, change it.
 
 
 -- 
 pi@opsec.eu            +49 171 3101372                         7 years to go !

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org, fbsd-ports@opsec.eu
Cc:  
Subject: Re: ports/178755: [patch update] databases/p5-DBD-cego 1.2.0 -&gt;
 1.2.2
Date: Thu, 23 May 2013 12:27:04 +0200

 On 05/23/13 12:17, Niclas Zeising wrote:
 > Can you please look through this again.  I get the following error when
 > compiling with clang (on FreeBSD 10-current):
 > 
 > c++ -c  -I/usr/local/lib/perl5/site_perl/5.14.2/mach/auto/DBI
 > -I/usr/local/include  -O2 -pipe -fno-strict-aliasing -fpermissive -O6
 > -DNDEBUG=1    -DVERSION=\"1.2.2\"  -DXS_VERSION=\"1.2.2\" -DPIC -fPIC
 > "-I/usr/local/lib/perl5/5.14.2/mach/CORE"   Cego.c
 > c++: warning: treating 'c' input as 'c++' when in C++ mode, this
 > behavior is deprecated
 > c++: warning: argument unused during compilation: '-fpermissive'
 > error: invalid value '6' in '-O6'
 > *** [Cego.o] Error code 1
 > 
 > Stop in /wrkdirs/usr/ports/databases/p5-DBD-cego/work/DBD-cego-1.2.2.
 > *** [do-build] Error code 1
 > 
 > Stop in /usr/ports/databases/p5-DBD-cego.
 > 
 > 
 > It seems like gcc accepts -O6, but clang doesn't.  Are you ok with
 > changing it to -O3 instead?  See attached patch for Makefile.Pl.
 > Regards!
 > 
 
 After a closer look, it seems like it doesn't build with clang at all.
 I'll look into it, but it might be a good idea to add USE_GCC=any for
 the time being, to force the use of gcc.
 Regards!
 -- 
 Niclas Zeising

From: Kurt Jaeger <pi@opsec.eu>
To: Niclas Zeising <zeising@freebsd.org>
Cc: bug-followup@FreeBSD.org, fbsd-ports@opsec.eu
Subject: Re: ports/178755: [patch update] databases/p5-DBD-cego 1.2.0 -&gt;
 1.2.2
Date: Sun, 26 May 2013 19:51:55 +0200

 Hi!
 
 > After a closer look, it seems like it doesn't build with clang at all.
 
 Please have a look at
 
   https://rt.cpan.org/Ticket/Display.html?id=84285
 
 The root cause of the problem seems to be in DBI:
 
 It's /usr/local/lib/perl5/site_perl/5.16.2/mach/auto/DBI/Driver.xst
 which is used to generate Cego.xsi. And the bug is in Driver.xst already.
 
 --- Driver.xst.orig	2013-05-26 19:35:26.000000000 +0200
 +++ Driver.xst	2013-05-26 19:43:25.000000000 +0200
 @@ -93,8 +93,22 @@
      D_imp_dbh(dbh);
  #if !defined(dbd_db_login6_sv)
      STRLEN lna;
 -    char *u = (SvOK(username)) ? SvPV(username,lna) : "";
 -    char *p = (SvOK(password)) ? SvPV(password,lna) : "";
 +    char *u;
 +    char *p;
 +    if ( SvOK(username) ) {
 +	u = SvPV(username,lna);
 +    }
 +    else {
 +	sv_setpv(username, "");
 +	u = SvPV(username,lna);
 +    }
 +    if ( SvOK(password) ) {
 +	p = SvPV(password,lna);
 +    }
 +    else {
 +	sv_setpv(password, "");
 +	p = SvPV(password,lna);
 +    }
  #endif
  #ifdef dbd_db_login6_sv
      ST(0) = dbd_db_login6_sv(dbh, imp_dbh, dbname, username, password, attribs) ? &PL_sv_yes : &PL_sv_no;
 @@ -301,7 +315,10 @@
      /* still exists. This possibly needs some more thought.             */
      if (DBIc_ACTIVE_KIDS(imp_dbh) && DBIc_WARN(imp_dbh) && !PL_dirty) {
          STRLEN lna;
 -        char *plural = (DBIc_ACTIVE_KIDS(imp_dbh)==1) ? "" : "s";
 +	char myp[2];
 +	char* plural = myp;
 +	myp[1] = 0;
 +        myp[0] = (DBIc_ACTIVE_KIDS(imp_dbh)==1) ? 0 : 's';
          warn("%s->disconnect invalidates %d active statement handle%s %s",
              SvPV(dbh,lna), (int)DBIc_ACTIVE_KIDS(imp_dbh), plural,
              "(either destroy statement handles or call finish on them before disconnecting)");
 
 -- 
 pi@opsec.eu            +49 171 3101372                         7 years to go !
Responsible-Changed-From-To: zeising->culot 
Responsible-Changed-By: culot 
Responsible-Changed-When: Wed Jun 5 06:25:53 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178755 
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Sat Jul 20 22:15:08 UTC 2013 
State-Changed-Why:  
Superseded by ports/179254. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178755 
>Unformatted:
