Attachment 25582 Details for Bug 43695 – file.diff

[patch] file.diff

file.diff (text/plain), 5.37 KB, created by tkato on 2002-10-05 10:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-10-05 10:40:03 UTC

Size: 5.37 KB

patch

obsolete

>diff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile
>--- /usr/ports/databases/unixODBC/Makefile	Tue Sep 10 20:07:34 2002
>+++ databases/unixODBC/Makefile	Wed Oct  2 09:15:38 2002
>@@ -21,11 +21,11 @@
> INSTALLS_SHLIB=	yes
> 
> .if defined(WITH_GUI)
>-USE_QT_VER=	2
>+USE_QT_VER=	3
> QT_NONSTANDARD=	yes
> CONFIGURE_ENV=	MOC="${MOC}" \
>-		QTINC="${X11BASE}/include/qt2" \
>-		QTLIB="${X11BASE}/lib" \
>+		QTINC="${QT_PREFIX}/include" \
>+		QTLIB="${QT_PREFIX}/lib" \
> 		USER_INCLUDES="${QTCPPFLAGS}" \
> 		USER_LDFLAGS="${QTCFGLIBS}"
> CONFIGURE_ARGS+=	--enable-gui
>@@ -35,18 +35,14 @@
> PLIST_SUB=	GUI:="@comment "
> .endif
> 
>-.if defined(WITH_PTHREAD)
>+.if defined(WITH_PTHREAD) || defined(WITH_GUI)
> CONFIGURE_ARGS+=	--enable-threads=yes
>-QT_NAME=		qt2-mt
> .else
> CONFIGURE_ARGS+=	--enable-threads=no
>-QT_NAME=		qt2
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
>-		 s|"-lqt"|"-l${QT_NAME}"|g ; \
>-		 s|"-lqt-mt"|"-l${QT_NAME}"|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
> 
> post-install:
> .if !defined(NOPORTDOCS)
>diff -urN /usr/ports/databases/unixODBC/files/patch-DataManager::Makefile.in databases/unixODBC/files/patch-DataManager::Makefile.in
>--- /usr/ports/databases/unixODBC/files/patch-DataManager::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ databases/unixODBC/files/patch-DataManager::Makefile.in	Tue Oct  1 08:36:36 2002
>@@ -0,0 +1,11 @@
>+--- DataManager/Makefile.in.orig	Fri Aug 23 21:15:16 2002
>++++ DataManager/Makefile.in	Tue Oct  1 06:48:32 2002
>+@@ -188,7 +188,7 @@
>+ 
>+ @QT_TRUE@bin_PROGRAMS = DataManager
>+ 
>+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
>++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
>+ 
>+ @QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 
>+ 
>diff -urN /usr/ports/databases/unixODBC/files/patch-DataManagerII::Makefile.in databases/unixODBC/files/patch-DataManagerII::Makefile.in
>--- /usr/ports/databases/unixODBC/files/patch-DataManagerII::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ databases/unixODBC/files/patch-DataManagerII::Makefile.in	Tue Oct  1 08:36:57 2002
>@@ -0,0 +1,11 @@
>+--- DataManagerII/Makefile.in.orig	Fri Aug 23 21:15:18 2002
>++++ DataManagerII/Makefile.in	Tue Oct  1 06:49:39 2002
>+@@ -188,7 +188,7 @@
>+ 
>+ @QT_TRUE@bin_PROGRAMS = DataManagerII
>+ 
>+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
>++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
>+ 
>+ @QT_TRUE@DataManagerII_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 
>+ 
>diff -urN /usr/ports/databases/unixODBC/files/patch-ODBCConfig::Makefile.in databases/unixODBC/files/patch-ODBCConfig::Makefile.in
>--- /usr/ports/databases/unixODBC/files/patch-ODBCConfig::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ databases/unixODBC/files/patch-ODBCConfig::Makefile.in	Tue Oct  1 08:37:24 2002
>@@ -0,0 +1,11 @@
>+--- ODBCConfig/Makefile.in.orig	Fri Aug 23 21:15:14 2002
>++++ ODBCConfig/Makefile.in	Tue Oct  1 06:47:26 2002
>+@@ -188,7 +188,7 @@
>+ 
>+ @QT_TRUE@bin_PROGRAMS = ODBCConfig
>+ 
>+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>+ 
>+ @QT_TRUE@ODBCConfig_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../extras/libodbcextraslc.la 	../DriverManager/libodbc.la 
>+ 
>diff -urN /usr/ports/databases/unixODBC/files/patch-odbcinstQ::Makefile.in databases/unixODBC/files/patch-odbcinstQ::Makefile.in
>--- /usr/ports/databases/unixODBC/files/patch-odbcinstQ::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ databases/unixODBC/files/patch-odbcinstQ::Makefile.in	Tue Oct  1 08:37:56 2002
>@@ -0,0 +1,11 @@
>+--- odbcinstQ/Makefile.in.orig	Fri Aug 23 21:14:25 2002
>++++ odbcinstQ/Makefile.in	Tue Oct  1 06:45:53 2002
>+@@ -191,7 +191,7 @@
>+ 
>+ @QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la
>+ 
>+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>+ 
>+ @QT_TRUE@libodbcinstQ_la_LIBADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../extras/libodbcextraslc.la 	../DriverManager/libodbc.la 
>+ 
>diff -urN /usr/ports/databases/unixODBC/files/patch-odbctest::Makefile.in databases/unixODBC/files/patch-odbctest::Makefile.in
>--- /usr/ports/databases/unixODBC/files/patch-odbctest::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ databases/unixODBC/files/patch-odbctest::Makefile.in	Tue Oct  1 08:38:21 2002
>@@ -0,0 +1,11 @@
>+--- odbctest/Makefile.in.orig	Fri Aug 23 21:15:20 2002
>++++ odbctest/Makefile.in	Tue Oct  1 06:50:44 2002
>+@@ -188,7 +188,7 @@
>+ 
>+ @QT_TRUE@bin_PROGRAMS = odbctest
>+ 
>+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
>++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
>+ 
>+ @QT_TRUE@odbctest_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 	$(LIBLTDL) $(LIBADD_DL)
>+

Actions: View | Diff

Attachments on bug 43695: 25582