Attachment #25582 for bug #43695

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




INSTALLS_SHLIB=	yes

.if defined(WITH_GUI)
USE_QT_VER=	3
QT_NONSTANDARD=	yes
CONFIGURE_ENV=	MOC="${MOC}" \
		QTINC="${QT_PREFIX}/include" \
		QTLIB="${QT_PREFIX}/lib" \
		USER_INCLUDES="${QTCPPFLAGS}" \
		USER_LDFLAGS="${QTCFGLIBS}"
CONFIGURE_ARGS+=	--enable-gui

PLIST_SUB=	GUI:="@comment "
.endif

.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' ${WRKSRC}/configure
		 s|"-lqt"|"-l${QT_NAME}"|g ; \
		 s|"-lqt-mt"|"-l${QT_NAME}"|g' ${WRKSRC}/configure

post-install:
.if !defined(NOPORTDOCS)

Line 0 Link Here

(-)databases/unixODBC/files/patch-DataManager::Makefile.in (+11 lines)
	1	--- DataManager/Makefile.in.orig Fri Aug 23 21:15:16 2002
	2	+++ DataManager/Makefile.in Tue Oct 1 06:48:32 2002
	3	@@ -188,7 +188,7 @@
	4
	5	@QT_TRUE@bin_PROGRAMS = DataManager
	6
	7	-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
	8	+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@
	9
	10	@QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../DriverManager/libodbc.la
	11

Line 0 Link Here

(-)databases/unixODBC/files/patch-DataManagerII::Makefile.in (+11 lines)
	1	--- DataManagerII/Makefile.in.orig Fri Aug 23 21:15:18 2002
	2	+++ DataManagerII/Makefile.in Tue Oct 1 06:49:39 2002
	3	@@ -188,7 +188,7 @@
	4
	5	@QT_TRUE@bin_PROGRAMS = DataManagerII
	6
	7	-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
	8	+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@
	9
	10	@QT_TRUE@DataManagerII_LDADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../DriverManager/libodbc.la
	11

Line 0 Link Here

(-)databases/unixODBC/files/patch-ODBCConfig::Makefile.in (+11 lines)
	1	--- ODBCConfig/Makefile.in.orig Fri Aug 23 21:15:14 2002
	2	+++ ODBCConfig/Makefile.in Tue Oct 1 06:47:26 2002
	3	@@ -188,7 +188,7 @@
	4
	5	@QT_TRUE@bin_PROGRAMS = ODBCConfig
	6
	7	-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
	8	+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
	9
	10	@QT_TRUE@ODBCConfig_LDADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../extras/libodbcextraslc.la ../DriverManager/libodbc.la
	11

Line 0 Link Here

(-)databases/unixODBC/files/patch-odbcinstQ::Makefile.in (+11 lines)
	1	--- odbcinstQ/Makefile.in.orig Fri Aug 23 21:14:25 2002
	2	+++ odbcinstQ/Makefile.in Tue Oct 1 06:45:53 2002
	3	@@ -191,7 +191,7 @@
	4
	5	@QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la
	6
	7	-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
	8	+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
	9
	10	@QT_TRUE@libodbcinstQ_la_LIBADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../extras/libodbcextraslc.la ../DriverManager/libodbc.la
	11

Line 0 Link Here

(-)databases/unixODBC/files/patch-odbctest::Makefile.in (+11 lines)
	1	--- odbctest/Makefile.in.orig Fri Aug 23 21:15:20 2002
	2	+++ odbctest/Makefile.in Tue Oct 1 06:50:44 2002
	3	@@ -188,7 +188,7 @@
	4
	5	@QT_TRUE@bin_PROGRAMS = odbctest
	6
	7	-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
	8	+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
	9
	10	@QT_TRUE@odbctest_LDADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../DriverManager/libodbc.la $(LIBLTDL) $(LIBADD_DL)
	11

Return to bug 43695

Lines 21-31 Link Here

(-)databases/unixODBC/Makefile (-9 / +5 lines)
21	INSTALLS_SHLIB= yes	21	INSTALLS_SHLIB= yes
22		22
23	.if defined(WITH_GUI)	23	.if defined(WITH_GUI)
24	USE_QT_VER= 2	24	USE_QT_VER= 3
25	QT_NONSTANDARD= yes	25	QT_NONSTANDARD= yes
26	CONFIGURE_ENV= MOC="${MOC}" \	26	CONFIGURE_ENV= MOC="${MOC}" \
27	QTINC="${X11BASE}/include/qt2" \	27	QTINC="${QT_PREFIX}/include" \
28	QTLIB="${X11BASE}/lib" \	28	QTLIB="${QT_PREFIX}/lib" \
29	USER_INCLUDES="${QTCPPFLAGS}" \	29	USER_INCLUDES="${QTCPPFLAGS}" \
30	USER_LDFLAGS="${QTCFGLIBS}"	30	USER_LDFLAGS="${QTCFGLIBS}"
31	CONFIGURE_ARGS+= --enable-gui	31	CONFIGURE_ARGS+= --enable-gui
Lines 35-52 Link Here
35	PLIST_SUB= GUI:="@comment "	35	PLIST_SUB= GUI:="@comment "
36	.endif	36	.endif
37		37
38	.if defined(WITH_PTHREAD)	38	.if defined(WITH_PTHREAD) \|\| defined(WITH_GUI)
39	CONFIGURE_ARGS+= --enable-threads=yes	39	CONFIGURE_ARGS+= --enable-threads=yes
40	QT_NAME= qt2-mt
41	.else	40	.else
42	CONFIGURE_ARGS+= --enable-threads=no	41	CONFIGURE_ARGS+= --enable-threads=no
43	QT_NAME= qt2
44	.endif	42	.endif
45		43
46	post-patch:	44	post-patch:
47	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g ; \	45	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure
48	s\|"-lqt"\|"-l${QT_NAME}"\|g ; \
49	s\|"-lqt-mt"\|"-l${QT_NAME}"\|g' ${WRKSRC}/configure
50		46
51	post-install:	47	post-install:
52	.if !defined(NOPORTDOCS)	48	.if !defined(NOPORTDOCS)