From mico@bsd.hu  Sun Jan  7 04:31:15 2001
Return-Path: <mico@bsd.hu>
Received: from fmdb.c3.hu (dial-045.digitel2002.hu [213.163.2.45])
	by hub.freebsd.org (Postfix) with SMTP id 5F5E237B71F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Jan 2001 04:12:55 -0800 (PST)
Received: (qmail 10234 invoked by uid 1004); 6 Jan 2001 19:31:43 -0000
Message-Id: <20010106193143.10233.qmail@fmdb.c3.hu>
Date: 6 Jan 2001 19:31:43 -0000
From: mico@bsd.hu
Reply-To: mico@bsd.hu
To: FreeBSD-gnats-submit@freebsd.org
Subject: databases/mysql++ doesn't install some necessary header files
X-Send-Pr-Version: 3.2

>Number:         24126
>Category:       ports
>Synopsis:       databases/mysql++ doesn't install some necessary header files
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 07 04:40:00 PST 2001
>Closed-Date:    Sun Jan 21 12:27:06 PST 2001
>Last-Modified:  Sun Jan 21 12:27:27 PST 2001
>Originator:     Miklos Niedermayer
>Release:        FreeBSD 4.1.1-RELEASE i386
>Organization:
>Environment:

	

>Description:

	databases/mysql++ doesn't install some header files which are
	needed by some applications to compile.

	The missing files are:
	include/mysql/{defs,define_short,undef_short}

	The patch below fixes the problem, and also updates the port to
	use mysql-3.23 client libraries, which are more stable.
	(I am the maintainer)

>How-To-Repeat:

	Install the port, then try to compile several applications that
	use the library.

>Fix:
	
	Apply the following patches.


diff -uNr mysql++-old/Makefile mysql++/Makefile
--- mysql++-old/Makefile	Wed Aug  2 12:17:09 2000
+++ mysql++/Makefile	Sat Jan  6 20:13:57 2001
@@ -13,7 +13,7 @@
 
 MAINTAINER=	mico@bsd.hu
 
-LIB_DEPENDS=	mysqlclient:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql323-client
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ "
@@ -35,7 +35,7 @@
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/*.cc ${PREFIX}/share/examples/mysql++
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/man-text/* ${PREFIX}/share/doc/mysql++
 	@mkdir -p ${PREFIX}/include/mysql
-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/mysql++ ${WRKDIR}/${DISTNAME}/sqlplusint/*.hh ${PREFIX}/include/mysql
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/{mysql++,defs,undef_short,define_short} ${WRKDIR}/${DISTNAME}/sqlplusint/*.hh ${PREFIX}/include/mysql
 	@${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/mysql++
 
 .include <bsd.port.mk>
diff -uNr mysql++-old/pkg-comment mysql++/pkg-comment
--- mysql++-old/pkg-comment	Fri Jul 21 07:12:24 2000
+++ mysql++/pkg-comment	Sat Jan  6 20:14:18 2001
@@ -1 +1 @@
-Complex C++ API for MySQL (needs mysql-client)
+Complex C++ API for MySQL (needs mysql-client 3.23)
diff -uNr mysql++-old/pkg-plist mysql++/pkg-plist
--- mysql++-old/pkg-plist	Wed Aug  2 01:28:34 2000
+++ mysql++/pkg-plist	Sat Jan  6 20:14:46 2001
@@ -1,4 +1,7 @@
 include/mysql/mysql++
+include/mysql/defs
+include/mysql/define_short
+include/mysql/undef_short
 include/mysql/bad_query.hh
 include/mysql/coldata1.hh
 include/mysql/coldata2.hh


>Release-Note:
>Audit-Trail:

From: FUJISHIMA Satsuki <sf@FreeBSD.org>
To: mico@bsd.hu
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/24126: databases/mysql++ doesn't install some necessary header files
Date: Mon, 22 Jan 2001 02:54:17 +0900

 > -	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/mysql++ ${WRKDIR}/${DISTNAME}/sqlplusint/*.hh ${PREFIX}/include/mysql
 > +	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/{mysql++,defs,undef_short,define_short} ${WRKDIR}/${DISTNAME}/sqlplusint/*.hh ${PREFIX}/include/mysql
 
 This line fails for me. How about change to following?
 
 -	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/mysql++ ${WRKDIR}/${DISTNAME}/sqlplusint/*.hh ${PREFIX}/include/mysql
 +	@(cd ${WRKDIR}/${DISTNAME}/sqlplusint/; \
 +	 ${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
 
 > diff -uNr mysql++-old/pkg-comment mysql++/pkg-comment
 > --- mysql++-old/pkg-comment	Fri Jul 21 07:12:24 2000
 > +++ mysql++/pkg-comment	Sat Jan  6 20:14:18 2001
 > @@ -1 +1 @@
 > -Complex C++ API for MySQL (needs mysql-client)
 > +Complex C++ API for MySQL (needs mysql-client 3.23)
 
 Package name and version number in pkg-comment should be avoided and
 they don't add any information.
 
 --- pkg-comment	2000/07/21 05:12:24	1.2
 +++ pkg-comment	2001/01/21 09:35:42
 @@ -1 +1 @@
 -Complex C++ API for MySQL (needs mysql-client)
 +Complex C++ API for MySQL
 
 Except for these two points it looks OK.
 

From: Miklos Niedermayer <mico@bsd.hu>
To: FUJISHIMA Satsuki <sf@FreeBSD.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/24126: databases/mysql++ doesn't install some necessary header files
Date: Sun, 21 Jan 2001 18:57:42 +0100

 Hello!
 
 ( > FUJISHIMA Satsuki)
 
 > -	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/mysql++ ${WRKDIR}/${DISTNAME}/sqlplusint/*.hh ${PREFIX}/include/mysql
 > +	@(cd ${WRKDIR}/${DISTNAME}/sqlplusint/; \
 > +	 ${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
 
 Seems to be OK.  Please commit it display if you think.
 
 > > -Complex C++ API for MySQL (needs mysql-client)
 > > +Complex C++ API for MySQL (needs mysql-client 3.23)
 > 
 > Package name and version number in pkg-comment should be avoided and
 > they don't add any information.
 > 
 > Except for these two points it looks OK.
 
 Thank you, please commit it then.
 
 -- 
  ______  o _. __
 / / / (_(_(__(_)  @ bsd.hu
 
 
State-Changed-From-To: open->closed 
State-Changed-By: sf 
State-Changed-When: Sun Jan 21 12:27:06 PST 2001 
State-Changed-Why:  
Committed, thanks. 

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