Attachment #42781 for bug #66646

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





PORTNAME=	${SQLRELAY_PORTNAME}
PORTVERSION=	${SQLRELAY_PORTVERSION}
PORTREVISION=	4
CATEGORIES=	databases
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	sqlrelay

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A persistent DB connection pooling/proxying/load balancing system

LIB_DEPENDS=	rudiments-0.26.3.1:${PORTSDIR}/devel/rudiments \
		xml2.5:${PORTSDIR}/textproc/libxml2

USE_ICONV=		yes
USE_REINPLACE=		yes
USE_GMAKE=		yes
USE_LIBTOOL_VER=	15
LIBTOOLFLAGS=		# none
CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include"	\
			PTHREADINCLUDES="${PTHREAD_CFLAGS}"	\
			PTHREADLIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
			--without-java-prefix \
			--without-perl-prefix \
			--without-php-prefix \
			--without-python-prefix \
			--without-ruby-prefix \
			--without-zope-prefix
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PLIST_SUB=		VER="${PORTVERSION}"
MAKE_ARGS=		VERSION="${PORTVERSION:R}"
INSTALLS_SHLIB=		yes

POSTGRESQL_PORT?=	databases/postgresql7

MAN1=		fields.1 query.1 query.py.1 sqlr-config-gtk.1 sqlrsh.1
MAN8=		sqlr-cachemanager.8 sqlr-connection.8 sqlr-ipclean.8	\
		sqlr-listener.8 sqlr-scaler.8 sqlr-start.8 sqlr-stop.8
MAN2PATCH=	man1/fields.1 man1/query.1 man1/sqlrsh.1 man8/sqlr-connection.8	\
		man8/sqlr-listener.8 man8/sqlr-scaler.8

.include "${.CURDIR}/Makefile.common"

.if defined(PACKAGE_BUILDING) || defined(BATCH)

.endif

.if defined(WITH_MYSQL) && ${WITH_MYSQL:L} != no
USE_MYSQL=	yes
CONFIGURE_ARGS+=	--with-mysql-prefix="${LOCALBASE}"
IF_MYSQL=	""
.else

IF_GTK=		"@comment "
.endif

PLIST_SUB+=	IF_SQLITE=${IF_SQLITE} \
		IF_MYSQL=${IF_MYSQL} \
		IF_MSQL=${IF_MSQL} \
		IF_POSTGRESQL=${IF_POSTGRESQL} \

		IF_INTERBASE=${IF_INTERBASE} \
		IF_GTK=${IF_GTK}

REPLACE_DOC=	"$$(MAKE) -C doc install"

#  --with-sybase-prefix          Location of Sybase
#  --with-oracle-home            Location of Oracle
#  --with-interbase-prefix       Location of Interbase


.include <bsd.port.pre.mk>

.if ${OSVERSION} < 500000
BROKEN=		"Broken pkg-plist"
.else
BROKEN=		"Does not compile on 5.x"
.endif
DEPRECATED=	${BROKEN}
EXPIRATION_DATE=2004-06-18

.if ${OSVERSION} >= 500000
EXTRA[_PATCHES=	${PATCHDIR}/extra-patch-*

PLIST_SUB+=	PROFILE="@comment "
.else
PLIST_SUB+=	PROFILE=""
.endif

pre-configure:
.for fich in configure init/Makefile
	@${REINPLACE_CMD} -E \
		-e 's,/usr/local[[:>:]],${LOCALBASE},g;' \
			${WRKSRC}/${fich}
.endfor
.for fich in ${MAN2PATCH}
	@${REINPLACE_CMD} -e 's,sqlrelay.config,sqlrelay.conf,'	\
		-e 's,sqlrelay/sqlrelay.conf,sqlrelay.conf,'	\
		-e 's,/etc/sqlrelay,${PREFIX}/etc/sqlrelay,'	\
			${WRKSRC}/man/${fich}
.endfor
.if defined(NOPORTDOCS)
	@${REINPLACE_CMD} -e 's,${REPLACE_DOC},#${REPLACE_DOC},' ${WRKSRC}/Makefile

post-install:
.if !defined(NOPORTDOCS)
	cd ${WRKSRC} && ${MAKE} install-doc
.endif

.include <bsd.port.post.mk>

Lines 1-7 Link Here

(-)databases/sqlrelay/Makefile.common (-1 / +1 lines)
1	# $FreeBSD: ports/databases/sqlrelay/Makefile.common,v 1.4 2002/10/27 17:54:01 knu Exp $	1	# $FreeBSD: ports/databases/sqlrelay/Makefile.common,v 1.4 2002/10/27 17:54:01 knu Exp $
2		2
3	SQLRELAY_PORTNAME= sqlrelay	3	SQLRELAY_PORTNAME= sqlrelay
4	SQLRELAY_PORTVERSION= 0.32	4	SQLRELAY_PORTVERSION= 0.34.3
5		5
6	SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME}	6	SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME}
7	SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC	7	SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC

Lines 1-2 Link Here

(-)databases/sqlrelay/distinfo (-2 / +2 lines)
1	MD5 (sqlrelay-0.32.tar.gz) = 711f1edc83a61644715462e78976586d	1	MD5 (sqlrelay-0.34.3.tar.gz) = dcfae19e69a406ea308f76af299f76f2
2	SIZE (sqlrelay-0.32.tar.gz) = 998694	2	SIZE (sqlrelay-0.34.3.tar.gz) = 1398753




--- Makefile.orig	Wed Oct 17 06:20:48 2001
+++ Makefile	Sun Feb 24 01:42:57 2002
@@ -24,9 +24,10 @@
 
 install:
 	cd bin; $(MAKE) install
-	cd doc; $(MAKE) install
 	cd etc; $(MAKE) install
 	cd src; $(MAKE) install
+install-doc:
+	cd doc; $(MAKE) install
 
 uninstall:
 	cd bin; $(MAKE) uninstall




--- config.mk.in.orig	Tue Dec 30 18:17:23 2003
+++ config.mk.in	Tue May 11 00:03:26 2004
@@ -14,14 +14,14 @@
 exec_prefix= @exec_prefix@
 includedir = @includedir@
 libdir = @libdir@
-javadir = ${exec_prefix}/java
+javadir = @exec_prefix@/share/java/classes
 libexecdir = @libexecdir@
 bindir = @bindir@
 localstatedir = @localstatedir@
 sysconfdir = @sysconfdir@
 mandir = @mandir@
 datadir = @datadir@
-docdir = ${datadir}/doc/sqlrelay
+docdir = @exec_prefix@/share/doc/sqlrelay
 tmpdir = ${localstatedir}/sqlrelay/tmp
 cachedir = ${localstatedir}/sqlrelay/cache
 debugdir = ${localstatedir}/sqlrelay/debug




--- configure.orig	Mon Dec 22 00:27:22 2003
+++ configure	Wed May 12 00:17:59 2004
@@ -1566,7 +1566,7 @@
   enableval="$enable_debug"
   CFLAGS="-g -pg -Wall"; CXXFLAGS="-g -pg -fno-exceptions -Wall"; INSTALLSTRIP=""
   echo "$ac_t""yes" 1>&6
-  HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH"
+  HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH/include"
 else
-  CFLAGS="-fomit-frame-pointer -Wall"; CXXFLAGS="-fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
+  CFLAGS="${CFLAGS} -fomit-frame-pointer -Wall"; CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
 fi;
 
@@ -1784,7 +1784,7 @@
 fi
 if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH"
+  HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH/include"
 else
   echo "$ac_t""no" 1>&6
 
@@ -19114,6 +19114,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -19395,8 +19396,8 @@
 
 
 HAVE_PTHREAD=""
-PTHREADINCLUDES=""
-PTHREADLIBS=""
+#PTHREADINCLUDES=""
+#PTHREADLIBS=""
 
 if ( test "$cross_compiling" = "yes" )
 then
@@ -36695,7 +36696,7 @@
 	if ( test -n "$FOUNDHEADER" -a -n "$FOUNDLIB" )
 	then
 		eval "INTERBASEINCLUDES=\"-I$INTERBASEPATH/include\""
