[Midnightbsd-cvs] mports [19833] trunk/databases/qt4-odbc-plugin: fix qt 4 odbc

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Aug 20 06:50:51 EDT 2015


Revision: 19833
          http://svnweb.midnightbsd.org/mports/?rev=19833
Author:   laffer1
Date:     2015-08-20 06:50:44 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
fix qt 4 odbc

Modified Paths:
--------------
    trunk/databases/qt4-odbc-plugin/Makefile
    trunk/databases/qt4-odbc-plugin/pkg-plist

Modified: trunk/databases/qt4-odbc-plugin/Makefile
===================================================================
--- trunk/databases/qt4-odbc-plugin/Makefile	2015-08-20 02:40:26 UTC (rev 19832)
+++ trunk/databases/qt4-odbc-plugin/Makefile	2015-08-20 10:50:44 UTC (rev 19833)
@@ -12,29 +12,29 @@
 
 DB=		odbc
 
-FAKE_OPTS=	trueprefix
+LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 
-LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
-
 USE_QT4=	moc_build sql
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
-MAKE_JOBS_SAFE=	yes
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
 EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} \
+			${DISTNAME}/src/corelib \
 			${DISTNAME}/${PLUGIN}
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
-pre-fake:
-	@${MKDIR} ${FAKE_DESTDIR}${PREFIX}/lib/qt4/plugins/sqldrivers
+EXTRA_PATCHES=	# empty
 
+SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
+	${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
+
 .include <bsd.port.mk>

Modified: trunk/databases/qt4-odbc-plugin/pkg-plist
===================================================================
--- trunk/databases/qt4-odbc-plugin/pkg-plist	2015-08-20 02:40:26 UTC (rev 19832)
+++ trunk/databases/qt4-odbc-plugin/pkg-plist	2015-08-20 10:50:44 UTC (rev 19833)
@@ -1,3 +1,5 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
- at dirrmtry %%QT_PLUGINDIR_REL%%
+ at comment $MidnightBSD: trunk/Mk/components/maintainer.mk 19605 2015-07-16 01:41:42Z laffer1 $
+%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so
+ at dirrm %%QT_PLUGINDIR%%/sqldrivers
+ at dirrm %%QT_PLUGINDIR%%
+ at dirrm %%QT_LIBDIR%%



More information about the Midnightbsd-cvs mailing list