Attachment 34906 Details for Bug 56544 – file.diff

[patch] file.diff

file.diff (text/plain), 5.95 KB, created by Sergey Matveychuk on 2003-09-06 22:30:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Matveychuk

Created: 2003-09-06 22:30:08 UTC

Size: 5.95 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/databases/mysql++.orig/Makefile /usr/ports/databases/mysql++/Makefile
>--- /usr/ports/databases/mysql++.orig/Makefile	Sat Sep  6 22:36:22 2003
>+++ /usr/ports/databases/mysql++/Makefile	Sun Sep  7 01:07:42 2003
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	mysql++
> PORTVERSION=	1.7.9
>+PORTREVISION=	1
> CATEGORIES=	databases devel
> MASTER_SITES=	ftp://ftp.free.fr/pub/MySQL/Downloads/mysql++/ \
> 		ftp://gd.tuwien.ac.at/db/mysql/Downloads/mysql++/ \
>@@ -15,8 +16,7 @@
> MAINTAINER=	mico@bsd.hu
> COMMENT=	Complex C++ API for MySQL
> 
>-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
>-
>+USE_MYSQL=	yes
> USE_GMAKE=	yes
> HAS_CONFIGURE=	yes
> CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ -Wno-deprecated"
>@@ -27,8 +27,7 @@
> 
> .include <bsd.port.pre.mk>
> .if ${OSVERSION} >= 500035
>-PATCHFILES=	mysql++-gcc-3.0.patch.gz \
>-	        mysql++-gcc-3.2.patch.gz
>+PATCHFILES=	patch_gcc_3.3.gz
> PATCH_SITES=	${MASTER_SITES}
> PATCH_DIST_STRIP=-p1
> .endif
>@@ -39,17 +38,19 @@
> 	@${ECHO} "install:" >>${WRKSRC}/examples/Makefile.in
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sqlplusint/.libs/libsqlplus.so.1 ${PREFIX}/lib
>-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/.libs/libsqlplus.a ${PREFIX}/lib
>+	@${INSTALL_PROGRAM} ${WRKSRC}/sqlplusint/.libs/libsqlplus.so.1 ${PREFIX}/lib
>+	@${INSTALL_DATA} ${WRKSRC}/sqlplusint/.libs/libsqlplus.a ${PREFIX}/lib
> 	@(cd ${PREFIX}/lib && ${RM} -f libsqlplus.so && ${LN} -s libsqlplus.so.1 libsqlplus.so)
> 	@ranlib ${PREFIX}/lib/libsqlplus.a
>-	@mkdir -p ${PREFIX}/share/examples/mysql++
>-	@mkdir -p ${PREFIX}/share/doc/mysql++
>-	@${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
>-	@(cd ${WRKDIR}/${DISTNAME}/sqlplusint/; \
>-	 ${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
>-	@${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/mysql++
>+	@(cd ${WRKSRC}/sqlplusint/; \
>+	${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
>+.if !defined(NOPORTDOCS)
>+	@mkdir -p ${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/doc/man-text/* ${DOCSDIR}
>+	@mkdir -p ${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/examples/*.cc ${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${FILESDIR}/README ${EXAMPLESDIR}
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/databases/mysql++.orig/distinfo /usr/ports/databases/mysql++/distinfo
>--- /usr/ports/databases/mysql++.orig/distinfo	Sat Sep  6 22:36:22 2003
>+++ /usr/ports/databases/mysql++/distinfo	Sat Sep  6 22:57:45 2003
>@@ -1,3 +1,2 @@
> MD5 (mysql++-1.7.9.tar.gz) = 1312fb4e33dcce07fac5fa9c2ac801f7
>-MD5 (mysql++-gcc-3.0.patch.gz) = 00958326410b942d352e6c7ceaafeeb9
>-MD5 (mysql++-gcc-3.2.patch.gz) = fe3ef5852e96951a8eb5a172f2f19498
>+MD5 (patch_gcc_3.3.gz) = c80d705e300b76ab07e10344eb8f19d3
>diff -ruN --exclude=CVS /usr/ports/databases/mysql++.orig/pkg-plist /usr/ports/databases/mysql++/pkg-plist
>--- /usr/ports/databases/mysql++.orig/pkg-plist	Sat Sep  6 22:36:22 2003
>+++ /usr/ports/databases/mysql++/pkg-plist	Sun Sep  7 00:45:24 2003
>@@ -77,41 +77,41 @@
> lib/libsqlplus.so.1
> lib/libsqlplus.a
> lib/libsqlplus.so
>-share/doc/mysql++/1_Introduction.txt
>-share/doc/mysql++/2_Overview.txt
>-share/doc/mysql++/3_Important.txt
>-share/doc/mysql++/4_Tutorial.txt
>-share/doc/mysql++/5_Class.txt
>-share/doc/mysql++/6_Template.txt
>-share/doc/mysql++/7_Specialized.txt
>-share/doc/mysql++/8_Long.txt
>-share/doc/mysql++/A_Changelog.txt
>-share/doc/mysql++/About_this.txt
>-share/doc/mysql++/Appendices.txt
>-share/doc/mysql++/B_Do.txt
>-share/doc/mysql++/C_Credits.txt
>-share/doc/mysql++/Contents.txt
>-share/doc/mysql++/D_Copyright.txt
>-share/doc/mysql++/E_Feedback.txt
>-share/doc/mysql++/Introductory_Material.txt
>-share/doc/mysql++/Usage.txt
>-share/doc/mysql++/index.txt
>-share/doc/mysql++/manual.txt
>-share/examples/mysql++/cgi_image.cc
>-share/examples/mysql++/complic1.cc
>-share/examples/mysql++/custom1.cc
>-share/examples/mysql++/custom2.cc
>-share/examples/mysql++/custom3.cc
>-share/examples/mysql++/custom4.cc
>-share/examples/mysql++/fieldinf1.cc
>-share/examples/mysql++/load_file.cc
>-share/examples/mysql++/populate.cc
>-share/examples/mysql++/resetdb.cc
>-share/examples/mysql++/simple1.cc
>-share/examples/mysql++/sinisa_ex.cc
>-share/examples/mysql++/updel_x_.cc
>-share/examples/mysql++/util.cc
>-share/examples/mysql++/README
>-@unexec rmdir include/mysql 2>/dev/null || true
>-@dirrm share/doc/mysql++
>-@dirrm share/examples/mysql++
>+%%PORTDOCS%%%%DOCSDIR%%/1_Introduction.txt
>+%%PORTDOCS%%%%DOCSDIR%%/2_Overview.txt
>+%%PORTDOCS%%%%DOCSDIR%%/3_Important.txt
>+%%PORTDOCS%%%%DOCSDIR%%/4_Tutorial.txt
>+%%PORTDOCS%%%%DOCSDIR%%/5_Class.txt
>+%%PORTDOCS%%%%DOCSDIR%%/6_Template.txt
>+%%PORTDOCS%%%%DOCSDIR%%/7_Specialized.txt
>+%%PORTDOCS%%%%DOCSDIR%%/8_Long.txt
>+%%PORTDOCS%%%%DOCSDIR%%/A_Changelog.txt
>+%%PORTDOCS%%%%DOCSDIR%%/About_this.txt
>+%%PORTDOCS%%%%DOCSDIR%%/Appendices.txt
>+%%PORTDOCS%%%%DOCSDIR%%/B_Do.txt
>+%%PORTDOCS%%%%DOCSDIR%%/C_Credits.txt
>+%%PORTDOCS%%%%DOCSDIR%%/Contents.txt
>+%%PORTDOCS%%%%DOCSDIR%%/D_Copyright.txt
>+%%PORTDOCS%%%%DOCSDIR%%/E_Feedback.txt
>+%%PORTDOCS%%%%DOCSDIR%%/Introductory_Material.txt
>+%%PORTDOCS%%%%DOCSDIR%%/Usage.txt
>+%%PORTDOCS%%%%DOCSDIR%%/index.txt
>+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
>+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/custom3.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/custom4.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/populate.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/sinisa_ex.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/util.cc
>+%%PORTDOCS%%%%EXAMPLESDIR%%/README
>+@dirrm include/mysql
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>--- mysql++-1.7.9_1.patch ends here ---

Actions: View | Diff

Attachments on bug 56544: 34906