-		eval "INTERBASELIBSPATH=\"$INTERBASPATH/lib\"; INTERBASELIBS=\"-L$INTERBASEPATH/lib -lgds -lcrypt\""
+		eval "INTERBASELIBSPATH=\"$INTERBASEPATH/lib\"; INTERBASELIBS=\"-L$INTERBASEPATH/lib -lgds -lcrypt\""
 	fi
 else
 	if ( test -n "$INTERBASEPATH/lib/libgds.a" -a -n "INTERBASELIBS=\"-L$INTERBASEPATH/lib -lgds -lcrypt\"; INTERBASESTATIC=\"$STATICFLAG\"" )
@@ -36804,8 +36805,8 @@
 		LINKFAIL=""
 		if ( test -n "$INTERBASESTATIC" -a -n "$INTERBASELIBS" )
 		then
-			echo "$as_me:$LINENO: checking if Interbase can be statically linked without $DLLIB" >&5
-echo $ECHO_N "checking if Interbase can be statically linked without $DLLIB... $ECHO_C" >&6
+			echo "$as_me:$LINENO: checking if Interbase can be statically linked without -lcrypt" >&5
+echo $ECHO_N "checking if Interbase can be statically linked without -lcrypt... $ECHO_C" >&6
 
 SAVECPPFLAGS="$CPPFLAGS"
 SAVELIBS="$LIBS"
@@ -36868,16 +36869,16 @@
 LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
-			if ( test -n "$LINKFAIL" -a -n "$DLLIB" )
+			if ( test -n "$LINKFAIL" )
 			then
-				echo "$as_me:$LINENO: checking if Interbase can be statically linked with $DLLIB" >&5
-echo $ECHO_N "checking if Interbase can be statically linked with $DLLIB... $ECHO_C" >&6
+				echo "$as_me:$LINENO: checking if Interbase can be statically linked with -lcrypt" >&5
+echo $ECHO_N "checking if Interbase can be statically linked with -lcrypt... $ECHO_C" >&6
 
 SAVECPPFLAGS="$CPPFLAGS"
 SAVELIBS="$LIBS"
 SAVE_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
 CPPFLAGS="$INTERBASESTATIC $INTERBASEINCLUDES"
-LIBS="$INTERBASELIBS $SOCKETLIB $DLLIB"
+LIBS="$INTERBASELIBS $SOCKETLIB -lcrypt"
 LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 cat >conftest.$ac_ext <<_ACEOF
@@ -36919,7 +36920,7 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; INTERBASELIBS="$INTERBASELIBS $DLLIB"; LINKFAIL="";
+echo "${ECHO_T}yes" >&6; INTERBASELIBS="$INTERBASELIBS -lcrypt"; LINKFAIL="";
-echo "configure:7435: checking if Interbase can be statically linked with $DLLIB" >&5
+	if ( test -n "$LINKFAIL" ); then
+		echo $ac_n "checking if Interbase can be statically linked with -lcrypt""... $ac_c" 1>&6
+echo "configure:7435: checking if Interbase can be statically linked with -lcrypt" >&5
 		TEMPCPPFLAGS="$CPPFLAGS"
 		CPPFLAGS="$INTERBASESTATIC $INTERBASEINCLUDES"
-		LIBS="$INTERBASELIBS $SOCKETLIB $DLLIB"
+		LIBS="$INTERBASELIBS $SOCKETLIB -lcrypt"
 		cat > conftest.$ac_ext <<EOF
 #line 7440 "configure"
 #include "confdefs.h"
