Date: Fri, 28 Apr 2006 00:21:05 +0300 (EEST) From: Sergey Prikhodko <sergey@network-asp.biz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96434: [maintainer-update] databases/mysql++ to 2.1.1 Message-ID: <20060427212105.247B7612F@master.network-asp.biz> Resent-Message-ID: <200604272120.k3RLKINg082069@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96434
>Category: ports
>Synopsis: [maintainer-update] databases/mysql++ to 2.1.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 27 21:20:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Sergey Prikhodko
>Release: FreeBSD 5.4-STABLE i386
>Organization:
Network-ASP Ltd
>Environment:
System: FreeBSD master.network-asp.biz 5.4-STABLE FreeBSD 5.4-STABLE #2: Fri Nov 4 15:03:13 EET 2005 root@master.network-asp.biz:/usr/obj/usr/src/sys/ROUTER i386
>Description:
Port changes:
- update to latest version ( 2.0.7 -> 2.1.1 )
- mysql++ now uses gmake to build library and examples
- removed files: files/*
- added files: files/patch-Makefile.in
Library's changelog can be found at http://tangentsoft.net/mysql++/ChangeLog
>How-To-Repeat:
>Fix:
--- mysql++.patch begins here ---
diff -ruN mysql++.orig/Makefile mysql++/Makefile
--- mysql++.orig/Makefile Thu Feb 23 12:35:07 2006
+++ mysql++/Makefile Thu Apr 27 23:28:34 2006
@@ -6,8 +6,8 @@
#
PORTNAME= mysql++
-PORTVERSION= 2.0.7
-PORTREVISION= 1
+PORTVERSION= 2.1.1
+PORTREVISION= 0
CATEGORIES= databases devel
MASTER_SITES= http://tangentsoft.net/mysql++/releases/
PKGNAMESUFFIX= -mysql${MYSQL_VER}
@@ -15,14 +15,14 @@
MAINTAINER= sergey@network-asp.biz
COMMENT= Complex C++ API for MySQL${MYSQL_VER}
-BUILD_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-
USE_MYSQL= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-mysql=${LOCALBASE} --disable-examples
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
+USE_GMAKE= yes
+
CONFLICTS= ${PORTNAME}*-1.*
.include <bsd.port.pre.mk>
@@ -32,6 +32,8 @@
.endif
post-install:
+ @${RM} -f ${PREFIX}/lib/libmysqlpp.so.3
+ @${LN} -s ${PREFIX}/lib/libmysqlpp.so ${PREFIX}/lib/libmysqlpp.so.3
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/userman/html ${DOCSDIR}/refman/html
@${INSTALL_DATA} ${WRKSRC}/doc/userman/html/* ${DOCSDIR}/userman/html
diff -ruN mysql++.orig/distinfo mysql++/distinfo
--- mysql++.orig/distinfo Thu Dec 15 20:41:40 2005
+++ mysql++/distinfo Thu Apr 27 23:39:59 2006
@@ -1,3 +1,3 @@
-MD5 (mysql++-2.0.7.tar.gz) = e2ea3debacf936b0406012c895412ca4
-SHA256 (mysql++-2.0.7.tar.gz) = 35f3a775da8b736b23d8afeb73ed5af6b1be5f108c57a12f836ac3861118dd12
-SIZE (mysql++-2.0.7.tar.gz) = 1970290
+MD5 (mysql++-2.1.1.tar.gz) = 3a42b3422b37c65f88be9162a969d164
+SHA256 (mysql++-2.1.1.tar.gz) = fcd05ac5b4ef0b7b196636907f0ab14860a4b889bd3b3e4f2acc919e2bb05a53
+SIZE (mysql++-2.1.1.tar.gz) = 1855521
diff -ruN mysql++.orig/files/patch-Makefile.in mysql++/files/patch-Makefile.in
--- mysql++.orig/files/patch-Makefile.in Thu Jan 1 03:00:00 1970
+++ mysql++/files/patch-Makefile.in Thu Apr 27 23:34:27 2006
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Wed Apr 5 07:44:49 2006
++++ Makefile.in Thu Apr 27 23:34:16 2006
+@@ -20,7 +20,7 @@
+
+ ### Targets: ###
+
+-all: lib examples
++all: lib
+
+ install: all
+ (cd lib && $(MAKE) install)
diff -ruN mysql++.orig/files/patch-configure mysql++/files/patch-configure
--- mysql++.orig/files/patch-configure Tue May 10 00:59:39 2005
+++ mysql++/files/patch-configure Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- configure.orig Thu May 5 13:30:26 2005
-+++ configure Mon May 9 21:09:42 2005
-@@ -7793,7 +7793,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool --tag=CXX'
-
- # Prevent multiple expansion
-
diff -ruN mysql++.orig/files/patch-examples__Makefile.base mysql++/files/patch-examples__Makefile.base
--- mysql++.orig/files/patch-examples__Makefile.base Thu Dec 15 20:41:41 2005
+++ mysql++/files/patch-examples__Makefile.base Thu Jan 1 03:00:00 1970
@@ -1,92 +0,0 @@
---- examples/Makefile.base.orig Wed Nov 2 21:03:09 2005
-+++ examples/Makefile.base Sat Dec 10 16:08:30 2005
-@@ -22,15 +22,6 @@
-
- # --- No user-serviceable parts below :)
-
--define mk-objlist
-- $(foreach O,$1,\
-- $(if $(findstring $(BIN_DIR)/,$(O)),$(O),$(BIN_DIR)/$(O)))
--endef
--
--ifndef BIN_DIR
-- BIN_DIR=.
--endif
--
- BINARIES=resetdb$(EXE) simple1$(EXE) simple2$(EXE) simple3$(EXE) \
- usequery$(EXE) fieldinf1$(EXE) dbinfo$(EXE) cgi_image$(EXE) \
- load_file$(EXE) updel$(EXE) multiquery$(EXE) custom1$(EXE) \
-@@ -67,56 +58,55 @@
-
-
- resetdb$(EXE): $(RESETDB_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(RESETDB_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- simple1$(EXE): $(SIMPLE1_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- simple2$(EXE): $(SIMPLE2_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE2_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- simple3$(EXE): $(SIMPLE3_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE3_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- usequery$(EXE): $(USEQUERY_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(USEQUERY_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- custom1$(EXE): $(CUSTOM1_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- custom2$(EXE): $(CUSTOM2_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM2_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- custom3$(EXE): $(CUSTOM3_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM3_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- custom4$(EXE): $(CUSTOM4_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM4_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- custom5$(EXE): $(CUSTOM5_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM5_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- custom6$(EXE): $(CUSTOM6_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM6_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- fieldinf1$(EXE): $(FIELDINF1_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(FIELDINF1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- dbinfo$(EXE): $(DBINFO_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(DBINFO_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- cgi_image$(EXE): $(CGI_IMAGE_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(CGI_IMAGE_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- load_file$(EXE): $(LOAD_FILE_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(LOAD_FILE_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- updel$(EXE): $(UPDEL_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(UPDEL_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- multiquery$(EXE): $(MULTIQUERY_OBJS)
-- $(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
--
-+ $(LD) $(LDFLAGS) $(LDSTARTUP) $(MULTIQUERY_OBJS) $(LDEXEFLAG)$@ $(LIBS)
-
- resetdb.$(OBJ): resetdb.cpp util.h
- simple1.$(OBJ): simple1.cpp util.h
diff -ruN mysql++.orig/files/patch-makemake.sh mysql++/files/patch-makemake.sh
--- mysql++.orig/files/patch-makemake.sh Thu Dec 15 20:41:41 2005
+++ mysql++/files/patch-makemake.sh Thu Jan 1 03:00:00 1970
@@ -1,8 +0,0 @@
---- makemake.sh.orig Wed Nov 2 21:03:09 2005
-+++ makemake.sh Sat Dec 10 15:07:58 2005
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
-
- # Display usage message
- function usage() {
diff -ruN mysql++.orig/pkg-plist mysql++/pkg-plist
--- mysql++.orig/pkg-plist Thu Feb 23 12:35:07 2006
+++ mysql++/pkg-plist Thu Apr 27 23:28:26 2006
@@ -1,5 +1,4 @@
include/mysql++/coldata.h
-include/mysql++/compare.h
include/mysql++/connection.h
include/mysql++/const_string.h
include/mysql++/convert.h
@@ -20,19 +19,20 @@
include/mysql++/platform.h
include/mysql++/qparms.h
include/mysql++/query.h
+include/mysql++/querydef.h
include/mysql++/resiter.h
include/mysql++/result.h
include/mysql++/row.h
include/mysql++/sql_string.h
+include/mysql++/sql_types.h
include/mysql++/stream2string.h
include/mysql++/string_util.h
include/mysql++/tiny_int.h
+include/mysql++/transaction.h
include/mysql++/type_info.h
include/mysql++/vallist.h
-lib/libmysqlpp.a
-lib/libmysqlpp.la
lib/libmysqlpp.so
-lib/libmysqlpp.so.2
+lib/libmysqlpp.so.3
%%PORTDOCS%%%%DOCSDIR%%/mysqlpp-refman.pdf
%%PORTDOCS%%%%DOCSDIR%%/mysqlpp-userman.pdf
%%PORTDOCS%%%%DOCSDIR%%/refman/html/_header.html
@@ -158,6 +158,9 @@
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLString.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Set-members.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Set.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Transaction-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Transaction.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Transaction__coll__graph.png
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1const__string-members.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1const__string.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1const__subscript__container-members.html
@@ -302,6 +305,7 @@
%%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__dep__incl.png
%%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/querydef_8h-source.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/refman.css
%%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h-source.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h.html
@@ -319,6 +323,10 @@
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__dep__incl.png
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__types_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__types_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__types_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__types_8h__incl.png
%%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h-source.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h__dep__incl.png
@@ -369,6 +377,9 @@
%%PORTDOCS%%%%DOCSDIR%%/refman/html/tiny__int_8h-source.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/tiny__int_8h.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/tiny__int_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/transaction_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/transaction_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/transaction_8h__incl.png
%%PORTDOCS%%%%DOCSDIR%%/refman/html/type__info_8h-source.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/type__info_8h.html
%%PORTDOCS%%%%DOCSDIR%%/refman/html/type__info_8h__dep__incl.png
@@ -403,10 +414,12 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cpp
%%PORTDOCS%%%%EXAMPLESDIR%%/simple2.cpp
%%PORTDOCS%%%%EXAMPLESDIR%%/simple3.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/stock.h
%%PORTDOCS%%%%EXAMPLESDIR%%/updel.cpp
%%PORTDOCS%%%%EXAMPLESDIR%%/usequery.cpp
%%PORTDOCS%%%%EXAMPLESDIR%%/util.cpp
%%PORTDOCS%%%%EXAMPLESDIR%%/util.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaction.cpp
@dirrm include/mysql++
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/userman/html
--- mysql++.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060427212105.247B7612F>