View | Details | Raw Unified | Return to bug 96434
Collapse All | Expand All

(-)mysql++/Makefile (-4 / +6 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	mysql++
8
PORTNAME=	mysql++
9
PORTVERSION=	2.0.7
9
PORTVERSION=	2.1.1
10
PORTREVISION=	1
10
PORTREVISION=	0
11
CATEGORIES=	databases devel
11
CATEGORIES=	databases devel
12
MASTER_SITES=	http://tangentsoft.net/mysql++/releases/
12
MASTER_SITES=	http://tangentsoft.net/mysql++/releases/
13
PKGNAMESUFFIX=	-mysql${MYSQL_VER}
13
PKGNAMESUFFIX=	-mysql${MYSQL_VER}
Lines 15-28 Link Here
15
MAINTAINER=	sergey@network-asp.biz
15
MAINTAINER=	sergey@network-asp.biz
16
COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
16
COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
17
17
18
BUILD_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
19
20
USE_MYSQL=	yes
18
USE_MYSQL=	yes
21
USE_AUTOTOOLS=	libtool:15
19
USE_AUTOTOOLS=	libtool:15
22
CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --disable-examples
20
CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --disable-examples
23
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
21
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
24
INSTALLS_SHLIB=	yes
22
INSTALLS_SHLIB=	yes
25
23
24
USE_GMAKE=      yes
25
26
CONFLICTS=	${PORTNAME}*-1.*
26
CONFLICTS=	${PORTNAME}*-1.*
27
27
28
.include <bsd.port.pre.mk>
28
.include <bsd.port.pre.mk>
Lines 32-37 Link Here
32
.endif
32
.endif
33
33
34
post-install:
34
post-install:
35
	@${RM} -f ${PREFIX}/lib/libmysqlpp.so.3
36
	@${LN} -s ${PREFIX}/lib/libmysqlpp.so ${PREFIX}/lib/libmysqlpp.so.3
35
.if !defined(NOPORTDOCS)
37
.if !defined(NOPORTDOCS)
36
	@${MKDIR} ${DOCSDIR}/userman/html ${DOCSDIR}/refman/html
38
	@${MKDIR} ${DOCSDIR}/userman/html ${DOCSDIR}/refman/html
37
	@${INSTALL_DATA} ${WRKSRC}/doc/userman/html/* ${DOCSDIR}/userman/html
39
	@${INSTALL_DATA} ${WRKSRC}/doc/userman/html/* ${DOCSDIR}/userman/html
(-)mysql++/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (mysql++-2.0.7.tar.gz) = e2ea3debacf936b0406012c895412ca4
1
MD5 (mysql++-2.1.1.tar.gz) = 3a42b3422b37c65f88be9162a969d164
2
SHA256 (mysql++-2.0.7.tar.gz) = 35f3a775da8b736b23d8afeb73ed5af6b1be5f108c57a12f836ac3861118dd12
2
SHA256 (mysql++-2.1.1.tar.gz) = fcd05ac5b4ef0b7b196636907f0ab14860a4b889bd3b3e4f2acc919e2bb05a53
3
SIZE (mysql++-2.0.7.tar.gz) = 1970290
3
SIZE (mysql++-2.1.1.tar.gz) = 1855521
(-)mysql++/files/patch-Makefile.in (+11 lines)
Line 0 Link Here
1
--- Makefile.in.orig	Wed Apr  5 07:44:49 2006
2
+++ Makefile.in	Thu Apr 27 23:34:16 2006
3
@@ -20,7 +20,7 @@
4
 
5
 ### Targets: ###
6
 
7
-all: lib examples
8
+all: lib
9
 
10
 install: all
11
 	(cd lib && $(MAKE) install)
(-)mysql++/files/patch-configure (-11 lines)
Lines 1-11 Link Here
1
--- configure.orig	Thu May  5 13:30:26 2005
2
+++ configure	Mon May  9 21:09:42 2005
3
@@ -7793,7 +7793,7 @@
4
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
5
 
6
 # Always use our own libtool.
7
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
8
+LIBTOOL='$(SHELL) $(top_builddir)/libtool --tag=CXX'
9
 
10
 # Prevent multiple expansion
11
 
(-)mysql++/files/patch-examples__Makefile.base (-92 lines)
Lines 1-92 Link Here
1
--- examples/Makefile.base.orig	Wed Nov  2 21:03:09 2005
2
+++ examples/Makefile.base	Sat Dec 10 16:08:30 2005
3
@@ -22,15 +22,6 @@
4
 
5
 # --- No user-serviceable parts below :)
6
 
7
-define mk-objlist
8
-	$(foreach O,$1,\
9
-		$(if $(findstring $(BIN_DIR)/,$(O)),$(O),$(BIN_DIR)/$(O)))
10
-endef
11
-
12
-ifndef BIN_DIR
13
-	BIN_DIR=.
14
-endif
15
-
16
 BINARIES=resetdb$(EXE) simple1$(EXE) simple2$(EXE) simple3$(EXE) \
17
 		usequery$(EXE) fieldinf1$(EXE) dbinfo$(EXE) cgi_image$(EXE) \
18
 		load_file$(EXE) updel$(EXE) multiquery$(EXE) custom1$(EXE) \
19
@@ -67,56 +58,55 @@
20
 
21
 
22
 resetdb$(EXE): $(RESETDB_OBJS)
23
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
24
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(RESETDB_OBJS) $(LDEXEFLAG)$@ $(LIBS)
25
 
26
 simple1$(EXE): $(SIMPLE1_OBJS)
27
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
28
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
29
 
30
 simple2$(EXE): $(SIMPLE2_OBJS)
31
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
32
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE2_OBJS) $(LDEXEFLAG)$@ $(LIBS)
33
 
34
 simple3$(EXE): $(SIMPLE3_OBJS)
35
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
36
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE3_OBJS) $(LDEXEFLAG)$@ $(LIBS)
37
 
38
 usequery$(EXE): $(USEQUERY_OBJS)
39
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
40
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(USEQUERY_OBJS) $(LDEXEFLAG)$@ $(LIBS)
41
 
42
 custom1$(EXE): $(CUSTOM1_OBJS)
43
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
44
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
45
 
46
 custom2$(EXE): $(CUSTOM2_OBJS)
47
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
48
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM2_OBJS) $(LDEXEFLAG)$@ $(LIBS)
49
 
50
 custom3$(EXE): $(CUSTOM3_OBJS)
51
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
52
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM3_OBJS) $(LDEXEFLAG)$@ $(LIBS)
53
 
54
 custom4$(EXE): $(CUSTOM4_OBJS)
55
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
56
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM4_OBJS) $(LDEXEFLAG)$@ $(LIBS)
57
 
58
 custom5$(EXE): $(CUSTOM5_OBJS)
59
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
60
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM5_OBJS) $(LDEXEFLAG)$@ $(LIBS)
61
 
62
 custom6$(EXE): $(CUSTOM6_OBJS)
63
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
64
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM6_OBJS) $(LDEXEFLAG)$@ $(LIBS)
65
 
66
 fieldinf1$(EXE): $(FIELDINF1_OBJS)
67
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
68
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(FIELDINF1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
69
 
70
 dbinfo$(EXE): $(DBINFO_OBJS)
71
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
72
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(DBINFO_OBJS) $(LDEXEFLAG)$@ $(LIBS)
73
 
74
 cgi_image$(EXE): $(CGI_IMAGE_OBJS)
75
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
76
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CGI_IMAGE_OBJS) $(LDEXEFLAG)$@ $(LIBS)
77
 
78
 load_file$(EXE): $(LOAD_FILE_OBJS)
79
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
80
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(LOAD_FILE_OBJS) $(LDEXEFLAG)$@ $(LIBS)
81
 
82
 updel$(EXE): $(UPDEL_OBJS)
83
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
84
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(UPDEL_OBJS) $(LDEXEFLAG)$@ $(LIBS)
85
 
86
 multiquery$(EXE): $(MULTIQUERY_OBJS)
87
-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
88
-
89
+	$(LD) $(LDFLAGS) $(LDSTARTUP) $(MULTIQUERY_OBJS) $(LDEXEFLAG)$@ $(LIBS)
90
 
91
 resetdb.$(OBJ): resetdb.cpp util.h
92
 simple1.$(OBJ): simple1.cpp util.h
(-)mysql++/files/patch-makemake.sh (-8 lines)
Lines 1-8 Link Here
1
--- makemake.sh.orig	Wed Nov  2 21:03:09 2005
2
+++ makemake.sh	Sat Dec 10 15:07:58 2005
3
@@ -1,4 +1,4 @@
4
-#!/bin/bash
5
+#!/usr/local/bin/bash
6
 
7
 # Display usage message
8
 function usage() {
(-)mysql++/pkg-plist (-4 / +17 lines)
Lines 1-5 Link Here
1
include/mysql++/coldata.h
1
include/mysql++/coldata.h
2
include/mysql++/compare.h
3
include/mysql++/connection.h
2
include/mysql++/connection.h
4
include/mysql++/const_string.h
3
include/mysql++/const_string.h
5
include/mysql++/convert.h
4
include/mysql++/convert.h
Lines 20-38 Link Here
20
include/mysql++/platform.h
19
include/mysql++/platform.h
21
include/mysql++/qparms.h
20
include/mysql++/qparms.h
22
include/mysql++/query.h
21
include/mysql++/query.h
22
include/mysql++/querydef.h
23
include/mysql++/resiter.h
23
include/mysql++/resiter.h
24
include/mysql++/result.h
24
include/mysql++/result.h
25
include/mysql++/row.h
25
include/mysql++/row.h
26
include/mysql++/sql_string.h
26
include/mysql++/sql_string.h
27
include/mysql++/sql_types.h
27
include/mysql++/stream2string.h
28
include/mysql++/stream2string.h
28
include/mysql++/string_util.h
29
include/mysql++/string_util.h
29
include/mysql++/tiny_int.h
30
include/mysql++/tiny_int.h
31
include/mysql++/transaction.h
30
include/mysql++/type_info.h
32
include/mysql++/type_info.h
31
include/mysql++/vallist.h
33
include/mysql++/vallist.h
32
lib/libmysqlpp.a
33
lib/libmysqlpp.la
34
lib/libmysqlpp.so
34
lib/libmysqlpp.so
35
lib/libmysqlpp.so.2
35
lib/libmysqlpp.so.3
36
%%PORTDOCS%%%%DOCSDIR%%/mysqlpp-refman.pdf
36
%%PORTDOCS%%%%DOCSDIR%%/mysqlpp-refman.pdf
37
%%PORTDOCS%%%%DOCSDIR%%/mysqlpp-userman.pdf
37
%%PORTDOCS%%%%DOCSDIR%%/mysqlpp-userman.pdf
38
%%PORTDOCS%%%%DOCSDIR%%/refman/html/_header.html
38
%%PORTDOCS%%%%DOCSDIR%%/refman/html/_header.html
Lines 158-163 Link Here
158
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLString.html
158
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLString.html
159
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Set-members.html
159
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Set-members.html
160
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Set.html
160
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Set.html
161
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Transaction-members.html
162
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Transaction.html
163
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Transaction__coll__graph.png
161
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1const__string-members.html
164
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1const__string-members.html
162
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1const__string.html
165
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1const__string.html
163
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1const__subscript__container-members.html
166
%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1const__subscript__container-members.html
Lines 302-307 Link Here
302
%%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h.html
305
%%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h.html
303
%%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__dep__incl.png
306
%%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__dep__incl.png
304
%%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__incl.png
307
%%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__incl.png
308
%%PORTDOCS%%%%DOCSDIR%%/refman/html/querydef_8h-source.html
305
%%PORTDOCS%%%%DOCSDIR%%/refman/html/refman.css
309
%%PORTDOCS%%%%DOCSDIR%%/refman/html/refman.css
306
%%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h-source.html
310
%%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h-source.html
307
%%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h.html
311
%%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h.html
Lines 319-324 Link Here
319
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h.html
323
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h.html
320
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__dep__incl.png
324
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__dep__incl.png
321
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__incl.png
325
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__incl.png
326
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__types_8h-source.html
327
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__types_8h.html
328
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__types_8h__dep__incl.png
329
%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__types_8h__incl.png
322
%%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h-source.html
330
%%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h-source.html
323
%%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h.html
331
%%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h.html
324
%%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h__dep__incl.png
332
%%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h__dep__incl.png
Lines 369-374 Link Here
369
%%PORTDOCS%%%%DOCSDIR%%/refman/html/tiny__int_8h-source.html
377
%%PORTDOCS%%%%DOCSDIR%%/refman/html/tiny__int_8h-source.html
370
%%PORTDOCS%%%%DOCSDIR%%/refman/html/tiny__int_8h.html
378
%%PORTDOCS%%%%DOCSDIR%%/refman/html/tiny__int_8h.html
371
%%PORTDOCS%%%%DOCSDIR%%/refman/html/tiny__int_8h__dep__incl.png
379
%%PORTDOCS%%%%DOCSDIR%%/refman/html/tiny__int_8h__dep__incl.png
380
%%PORTDOCS%%%%DOCSDIR%%/refman/html/transaction_8h-source.html
381
%%PORTDOCS%%%%DOCSDIR%%/refman/html/transaction_8h.html
382
%%PORTDOCS%%%%DOCSDIR%%/refman/html/transaction_8h__incl.png
372
%%PORTDOCS%%%%DOCSDIR%%/refman/html/type__info_8h-source.html
383
%%PORTDOCS%%%%DOCSDIR%%/refman/html/type__info_8h-source.html
373
%%PORTDOCS%%%%DOCSDIR%%/refman/html/type__info_8h.html
384
%%PORTDOCS%%%%DOCSDIR%%/refman/html/type__info_8h.html
374
%%PORTDOCS%%%%DOCSDIR%%/refman/html/type__info_8h__dep__incl.png
385
%%PORTDOCS%%%%DOCSDIR%%/refman/html/type__info_8h__dep__incl.png
Lines 403-412 Link Here
403
%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cpp
414
%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cpp
404
%%PORTDOCS%%%%EXAMPLESDIR%%/simple2.cpp
415
%%PORTDOCS%%%%EXAMPLESDIR%%/simple2.cpp
405
%%PORTDOCS%%%%EXAMPLESDIR%%/simple3.cpp
416
%%PORTDOCS%%%%EXAMPLESDIR%%/simple3.cpp
417
%%PORTDOCS%%%%EXAMPLESDIR%%/stock.h
406
%%PORTDOCS%%%%EXAMPLESDIR%%/updel.cpp
418
%%PORTDOCS%%%%EXAMPLESDIR%%/updel.cpp
407
%%PORTDOCS%%%%EXAMPLESDIR%%/usequery.cpp
419
%%PORTDOCS%%%%EXAMPLESDIR%%/usequery.cpp
408
%%PORTDOCS%%%%EXAMPLESDIR%%/util.cpp
420
%%PORTDOCS%%%%EXAMPLESDIR%%/util.cpp
409
%%PORTDOCS%%%%EXAMPLESDIR%%/util.h
421
%%PORTDOCS%%%%EXAMPLESDIR%%/util.h
422
%%PORTDOCS%%%%EXAMPLESDIR%%/xaction.cpp
410
@dirrm include/mysql++
423
@dirrm include/mysql++
411
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
424
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
412
%%PORTDOCS%%@dirrm %%DOCSDIR%%/userman/html
425
%%PORTDOCS%%@dirrm %%DOCSDIR%%/userman/html

Return to bug 96434