@@ -7446,7 +7446,7 @@
 EOF
 if { (eval echo configure:7448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS $DLLIB"; LINKFAIL="";
+  echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS -lcrypt"; LINKFAIL="";
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36939,8 +36940,8 @@
 
 		if ( test -z "$INTERBASESTATIC" -a -n "$INTERBASELIBS" )
 		then
-			echo "$as_me:$LINENO: checking if Interbase can be dynamically linked without $DLLIB" >&5
-echo $ECHO_N "checking if Interbase can be dynamically linked without $DLLIB... $ECHO_C" >&6
+			echo "$as_me:$LINENO: checking if Interbase can be dynamically linked without -lcrypt" >&5
+echo $ECHO_N "checking if Interbase can be dynamically linked without -lcrypt... $ECHO_C" >&6
 
 SAVECPPFLAGS="$CPPFLAGS"
 SAVELIBS="$LIBS"
@@ -37003,16 +37004,16 @@
 LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
-			if ( test -n "$LINKFAIL" -a -n "$DLLIB" )
+			if ( test -n "$LINKFAIL" )
 			then
-				echo "$as_me:$LINENO: checking if Interbase can be dynamically linked with $DLLIB" >&5
-echo $ECHO_N "checking if Interbase can be dynamically linked with $DLLIB... $ECHO_C" >&6
+				echo "$as_me:$LINENO: checking if Interbase can be dynamically linked with -lcrypt" >&5
+echo $ECHO_N "checking if Interbase can be dynamically linked with -lcrypt $ECHO_C" >&6
 
 SAVECPPFLAGS="$CPPFLAGS"
 SAVELIBS="$LIBS"
 SAVE_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
 CPPFLAGS="$INTERBASEINCLUDES"
-LIBS="$INTERBASELIBS $SOCKETLIB $DLLIB"
+LIBS="$INTERBASELIBS $SOCKETLIB -lcrypt"
 LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 cat >conftest.$ac_ext <<_ACEOF
@@ -37054,7 +37055,7 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; INTERBASELIBS="$INTERBASELIBS $DLLIB"; LINKFAIL=""
+echo "${ECHO_T}yes" >&6; INTERBASELIBS="$INTERBASELIBS -lcrypt"; LINKFAIL=""
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37573,13 +37574,7 @@
 
 			if ( test -n "$JAVAINCLUDES" )
 			then
-				for i in `ls -d $JAVAPATH/include/*`
-				do
-					if ( test -d "$i" )
-					then
-						JAVAINCLUDES="$JAVAINCLUDES -I$i"
-					fi
-				done
+				JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`"
 			fi
 		fi
 

Line 0 Link Here

(-)databases/sqlrelay/files/patch-doc+Makefile (+10 lines)
	1	--- doc/Makefile.orig Wed Dec 10 02:48:54 2003
	2	+++ doc/Makefile Wed May 12 22:40:33 2004
	3	@@ -31,6 +31,7 @@
	4	$(INSTALL) -m 644 clientapis.html $(docdir)
	5	$(INSTALL) -m 644 configuring.html $(docdir)
	6	$(INSTALL) -m 644 connections.html $(docdir)
	7	+ $(INSTALL) -m 644 faq.html $(docdir)
	8	$(INSTALL) -m 644 index.html $(docdir)
	9	$(INSTALL) -m 644 installing.html $(docdir)
	10	$(INSTALL) -m 644 introduction.html $(docdir)




--- init/Makefile.orig	Tue Dec 30 00:03:08 2003
+++ init/Makefile	Thu May 13 00:24:23 2004
@@ -38,8 +38,8 @@
 endif
 ifeq ($(UNAME),FreeBSD)
 	$(MKINSTALLDIRS) $(initroot)/usr/local/etc/rc.d
-	$(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d
-	$(INSTALL) -m 644 freebsd/sqlrelay $(initroot)/etc
+	$(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d/sqlrelay.sh.sample
+	$(INSTALL) -m 644 freebsd/sqlrelay $(initroot)/usr/local/etc/sqlrelay
 endif
 ifeq ($(UNAME),SCO_SV)
 	$(MKINSTALLDIRS) $(initroot)/etc/init.d




--- init/freebsd/rc.d/sqlrelay.in.orig	Sat Nov 16 07:49:32 2002
+++ init/freebsd/rc.d/sqlrelay.in	Thu May 13 21:37:02 2004
@@ -8,7 +8,7 @@
 prefix=@prefix@
 sysconfdir=@sysconfdir@
 
-if ( test -n -r "${sysconfdir}/sqlrelay.conf" ); then
+if !( test -r "${sysconfdir}/sqlrelay.conf" ); then
         exit 1
 fi
 
@@ -23,9 +23,9 @@
 
 start(){
     echo -n $"Starting SQL Relay: "
-    if ( test -r "/etc/sqlrelay" ); then
+    if ( test -r "${sysconfdir}/sqlrelay" ); then
         launched=0
-        for connid in `grep -v ^# /etc/sqlrelay`; do
+        for connid in `grep -v ^# ${sysconfdir}/sqlrelay`; do
             echo
             echo -n $"Launching instance with id '${connid}':"
             sqlr-start -id ${connid} >/dev/null 2>&1




--- src/api/java/Makefile.orig	Wed Dec 17 07:29:12 2003
+++ src/api/java/Makefile	Tue May 11 00:24:02 2004
@@ -2,7 +2,7 @@
 top_srcdir = ../../..
 INSTALL = $(top_srcdir)/install-sh -c
 
 include ../../../config.mk
+CPPFLAGS = $(JAVAINCLUDES) $(BASECPPFLAGS) -I./ -I../c++/include $(RUDIMENTSINCLUDES)
 
-CPPFLAGS = $(BASECPPFLAGS) -I./ -I$(top_builddir)/src/api/c++/include $(RUDIMENTSINCLUDES) $(JAVAINCLUDES)
+CPPFLAGS = $(JAVAINCLUDES) $(BASECPPFLAGS) -I./ -I$(top_builddir)/src/api/c++/include $(RUDIMENTSINCLUDES)
 RPATH =
 ifneq ($(strip $(libdir)),)
 ifeq ($(JAVAUSERPATH),yes)

Lines 5-10 Link Here

(-)databases/sqlrelay/pkg-plist (-94 / +141 lines)
5	%%IF_GTK%%bin/sqlr-config-gtk	5	%%IF_GTK%%bin/sqlr-config-gtk
6	%%IF_FREETDS%%bin/sqlr-connection-freetds	6	%%IF_FREETDS%%bin/sqlr-connection-freetds
7	%%IF_FREETDS%%bin/sqlr-connection-freetds-debug	7	%%IF_FREETDS%%bin/sqlr-connection-freetds-debug
		8	%%IF_INTERBASE%%bin/sqlr-connection-interbase
		9	%%IF_INTERBASE%%bin/sqlr-connection-interbase-debug
8	%%IF_MSQL%%bin/sqlr-connection-msql	10	%%IF_MSQL%%bin/sqlr-connection-msql
9	%%IF_MSQL%%bin/sqlr-connection-msql-debug	11	%%IF_MSQL%%bin/sqlr-connection-msql-debug
10	%%IF_MYSQL%%bin/sqlr-connection-mysql	12	%%IF_MYSQL%%bin/sqlr-connection-mysql
Lines 15-28 Link Here
15	%%IF_POSTGRESQL%%bin/sqlr-connection-postgresql-debug	17	%%IF_POSTGRESQL%%bin/sqlr-connection-postgresql-debug
16	%%IF_SQLITE%%bin/sqlr-connection-sqlite	18	%%IF_SQLITE%%bin/sqlr-connection-sqlite
17	%%IF_SQLITE%%bin/sqlr-connection-sqlite-debug	19	%%IF_SQLITE%%bin/sqlr-connection-sqlite-debug
18	%%IF_INTERBASE%%bin/sqlr-connection-interbase
19	%%IF_INTERBASE%%bin/sqlr-connection-interbase-debug
20	bin/sqlr-listener	20	bin/sqlr-listener
21	bin/sqlr-listener-debug	21	bin/sqlr-listener-debug
22	bin/sqlr-scaler	22	bin/sqlr-scaler
23	bin/sqlr-start	23	bin/sqlr-start
24	bin/sqlr-stop	24	bin/sqlr-stop
		25	bin/sqlrclient-config
		26	bin/sqlrclientwrapper-config
25	bin/sqlrsh	27	bin/sqlrsh
		28	etc/rc.d/sqlrelay.sh.sample
		29	etc/sqlrelay
26	etc/sqlrelay.conf.example	30	etc/sqlrelay.conf.example
27	etc/sqlrelay.dtd	31	etc/sqlrelay.dtd
28	include/sqlrelay/private/bindvar.h	32	include/sqlrelay/private/bindvar.h
Lines 34-132 Link Here
34	include/sqlrelay/private/sqlrincludes.h	38	include/sqlrelay/private/sqlrincludes.h
35	include/sqlrelay/sqlrclient.h	39	include/sqlrelay/sqlrclient.h
36	include/sqlrelay/sqlrclientwrapper.h	40	include/sqlrelay/sqlrclientwrapper.h
37	@dirrm include/sqlrelay/private	41	lib/libpqsqlrelay-%%VER%%.so
38	@dirrm include/sqlrelay	42	lib/libpqsqlrelay-%%VER%%.so.1
		43	lib/libpqsqlrelay.a
		44	lib/libpqsqlrelay.la
		45	lib/libpqsqlrelay.so
		46	lib/libsqlrclient-%%VER%%.so
		47	lib/libsqlrclient-%%VER%%.so.1
39	lib/libsqlrclient.a	48	lib/libsqlrclient.a
		49	lib/libsqlrclient.la
40	lib/libsqlrclient.so	50	lib/libsqlrclient.so
41	lib/libsqlrclient.so.0	51	lib/libsqlrclientwrapper-%%VER%%.so
42	%%PROFILE%%lib/libsqlrclient_p.a	52	lib/libsqlrclientwrapper-%%VER%%.so.1
43	lib/libsqlrclientwrapper.a	53	lib/libsqlrclientwrapper.a
		54	lib/libsqlrclientwrapper.la
44	lib/libsqlrclientwrapper.so	55	lib/libsqlrclientwrapper.so
45	lib/libsqlrclientwrapper.so.0	56	lib/libsqlrconnection-%%VER%%.so
46	%%PROFILE%%lib/libsqlrclientwrapper_p.a	57	lib/libsqlrconnection-%%VER%%.so.1
47	@dirrm sqlrelay/tmp	58	lib/libsqlrconnection.a
48	@dirrm sqlrelay/debug	59	lib/libsqlrconnection.la
49	@dirrm sqlrelay/cache	60	lib/libsqlrconnection.so
50	@dirrm sqlrelay	61	lib/libsqlrconnection_debug-%%VER%%.so
51	%%PORTDOCS%%share/doc/sqlrelay/api/c++/sqlrclient.h.html	62	lib/libsqlrconnection_debug-%%VER%%.so.1
52	%%PORTDOCS%%share/doc/sqlrelay/api/c/sqlrclientwrapper.h.html	63	lib/libsqlrconnection_debug.a
53	%%PORTDOCS%%share/doc/sqlrelay/api/java/SQLRConnection.html	64	lib/libsqlrconnection_debug.la
54	%%PORTDOCS%%share/doc/sqlrelay/api/java/SQLRCursor.html	65	lib/libsqlrconnection_debug.so
55	%%PORTDOCS%%share/doc/sqlrelay/api/java/allclasses-frame.html	66	lib/libsqlrutil-%%VER%%.so
56	%%PORTDOCS%%share/doc/sqlrelay/api/java/deprecated-list.html	67	lib/libsqlrutil-%%VER%%.so.1
57	%%PORTDOCS%%share/doc/sqlrelay/api/java/help-doc.html	68	lib/libsqlrutil.a
58	%%PORTDOCS%%share/doc/sqlrelay/api/java/index-all.html	69	lib/libsqlrutil.la
59	%%PORTDOCS%%share/doc/sqlrelay/api/java/index.html	70	lib/libsqlrutil.so
60	%%PORTDOCS%%share/doc/sqlrelay/api/java/overview-tree.html	71	%%PORTDOCS%%%%DOCSDIR%%/api/c++/sqlrclient.h.html
61	%%PORTDOCS%%share/doc/sqlrelay/api/java/package-list	72	%%PORTDOCS%%%%DOCSDIR%%/api/c/sqlrclientwrapper.h.html
62	%%PORTDOCS%%share/doc/sqlrelay/api/java/packages.html	73	%%PORTDOCS%%%%DOCSDIR%%/api/java/allclasses-frame.html
63	%%PORTDOCS%%share/doc/sqlrelay/api/java/serialized-form.html	74	%%PORTDOCS%%%%DOCSDIR%%/api/java/allclasses-noframe.html
64	%%PORTDOCS%%share/doc/sqlrelay/api/java/stylesheet.css	75	%%PORTDOCS%%%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/SQLRConnection.html
65	%%PORTDOCS%%share/doc/sqlrelay/api/perl/SQLRConnection.html	76	%%PORTDOCS%%%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/SQLRCursor.html
66	%%PORTDOCS%%share/doc/sqlrelay/api/perl/SQLRCursor.html	77	%%PORTDOCS%%%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/package-frame.html
67	%%PORTDOCS%%share/doc/sqlrelay/api/perl/SQLRelay.html	78	%%PORTDOCS%%%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/package-summary.html
68	%%PORTDOCS%%share/doc/sqlrelay/api/php/doc.html	79	%%PORTDOCS%%%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/package-tree.html
69	%%PORTDOCS%%share/doc/sqlrelay/api/python/PySQLRClient.py.html	80	%%PORTDOCS%%%%DOCSDIR%%/api/java/constant-values.html
70	%%PORTDOCS%%share/doc/sqlrelay/api/python/PySQLRDB.py.html	81	%%PORTDOCS%%%%DOCSDIR%%/api/java/deprecated-list.html
71	%%PORTDOCS%%share/doc/sqlrelay/api/ruby/ruby.html	82	%%PORTDOCS%%%%DOCSDIR%%/api/java/help-doc.html
72	%%PORTDOCS%%share/doc/sqlrelay/api/ruby/rubydbi.html	83	%%PORTDOCS%%%%DOCSDIR%%/api/java/index-all.html
73	%%PORTDOCS%%share/doc/sqlrelay/clientapis.html	84	%%PORTDOCS%%%%DOCSDIR%%/api/java/index.html
74	%%PORTDOCS%%share/doc/sqlrelay/configuring.html	85	%%PORTDOCS%%%%DOCSDIR%%/api/java/overview-tree.html
75	%%PORTDOCS%%share/doc/sqlrelay/connections.html	86	%%PORTDOCS%%%%DOCSDIR%%/api/java/package-list
76	%%PORTDOCS%%share/doc/sqlrelay/css/styles.css	87	%%PORTDOCS%%%%DOCSDIR%%/api/java/packages.html
77	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/db2.html	88	%%PORTDOCS%%%%DOCSDIR%%/api/java/stylesheet.css
78	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/interbase.html	89	%%PORTDOCS%%%%DOCSDIR%%/api/perl/SQLRConnection.html
79	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/lago.html	90	%%PORTDOCS%%%%DOCSDIR%%/api/perl/SQLRCursor.html
80	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/msql.html	91	%%PORTDOCS%%%%DOCSDIR%%/api/perl/SQLRelay.html
81	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/mssqlserver.html	92	%%PORTDOCS%%%%DOCSDIR%%/api/perl/perl.html
82	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/mysql.html	93	%%PORTDOCS%%%%DOCSDIR%%/api/php/doc.html
83	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/oracle.html	94	%%PORTDOCS%%%%DOCSDIR%%/api/python/PySQLRClient.py.html
84	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/oracle/805.html	95	%%PORTDOCS%%%%DOCSDIR%%/api/python/PySQLRDB.py.html
85	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/oracle/817.html	96	%%PORTDOCS%%%%DOCSDIR%%/api/ruby/ruby.html
86	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/postgresql.html	97	%%PORTDOCS%%%%DOCSDIR%%/api/ruby/rubydbi.html
87	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/sqlite.html	98	%%PORTDOCS%%%%DOCSDIR%%/clientapis.html
88	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/sybase.html	99	%%PORTDOCS%%%%DOCSDIR%%/configuring.html
89	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/sybase/11.0.3.3.html	100	%%PORTDOCS%%%%DOCSDIR%%/connections.html
90	%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/sybase/11.9.2.html	101	%%PORTDOCS%%%%DOCSDIR%%/css/styles.css
91	%%PORTDOCS%%share/doc/sqlrelay/index.html	102	%%PORTDOCS%%%%DOCSDIR%%/faq.html
92	%%PORTDOCS%%share/doc/sqlrelay/installing.html	103	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/db2.html
93	%%PORTDOCS%%share/doc/sqlrelay/introduction.html	104	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/interbase.html
94	%%PORTDOCS%%share/doc/sqlrelay/introtowebdb.html	105	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/lago.html
95	%%PORTDOCS%%share/doc/sqlrelay/invisible.gif	106	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/msql.html
96	%%PORTDOCS%%share/doc/sqlrelay/oraclentier.html	107	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/mssqlserver.html
97	%%PORTDOCS%%share/doc/sqlrelay/programming/binds.html	108	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/mysql.html
98	%%PORTDOCS%%share/doc/sqlrelay/programming/c++.html	109	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/oracle.html
99	%%PORTDOCS%%share/doc/sqlrelay/programming/c.html	110	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/oracle/linux/redhat/5/805.html
100	%%PORTDOCS%%share/doc/sqlrelay/programming/java.html	111	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/oracle/linux/redhat/6/8i.html
101	%%PORTDOCS%%share/doc/sqlrelay/programming/perl.html	112	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/oracle/linux/redhat/7/8i.html
102	%%PORTDOCS%%share/doc/sqlrelay/programming/perldbi.html	113	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/oracle/linux/redhat/7/9i.html
103	%%PORTDOCS%%share/doc/sqlrelay/programming/php.html	114	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/oracle/linux/redhat/9/9iR2.html
104	%%PORTDOCS%%share/doc/sqlrelay/programming/python.html	115	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/oracle/linux/slackware/7/8i.html
105	%%PORTDOCS%%share/doc/sqlrelay/programming/pythondb.html	116	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/oracle/linux/slackware/8/8i.html
106	%%PORTDOCS%%share/doc/sqlrelay/programming/ruby.html	117	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/oracle/linux/slackware/8/9i.html
107	%%PORTDOCS%%share/doc/sqlrelay/programming/rubydbi.html	118	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/postgresql.html
108	%%PORTDOCS%%share/doc/sqlrelay/programming/zope.html	119	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/sqlite.html
109	%%PORTDOCS%%share/doc/sqlrelay/programming/zope/instance.gif	120	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/sybase.html
110	%%PORTDOCS%%share/doc/sqlrelay/programming/zope/management.gif	121	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/sybase/11.0.3.3.html
111	%%PORTDOCS%%share/doc/sqlrelay/programming/zope/resultset.gif	122	%%PORTDOCS%%%%DOCSDIR%%/gettingstarted/sybase/11.9.2.html
112	%%PORTDOCS%%share/doc/sqlrelay/programming/zope/sqlrelay.gif	123	%%PORTDOCS%%%%DOCSDIR%%/index.html
113	%%PORTDOCS%%share/doc/sqlrelay/programming/zope/test.gif	124	%%PORTDOCS%%%%DOCSDIR%%/installing.html
114	%%PORTDOCS%%share/doc/sqlrelay/programming/zope/testzsqlmethod.gif	125	%%PORTDOCS%%%%DOCSDIR%%/introduction.html
115	%%PORTDOCS%%share/doc/sqlrelay/programming/zope/zsqlmethod.gif	126	%%PORTDOCS%%%%DOCSDIR%%/introtowebdb.html
116	%%PORTDOCS%%share/doc/sqlrelay/programming/zope/zsqlmethodresultset.gif	127	%%PORTDOCS%%%%DOCSDIR%%/invisible.gif
117	%%PORTDOCS%%share/doc/sqlrelay/running.html	128	%%PORTDOCS%%%%DOCSDIR%%/oraclentier.html
118	%%PORTDOCS%%@dirrm share/doc/sqlrelay/programming/zope	129	%%PORTDOCS%%%%DOCSDIR%%/programming/binds.html
119	%%PORTDOCS%%@dirrm share/doc/sqlrelay/programming	130	%%PORTDOCS%%%%DOCSDIR%%/programming/c++.html
120	%%PORTDOCS%%@dirrm share/doc/sqlrelay/gettingstarted/sybase	131	%%PORTDOCS%%%%DOCSDIR%%/programming/c.html
121	%%PORTDOCS%%@dirrm share/doc/sqlrelay/gettingstarted/oracle	132	%%PORTDOCS%%%%DOCSDIR%%/programming/java.html
122	%%PORTDOCS%%@dirrm share/doc/sqlrelay/gettingstarted	133	%%PORTDOCS%%%%DOCSDIR%%/programming/perl.html
123	%%PORTDOCS%%@dirrm share/doc/sqlrelay/css	134	%%PORTDOCS%%%%DOCSDIR%%/programming/perldbi.html
124	%%PORTDOCS%%@dirrm share/doc/sqlrelay/api/ruby	135	%%PORTDOCS%%%%DOCSDIR%%/programming/php.html
125	%%PORTDOCS%%@dirrm share/doc/sqlrelay/api/python	136	%%PORTDOCS%%%%DOCSDIR%%/programming/python.html
126	%%PORTDOCS%%@dirrm share/doc/sqlrelay/api/php	137	%%PORTDOCS%%%%DOCSDIR%%/programming/pythondb.html
127	%%PORTDOCS%%@dirrm share/doc/sqlrelay/api/perl	138	%%PORTDOCS%%%%DOCSDIR%%/programming/ruby.html
128	%%PORTDOCS%%@dirrm share/doc/sqlrelay/api/java	139	%%PORTDOCS%%%%DOCSDIR%%/programming/rubydbi.html
129	%%PORTDOCS%%@dirrm share/doc/sqlrelay/api/c++	140	%%PORTDOCS%%%%DOCSDIR%%/programming/zope.html
130	%%PORTDOCS%%@dirrm share/doc/sqlrelay/api/c	141	%%PORTDOCS%%%%DOCSDIR%%/programming/zope/instance.gif
131	%%PORTDOCS%%@dirrm share/doc/sqlrelay/api	142	%%PORTDOCS%%%%DOCSDIR%%/programming/zope/management.gif
132	%%PORTDOCS%%@dirrm share/doc/sqlrelay	143	%%PORTDOCS%%%%DOCSDIR%%/programming/zope/resultset.gif
		144	%%PORTDOCS%%%%DOCSDIR%%/programming/zope/sqlrelay.gif
		145	%%PORTDOCS%%%%DOCSDIR%%/programming/zope/test.gif
		146	%%PORTDOCS%%%%DOCSDIR%%/programming/zope/testzsqlmethod.gif
		147	%%PORTDOCS%%%%DOCSDIR%%/programming/zope/zsqlmethod.gif
		148	%%PORTDOCS%%%%DOCSDIR%%/programming/zope/zsqlmethodresultset.gif
		149	%%PORTDOCS%%%%DOCSDIR%%/running.html
		150	%%PORTDOCS%%@dirrm %%DOCSDIR%%/programming/zope
		151	%%PORTDOCS%%@dirrm %%DOCSDIR%%/programming
		152	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/sybase
		153	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/slackware/8
		154	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/slackware/7
		155	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/slackware
		156	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/9
		157	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/8
		158	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/7
		159	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/6
		160	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/5
		161	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat
		162	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux
		163	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted/oracle
		164	%%PORTDOCS%%@dirrm %%DOCSDIR%%/gettingstarted
		165	%%PORTDOCS%%@dirrm %%DOCSDIR%%/css
		166	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/ruby
		167	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/python
		168	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/php
		169	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/perl
		170	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/java/com/firstworks/sqlrelay
		171	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/java/com/firstworks
		172	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/java/com
		173	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/java
		174	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/c++
		175	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/c
		176	%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
		177	%%PORTDOCS%%@dirrm %%DOCSDIR%%
		178	@dirrm include/sqlrelay/private
		179	@dirrm include/sqlrelay

Return to bug 66646

Lines 7-13 Link Here

(-)databases/sqlrelay/Makefile (-45 / +45 lines)
7		7
8	PORTNAME= ${SQLRELAY_PORTNAME}	8	PORTNAME= ${SQLRELAY_PORTNAME}
9	PORTVERSION= ${SQLRELAY_PORTVERSION}	9	PORTVERSION= ${SQLRELAY_PORTVERSION}
10	PORTREVISION= 4
11	CATEGORIES= databases	10	CATEGORIES= databases
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= sqlrelay	12	MASTER_SITE_SUBDIR= sqlrelay
Lines 15-40 Link Here
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A persistent DB connection pooling/proxying/load balancing system	15	COMMENT= A persistent DB connection pooling/proxying/load balancing system
17		16
18	LIB_DEPENDS= rudiments.0:${PORTSDIR}/devel/rudiments \	17	LIB_DEPENDS= rudiments-0.26.3.1:${PORTSDIR}/devel/rudiments \
19	xml2.5:${PORTSDIR}/textproc/libxml2	18	xml2.5:${PORTSDIR}/textproc/libxml2
20		19
21	USE_ICONV= yes	20	USE_ICONV= yes
22	USE_REINPLACE= yes	21	USE_REINPLACE= yes
23	USE_GMAKE= yes	22	USE_GMAKE= yes
24	GNU_CONFIGURE= yes	23	USE_LIBTOOL_VER= 15
25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"	24	LIBTOOLFLAGS= # none
26	CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \	25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
27	--without-java-prefix \	26	PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
28	--without-perl-prefix \	27	PTHREADLIBS="${PTHREAD_LIBS}"
29	--without-php-prefix \	28	CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \
30	--without-python-prefix \	29	--without-java-prefix \
31	--without-ruby-prefix \	30	--without-perl-prefix \
32	--without-zope-prefix	31	--without-php-prefix \
33	MAKE_ARGS= VERSION="${PORTVERSION:R}"	32	--without-python-prefix \
34	INSTALLS_SHLIB= yes	33	--without-ruby-prefix \
		34	--without-zope-prefix
		35	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
		36	PLIST_SUB= VER="${PORTVERSION}"
		37	MAKE_ARGS= VERSION="${PORTVERSION:R}"
		38	INSTALLS_SHLIB= yes
35		39
36	POSTGRESQL_PORT?= databases/postgresql7	40	POSTGRESQL_PORT?= databases/postgresql7
37		41
		42	MAN1= fields.1 query.1 query.py.1 sqlr-config-gtk.1 sqlrsh.1
		43	MAN8= sqlr-cachemanager.8 sqlr-connection.8 sqlr-ipclean.8 \
		44	sqlr-listener.8 sqlr-scaler.8 sqlr-start.8 sqlr-stop.8
		45	MAN2PATCH= man1/fields.1 man1/query.1 man1/sqlrsh.1 man8/sqlr-connection.8 \
		46	man8/sqlr-listener.8 man8/sqlr-scaler.8
		47
38	.include "${.CURDIR}/Makefile.common"	48	.include "${.CURDIR}/Makefile.common"
39		49
40	.if defined(PACKAGE_BUILDING) \|\| defined(BATCH)	50	.if defined(PACKAGE_BUILDING) \|\| defined(BATCH)
Lines 70-76 Link Here
70	.endif	80	.endif
71		81
72	.if defined(WITH_MYSQL) && ${WITH_MYSQL:L} != no	82	.if defined(WITH_MYSQL) && ${WITH_MYSQL:L} != no
73	LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client	83	USE_MYSQL= yes
74	CONFIGURE_ARGS+= --with-mysql-prefix="${LOCALBASE}"	84	CONFIGURE_ARGS+= --with-mysql-prefix="${LOCALBASE}"
75	IF_MYSQL= ""	85	IF_MYSQL= ""
76	.else	86	.else
Lines 132-138 Link Here
132	IF_GTK= "@comment "	142	IF_GTK= "@comment "
133	.endif	143	.endif
134		144
135	PLIST_SUB= IF_SQLITE=${IF_SQLITE} \	145	PLIST_SUB+= IF_SQLITE=${IF_SQLITE} \
136	IF_MYSQL=${IF_MYSQL} \	146	IF_MYSQL=${IF_MYSQL} \
137	IF_MSQL=${IF_MSQL} \	147	IF_MSQL=${IF_MSQL} \
138	IF_POSTGRESQL=${IF_POSTGRESQL} \	148	IF_POSTGRESQL=${IF_POSTGRESQL} \
Lines 141-146 Link Here
141	IF_INTERBASE=${IF_INTERBASE} \	151	IF_INTERBASE=${IF_INTERBASE} \
142	IF_GTK=${IF_GTK}	152	IF_GTK=${IF_GTK}
143		153
		154	REPLACE_DOC= "$$(MAKE) -C doc install"
		155
144	# --with-sybase-prefix Location of Sybase	156	# --with-sybase-prefix Location of Sybase
145	# --with-oracle-home Location of Oracle	157	# --with-oracle-home Location of Oracle
146	# --with-interbase-prefix Location of Interbase	158	# --with-interbase-prefix Location of Interbase
Lines 148-187 Link Here
148		160
149	.include <bsd.port.pre.mk>	161	.include <bsd.port.pre.mk>
150		162
151	.if ${OSVERSION} < 500000
152	BROKEN= "Broken pkg-plist"
153	.else
154	BROKEN= "Does not compile on 5.x"
155	.endif
156	DEPRECATED= ${BROKEN}
157	EXPIRATION_DATE=2004-06-18
158
159	.if ${OSVERSION} >= 500000	163	.if ${OSVERSION} >= 500000
160	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-*	164	EXTRA[_PATCHES= ${PATCHDIR}/extra-patch-*
161		165
162	PLIST_SUB+= PROFILE="@comment "	166	PLIST_SUB+= PROFILE="@comment "
163	.else	167	.else
164	PLIST_SUB+= PROFILE=""	168	PLIST_SUB+= PROFILE=""
165	.endif	169	.endif
166		170
167	post-extract:	171	pre-configure:
168	${MKDIR} ${WRKDIR}/prefixes/libxml	172	.for fich in configure init/Makefile
169	${LN} -s ${LOCALBASE}/include/libxml2 ${WRKDIR}/prefixes/libxml/include	173	@${REINPLACE_CMD} -E \
170	${LN} -s ${LOCALBASE}/lib ${WRKDIR}/prefixes/libxml/lib	174	-e 's,/usr/local[[:>:]],${LOCALBASE},g;' \
171		175	${WRKSRC}/${fich}
172	post-patch:	176	.endfor
173	${REINPLACE_CMD} -E \	177	.for fich in ${MAN2PATCH}
174	-e 's,/usr/local[[:>:]],${PREFIX},g;' \	178	@${REINPLACE_CMD} -e 's,sqlrelay.config,sqlrelay.conf,' \
175	-e 's,[[:<:]]gtk-config[[:>:]],${GTK_CONFIG:T},g;' \	179	-e 's,sqlrelay/sqlrelay.conf,sqlrelay.conf,' \
176	${WRKSRC}/configure	180	-e 's,/etc/sqlrelay,${PREFIX}/etc/sqlrelay,' \
177	${REINPLACE_CMD} -E \	181	${WRKSRC}/man/${fich}
178	-e 's,\.so\.\$$\(SQLR_VERSION\),\.so\.$$(basename $$(SQLR_VERSION)),g;' \	182	.endfor
179	${WRKSRC}/src/api/c/src/Makefile \	183	.if defined(NOPORTDOCS)
180	${WRKSRC}/src/api/c++/src/Makefile	184	@${REINPLACE_CMD} -e 's,${REPLACE_DOC},#${REPLACE_DOC},' ${WRKSRC}/Makefile
181
182	post-install:
183	.if !defined(NOPORTDOCS)
184	cd ${WRKSRC} && ${MAKE} install-doc
185	.endif	185	.endif
186		186
187	.include <bsd.port.post.mk>	187	.include <bsd.port.post.mk>

Lines 1-14 Link Here

(-)databases/sqlrelay/files/patch-Makefile (-14 lines)
1	--- Makefile.orig Wed Oct 17 06:20:48 2001
2	+++ Makefile Sun Feb 24 01:42:57 2002
3	@@ -24,9 +24,10 @@
4
5	install:
6	cd bin; $(MAKE) install
7	- cd doc; $(MAKE) install
8	cd etc; $(MAKE) install
9	cd src; $(MAKE) install
10	+install-doc:
11	+ cd doc; $(MAKE) install
12
13	uninstall:
14	cd bin; $(MAKE) uninstall

Lines 1-18 Link Here

(-)databases/sqlrelay/files/patch-config.mk.in (-9 / +10 lines)
1	--- config.mk.in.orig Thu Oct 18 11:54:14 2001	1	--- config.mk.in.orig Tue Dec 30 18:17:23 2003
2	+++ config.mk.in Sun Feb 24 01:49:43 2002	2	+++ config.mk.in Tue May 11 00:03:26 2004
3	@@ -8,13 +8,13 @@	3	@@ -14,14 +14,14 @@
4	exec_prefix= @exec_prefix@	4	exec_prefix= @exec_prefix@
5	incdir = @includedir@	5	includedir = @includedir@
6	libdir = @libdir@	6	libdir = @libdir@
7	-javadir = ${exec_prefix}/java	7	-javadir = ${exec_prefix}/java
8	+javadir = ${exec_prefix}/share/java/classes	8	+javadir = @exec_prefix@/share/java/classes
9	libexecdir = @libexecdir@	9	libexecdir = @libexecdir@
10	bindir = @bindir@	10	bindir = @bindir@
11	localstatedir = @localstatedir@	11	localstatedir = @localstatedir@
12	sysconfdir = @sysconfdir@	12	sysconfdir = @sysconfdir@
13	localstatedir = @localstatedir@	13	mandir = @mandir@
14	-docdir = ${prefix}/doc/sqlrelay	14	datadir = @datadir@
15	+docdir = ${prefix}/share/doc/sqlrelay	15	-docdir = ${datadir}/doc/sqlrelay
		16	+docdir = @exec_prefix@/share/doc/sqlrelay
16	tmpdir = ${localstatedir}/sqlrelay/tmp	17	tmpdir = ${localstatedir}/sqlrelay/tmp
17	cachedir = ${localstatedir}/sqlrelay/cache	18	cachedir = ${localstatedir}/sqlrelay/cache
18		19	debugdir = ${localstatedir}/sqlrelay/debug

Lines 1-115 Link Here

(-)databases/sqlrelay/files/patch-configure (-106 / +127 lines)
1	--- configure.orig Mon Apr 15 14:23:31 2002	1	--- configure.orig Mon Dec 22 00:27:22 2003
2	+++ configure Thu Nov 21 19:00:36 2002	2	+++ configure Wed May 12 00:17:59 2004
3	@@ -1705,7 +1705,7 @@	3	@@ -1566,7 +1566,7 @@
4	fi	4	enableval="$enable_debug"
5	if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then	5	CFLAGS="-g -pg -Wall"; CXXFLAGS="-g -pg -fno-exceptions -Wall"; INSTALLSTRIP=""
6	echo "$ac_t""yes" 1>&6
7	- HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH"
8	+ HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH/include"
9	else	6	else
10	echo "$ac_t""no" 1>&6	7	- CFLAGS="-fomit-frame-pointer -Wall"; CXXFLAGS="-fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
		8	+ CFLAGS="${CFLAGS} -fomit-frame-pointer -Wall"; CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
		9	fi;
11		10
12	@@ -1784,7 +1784,7 @@
13	fi
14	if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
15	echo "$ac_t""yes" 1>&6
16	- HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH"
17	+ HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH/include"
18	else
19	echo "$ac_t""no" 1>&6
20		11
21	@@ -7314,7 +7314,7 @@	12	@@ -19114,6 +19114,7 @@
22	fi	13
23	if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then	14	# This can be used to rebuild libtool when needed
24	echo "$ac_t""yes" 1>&6	15	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
25	- INTERBASELIBSPATH="$INTERBASPATH/lib"; INTERBASELIBS="-L$INTERBASEPATH/lib -lgds -lcrypt"	16	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
26	+ INTERBASELIBSPATH="$INTERBASEPATH/lib"; INTERBASELIBS="-L$INTERBASEPATH/lib -lgds -lcrypt"	17
		18	# Always use our own libtool.
		19	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
		20	@@ -19395,8 +19396,8 @@
		21
		22
		23	HAVE_PTHREAD=""
		24	-PTHREADINCLUDES=""
		25	-PTHREADLIBS=""
		26	+#PTHREADINCLUDES=""
		27	+#PTHREADLIBS=""
		28
		29	if ( test "$cross_compiling" = "yes" )
		30	then
		31	@@ -36695,7 +36696,7 @@
		32	if ( test -n "$FOUNDHEADER" -a -n "$FOUNDLIB" )
		33	then
		34	eval "INTERBASEINCLUDES=\"-I$INTERBASEPATH/include\""
		35	- eval "INTERBASELIBSPATH=\"$INTERBASPATH/lib\"; INTERBASELIBS=\"-L$INTERBASEPATH/lib -lgds -lcrypt\""
		36	+ eval "INTERBASELIBSPATH=\"$INTERBASEPATH/lib\"; INTERBASELIBS=\"-L$INTERBASEPATH/lib -lgds -lcrypt\""
		37	fi
27	else	38	else
28	echo "$ac_t""no" 1>&6	39	if ( test -n "$INTERBASEPATH/lib/libgds.a" -a -n "INTERBASELIBS=\"-L$INTERBASEPATH/lib -lgds -lcrypt\"; INTERBASESTATIC=\"$STATICFLAG\"" )
		40	@@ -36804,8 +36805,8 @@
		41	LINKFAIL=""
		42	if ( test -n "$INTERBASESTATIC" -a -n "$INTERBASELIBS" )
		43	then
		44	- echo "$as_me:$LINENO: checking if Interbase can be statically linked without $DLLIB" >&5
		45	-echo $ECHO_N "checking if Interbase can be statically linked without $DLLIB... $ECHO_C" >&6
		46	+ echo "$as_me:$LINENO: checking if Interbase can be statically linked without -lcrypt" >&5
		47	+echo $ECHO_N "checking if Interbase can be statically linked without -lcrypt... $ECHO_C" >&6
		48
		49	SAVECPPFLAGS="$CPPFLAGS"
		50	SAVELIBS="$LIBS"
		51	@@ -36868,16 +36869,16 @@
		52	LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
		53	export LD_LIBRARY_PATH
29		54
30	@@ -7403,8 +7403,8 @@	55	- if ( test -n "$LINKFAIL" -a -n "$DLLIB" )
		56	+ if ( test -n "$LINKFAIL" )
		57	then
		58	- echo "$as_me:$LINENO: checking if Interbase can be statically linked with $DLLIB" >&5
		59	-echo $ECHO_N "checking if Interbase can be statically linked with $DLLIB... $ECHO_C" >&6
		60	+ echo "$as_me:$LINENO: checking if Interbase can be statically linked with -lcrypt" >&5
		61	+echo $ECHO_N "checking if Interbase can be statically linked with -lcrypt... $ECHO_C" >&6
31		62
32	LINKFAIL=""	63	SAVECPPFLAGS="$CPPFLAGS"
33	if ( test -n "$INTERBASESTATIC" -a -n "$INTERBASELIBS" ); then	64	SAVELIBS="$LIBS"
34	- echo $ac_n "checking if Interbase can be statically linked without $DLLIB""... $ac_c" 1>&6	65	SAVE_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
35	-echo "configure:7408: checking if Interbase can be statically linked without $DLLIB" >&5	66	CPPFLAGS="$INTERBASESTATIC $INTERBASEINCLUDES"
36	+ echo $ac_n "checking if Interbase can be statically linked without -lcrypt""... $ac_c" 1>&6	67	-LIBS="$INTERBASELIBS $SOCKETLIB $DLLIB"
37	+echo "configure:7408: checking if Interbase can be statically linked without -lcrypt" >&5	68	+LIBS="$INTERBASELIBS $SOCKETLIB -lcrypt"
38	TEMPCPPFLAGS="$CPPFLAGS"	69	LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
39	CPPFLAGS="$INTERBASESTATIC $INTERBASEINCLUDES"	70	export LD_LIBRARY_PATH
40	LIBS="$INTERBASELIBS $SOCKETLIB"	71	cat >conftest.$ac_ext <<_ACEOF
41	@@ -7429,12 +7429,12 @@	72	@@ -36919,7 +36920,7 @@
42	rm -f conftest*	73	echo "$as_me:$LINENO: \$? = $ac_status" >&5
43	LIBS=""	74	(exit $ac_status); }; }; then
44	CPPFLAGS="$TEMPCPPFLAGS"	75	echo "$as_me:$LINENO: result: yes" >&5
45	- if ( test -n "$LINKFAIL" -a -n "$DLLIB" ); then	76	-echo "${ECHO_T}yes" >&6; INTERBASELIBS="$INTERBASELIBS $DLLIB"; LINKFAIL="";
46	- echo $ac_n "checking if Interbase can be statically linked with $DLLIB""... $ac_c" 1>&6	77	+echo "${ECHO_T}yes" >&6; INTERBASELIBS="$INTERBASELIBS -lcrypt"; LINKFAIL="";
47	-echo "configure:7435: checking if Interbase can be statically linked with $DLLIB" >&5
48	+ if ( test -n "$LINKFAIL" ); then
49	+ echo $ac_n "checking if Interbase can be statically linked with -lcrypt""... $ac_c" 1>&6
50	+echo "configure:7435: checking if Interbase can be statically linked with -lcrypt" >&5
51	TEMPCPPFLAGS="$CPPFLAGS"
52	CPPFLAGS="$INTERBASESTATIC $INTERBASEINCLUDES"
53	- LIBS="$INTERBASELIBS $SOCKETLIB $DLLIB"
54	+ LIBS="$INTERBASELIBS $SOCKETLIB -lcrypt"
55	cat > conftest.$ac_ext <<EOF
56	#line 7440 "configure"
57	#include "confdefs.h"
58	@@ -7446,7 +7446,7 @@
59	EOF
60	if { (eval echo configure:7448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61	rm -rf conftest*
62	- echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS $DLLIB"; LINKFAIL="";
63	+ echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS -lcrypt"; LINKFAIL="";
64	else	78	else
65	echo "configure: failed program was:" >&5	79	echo "$as_me: failed program was:" >&5
66	cat conftest.$ac_ext >&5	80	sed 's/^/\| /' conftest.$ac_ext >&5
67	@@ -7463,8 +7463,8 @@	81	@@ -36939,8 +36940,8 @@
68	if ( test -n "$RPATHFLAG" -a -n "$INTERBASELIBSPATH" ); then	82
69	INTERBASELIBS="-Wl,-rpath $INTERBASELIBSPATH $INTERBASELIBS"	83	if ( test -z "$INTERBASESTATIC" -a -n "$INTERBASELIBS" )
70	fi	84	then
71	- echo $ac_n "checking if Interbase can be dynamically linked without $DLLIB""... $ac_c" 1>&6	85	- echo "$as_me:$LINENO: checking if Interbase can be dynamically linked without $DLLIB" >&5
72	-echo "configure:7468: checking if Interbase can be dynamically linked without $DLLIB" >&5	86	-echo $ECHO_N "checking if Interbase can be dynamically linked without $DLLIB... $ECHO_C" >&6
73	+ echo $ac_n "checking if Interbase can be dynamically linked without -lcrypt""... $ac_c" 1>&6	87	+ echo "$as_me:$LINENO: checking if Interbase can be dynamically linked without -lcrypt" >&5
74	+echo "configure:7468: checking if Interbase can be dynamically linked without -lcrypt" >&5	88	+echo $ECHO_N "checking if Interbase can be dynamically linked without -lcrypt... $ECHO_C" >&6
75	TEMPCPPFLAGS="$CPPFLAGS"	89
76	CPPFLAGS="$INTERBASEINCLUDES"	90	SAVECPPFLAGS="$CPPFLAGS"
77	LIBS="$INTERBASELIBS $SOCKETLIB"	91	SAVELIBS="$LIBS"
78	@@ -7489,12 +7489,12 @@	92	@@ -37003,16 +37004,16 @@
79	rm -f conftest*	93	LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
80	LIBS=""	94	export LD_LIBRARY_PATH
81	CPPFLAGS="$TEMPCPPFLAGS"	95
82	- if ( test -n "$LINKFAIL" -a -n "$DLLIB" ); then	96	- if ( test -n "$LINKFAIL" -a -n "$DLLIB" )
83	- echo $ac_n "checking if Interbase can be dynamically linked with $DLLIB""... $ac_c" 1>&6	97	+ if ( test -n "$LINKFAIL" )
84	-echo "configure:7495: checking if Interbase can be dynamically linked with $DLLIB" >&5	98	then
85	+ if ( test -n "$LINKFAIL" ); then	99	- echo "$as_me:$LINENO: checking if Interbase can be dynamically linked with $DLLIB" >&5
86	+ echo $ac_n "checking if Interbase can be dynamically linked with -lcrypt""... $ac_c" 1>&6	100	-echo $ECHO_N "checking if Interbase can be dynamically linked with $DLLIB... $ECHO_C" >&6
87	+echo "configure:7495: checking if Interbase can be dynamically linked with -lcrypt" >&5	101	+ echo "$as_me:$LINENO: checking if Interbase can be dynamically linked with -lcrypt" >&5
88	TEMPCPPFLAGS="$CPPFLAGS"	102	+echo $ECHO_N "checking if Interbase can be dynamically linked with -lcrypt $ECHO_C" >&6
89	CPPFLAGS="$INTERBASEINCLUDES"	103
90	- LIBS="$INTERBASELIBS $SOCKETLIB $DLLIB"	104	SAVECPPFLAGS="$CPPFLAGS"
91	+ LIBS="$INTERBASELIBS $SOCKETLIB -lcrypt"	105	SAVELIBS="$LIBS"
92	cat > conftest.$ac_ext <<EOF	106	SAVE_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
93	#line 7500 "configure"	107	CPPFLAGS="$INTERBASEINCLUDES"
94	#include "confdefs.h"	108	-LIBS="$INTERBASELIBS $SOCKETLIB $DLLIB"
95	@@ -7506,7 +7506,7 @@	109	+LIBS="$INTERBASELIBS $SOCKETLIB -lcrypt"
96	EOF	110	LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
97	if { (eval echo configure:7508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then	111	export LD_LIBRARY_PATH
98	rm -rf conftest*	112	cat >conftest.$ac_ext <<_ACEOF
99	- echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS $DLLIB"; LINKFAIL=""	113	@@ -37054,7 +37055,7 @@
100	+ echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS -lcrypt"; LINKFAIL=""	114	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		115	(exit $ac_status); }; }; then
		116	echo "$as_me:$LINENO: result: yes" >&5
		117	-echo "${ECHO_T}yes" >&6; INTERBASELIBS="$INTERBASELIBS $DLLIB"; LINKFAIL=""
		118	+echo "${ECHO_T}yes" >&6; INTERBASELIBS="$INTERBASELIBS -lcrypt"; LINKFAIL=""
101	else	119	else
102	echo "configure: failed program was:" >&5	120	echo "$as_me: failed program was:" >&5
103	cat conftest.$ac_ext >&5	121	sed 's/^/\| /' conftest.$ac_ext >&5
104	@@ -8122,10 +8122,7 @@	122	@@ -37573,13 +37574,7 @@
105	fi	123
106		124	if ( test -n "$JAVAINCLUDES" )
107	if ( test -n "$JAVAINCLUDES"); then	125	then
108	- for i in `ls -l $JAVAPATH/include \| grep drw \| awk '{print $9}'`	126	- for i in `ls -d $JAVAPATH/include/*`
109	- do	127	- do
110	- JAVAINCLUDES="$JAVAINCLUDES -I$JAVAPATH/include/$i"	128	- if ( test -d "$i" )
111	- done	129	- then
112	+ JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`"	130	- JAVAINCLUDES="$JAVAINCLUDES -I$i"
113	fi	131	- fi
114	fi	132	- done
		133	+ JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`"
		134	fi
		135	fi
115		136

Line 0 Link Here

(-)databases/sqlrelay/files/patch-init+Makefile (+13 lines)
	1	--- init/Makefile.orig Tue Dec 30 00:03:08 2003
	2	+++ init/Makefile Thu May 13 00:24:23 2004
	3	@@ -38,8 +38,8 @@
	4	endif
	5	ifeq ($(UNAME),FreeBSD)
	6	$(MKINSTALLDIRS) $(initroot)/usr/local/etc/rc.d
	7	- $(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d
	8	- $(INSTALL) -m 644 freebsd/sqlrelay $(initroot)/etc
	9	+ $(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d/sqlrelay.sh.sample
	10	+ $(INSTALL) -m 644 freebsd/sqlrelay $(initroot)/usr/local/etc/sqlrelay
	11	endif
	12	ifeq ($(UNAME),SCO_SV)
	13	$(MKINSTALLDIRS) $(initroot)/etc/init.d

Line 0 Link Here

(-)databases/sqlrelay/files/patch-init+freebsd+rc.d+sqlrelay.in (+23 lines)
	1	--- init/freebsd/rc.d/sqlrelay.in.orig Sat Nov 16 07:49:32 2002
	2	+++ init/freebsd/rc.d/sqlrelay.in Thu May 13 21:37:02 2004
	3	@@ -8,7 +8,7 @@
	4	prefix=@prefix@
	5	sysconfdir=@sysconfdir@
	6
	7	-if ( test -n -r "${sysconfdir}/sqlrelay.conf" ); then
	8	+if !( test -r "${sysconfdir}/sqlrelay.conf" ); then
	9	exit 1
	10	fi
	11
	12	@@ -23,9 +23,9 @@
	13
	14	start(){
	15	echo -n $"Starting SQL Relay: "
	16	- if ( test -r "/etc/sqlrelay" ); then
	17	+ if ( test -r "${sysconfdir}/sqlrelay" ); then
	18	launched=0
	19	- for connid in `grep -v ^# /etc/sqlrelay`; do
	20	+ for connid in `grep -v ^# ${sysconfdir}/sqlrelay`; do
	21	echo
	22	echo -n $"Launching instance with id '${connid}':"
	23	sqlr-start -id ${connid} >/dev/null 2>&1

Lines 1-11 Link Here

(-)databases/sqlrelay/files/patch-src+api+java+Makefile (-9 / +9 lines)
1	--- src/api/java/Makefile.orig Sun Mar 24 09:09:19 2002	1	--- src/api/java/Makefile.orig Wed Dec 17 07:29:12 2003
2	+++ src/api/java/Makefile Mon Oct 28 02:46:52 2002	2	+++ src/api/java/Makefile Tue May 11 00:24:02 2004
3	@@ -3,7 +3,7 @@	3	@@ -2,7 +2,7 @@
4	top_srcdir = ../../..
5	INSTALL = $(top_srcdir)/install-sh -c
6		4
7	-CPPFLAGS = $(BASECPPFLAGS) -I./ -I../c++/include $(RUDIMENTSINCLUDES) $(JAVAINCLUDES)	5	include ../../../config.mk
8	+CPPFLAGS = $(JAVAINCLUDES) $(BASECPPFLAGS) -I./ -I../c++/include $(RUDIMENTSINCLUDES)
9		6
10	SRCS = SQLRConnection.C SQLRCursor.C	7	-CPPFLAGS = $(BASECPPFLAGS) -I./ -I$(top_builddir)/src/api/c++/include $(RUDIMENTSINCLUDES) $(JAVAINCLUDES)
11	OBJS = SQLRConnection.o SQLRCursor.o	8	+CPPFLAGS = $(JAVAINCLUDES) $(BASECPPFLAGS) -I./ -I$(top_builddir)/src/api/c++/include $(RUDIMENTSINCLUDES)
		9	RPATH =
		10	ifneq ($(strip $(libdir)),)
		11	ifeq ($(JAVAUSERPATH),yes)