From a45da9a0272ff4fbec55a72637b1d10a2631d5b4 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Mon, 5 May 2014 22:50:59 +0000 Subject: Convert archivers/libzip to USES=libtool. Bump PORTREVISION on all dependent ports. cad/repsnapper: - Remove excessive dependencies. - Convert to USES=libtool. - Set LDFLAGS to fix detection of libintl. - Use @sample. databases/mysql-workbench51: - Remove remnants of former slave ports. - Convert some LIB_DEPENDS to USE_GNOME. - Convert to USES=libtool. - Staging. databases/mysql-workbench52: - USES=libtool. devel/libsigrok: - USES=libtool. - INSTALL_TARGET=install-strip. devel/liborcus: - USES=libtool tar:bzip2. --- databases/mysql-workbench51/Makefile | 55 ++++++++++------------ .../files/extra-51-modules__wb.utils__Makefile.am | 10 ---- .../mysql-workbench51/files/patch-configure.in | 3 +- .../files/patch-modules__wb.utils__Makefile.am | 10 ++++ databases/mysql-workbench51/pkg-plist | 52 ++++++++++---------- 5 files changed, 62 insertions(+), 68 deletions(-) delete mode 100644 databases/mysql-workbench51/files/extra-51-modules__wb.utils__Makefile.am create mode 100644 databases/mysql-workbench51/files/patch-modules__wb.utils__Makefile.am (limited to 'databases/mysql-workbench51') diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile index 4a39006350fc..3df34d2372fb 100644 --- a/databases/mysql-workbench51/Makefile +++ b/databases/mysql-workbench51/Makefile @@ -2,51 +2,39 @@ # $FreeBSD$ PORTNAME= mysql-workbench-oss -PORTVERSION?= 5.1.16 -PORTREVISION= 9 +PORTVERSION= 5.1.16 +PORTREVISION= 10 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQLGUITools -PKGNAMESUFFIX?= 51 +PKGNAMESUFFIX= 51 MAINTAINER= ports@FreeBSD.org COMMENT= The MySQL Workbench -LIB_DEPENDS+= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ - libpcre.so:${PORTSDIR}/devel/pcre \ - libxml2.so:${PORTSDIR}/textproc/libxml2 \ +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ - libzip.so:${PORTSDIR}/archivers/libzip \ - libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \ - libcairo.so:${PORTSDIR}/graphics/cairo + libzip.so:${PORTSDIR}/archivers/libzip MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= PYTHON -USE_AUTOTOOLS= autoheader autoconf automake aclocal libtool -AUTOMAKE_ARGS= --add-missing --foreign -ACLOCAL_ARGS= -AUTOCONF_ARGS= +USE_AUTOTOOLS= libtoolize aclocal autoconf autoheader automake +ACLOCAL_ARGS= -I m4 +AUTOMAKE_ARGS= -a -c -f --foreign +LIBTOOLIZE_ARGS=-i -c -f USE_LDCONFIG= ${PREFIX}/lib/mysql-workbench -SUBDIRS= ext/yassl/taocrypt ext/yassl . -AUTOTOOLSFILES= configure.in +SUBDIRS= ext/yassl/taocrypt ext/yassl ext/ctemplate/ctemplate-src . -USES= dos2unix +USES= dos2unix libtool DOS2UNIX_REGEX= .*ext/yassl/.*(Makefile.am|configure.in) -USE_GL= gl glu -USE_GNOME= libglade2 intltool libgnome gtk20 pango orbit2 +USE_GL= gl +USE_GNOME= cairo gtkmm24 libglade2 libgnome libsigc++20 libxml2 USE_LUA= 5.1 LUA_COMPS= lua -NO_STAGE= yes -.include - -.if ${PKGNAMESUFFIX} == 51 -CONFLICTS= mysql-workbench-oss52* -EXTRA_PATCHES= ${PATCHDIR}/extra-51-modules__wb.utils__Makefile.am -.endif - +CONFLICTS= mysql-workbench-gpl* DATADIR= ${PREFIX}/share/mysql-workbench CXXFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} @@ -58,6 +46,8 @@ USE_MYSQL= client DEFAULT_MYSQL_VER= 51 IGNORE_WITH_MYSQL= 55 +.include + .if ${PORT_OPTIONS:MPYTHON} CONFIGURE_ARGS+= --enable-python-modules .endif @@ -75,6 +65,12 @@ post-patch: ${WRKSRC}/plugins/wb.printing/backend/stdafx.h \ ${WRKSRC}/plugins/db.mysql/backend/db_plugin_be.cpp +run-autotools-libtoolize: +.for dir in ${SUBDIRS} + @(cd ${WRKSRC}/${dir} && \ + ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} ${LIBTOOLIZE_ARGS}) +.endfor + run-autotools-aclocal: .for dir in ${SUBDIRS} @(cd ${WRKSRC}/${dir} && \ @@ -83,9 +79,8 @@ run-autotools-aclocal: run-autotools-autoheader: .for dir in ${SUBDIRS} - @(cd ${WRKSRC}/${dir} && if ${GREP} "^AM_CONFIG_HEADER" configure.in \ - >/dev/null; then ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \ - ${AUTOHEADER_ARGS}; fi) + @(cd ${WRKSRC}/${dir} && \ + ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} ${AUTOHEADER_ARGS}) .endfor run-autotools-automake: @@ -100,4 +95,4 @@ run-autotools-autoconf: ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} ${AUTOCONF_ARGS}) .endfor -.include +.include diff --git a/databases/mysql-workbench51/files/extra-51-modules__wb.utils__Makefile.am b/databases/mysql-workbench51/files/extra-51-modules__wb.utils__Makefile.am deleted file mode 100644 index 3469f92d9c1f..000000000000 --- a/databases/mysql-workbench51/files/extra-51-modules__wb.utils__Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/wb.utils/Makefile.am.orig 2009-06-29 14:51:26.000000000 -0700 -+++ modules/wb.utils/Makefile.am 2012-04-17 13:39:25.000000000 -0700 -@@ -1,5 +1,5 @@ - --pkglibdir=$(libdir)/@PACKAGE@/modules -+wbutilsdir=$(libdir)/@PACKAGE@/modules - --pkglib_DATA=catalog_utils.grt.lua table_utils.grt.lua tools.grt.lua wb_utils_grt.py -+wbutils_DATA=catalog_utils.grt.lua table_utils.grt.lua tools.grt.lua wb_utils_grt.py - diff --git a/databases/mysql-workbench51/files/patch-configure.in b/databases/mysql-workbench51/files/patch-configure.in index 74e96697a61c..7453b98e36a5 100644 --- a/databases/mysql-workbench51/files/patch-configure.in +++ b/databases/mysql-workbench51/files/patch-configure.in @@ -1,11 +1,10 @@ --- configure.in.orig 2009-06-26 03:33:18.000000000 +0300 +++ configure.in 2009-06-26 20:42:05.000000000 +0300 -@@ -422,7 +422,7 @@ +@@ -422,7 +422,6 @@ ( cd ./ext/ctemplate/ctemplate-src && - autoreconf -i -s; -+ %%AUTORECONF%% -i; ./configure --prefix=$prefix --libdir=$libdir/mysql-workbench --disable-dependency-tracking ) diff --git a/databases/mysql-workbench51/files/patch-modules__wb.utils__Makefile.am b/databases/mysql-workbench51/files/patch-modules__wb.utils__Makefile.am new file mode 100644 index 000000000000..3469f92d9c1f --- /dev/null +++ b/databases/mysql-workbench51/files/patch-modules__wb.utils__Makefile.am @@ -0,0 +1,10 @@ +--- modules/wb.utils/Makefile.am.orig 2009-06-29 14:51:26.000000000 -0700 ++++ modules/wb.utils/Makefile.am 2012-04-17 13:39:25.000000000 -0700 +@@ -1,5 +1,5 @@ + +-pkglibdir=$(libdir)/@PACKAGE@/modules ++wbutilsdir=$(libdir)/@PACKAGE@/modules + +-pkglib_DATA=catalog_utils.grt.lua table_utils.grt.lua tools.grt.lua wb_utils_grt.py ++wbutils_DATA=catalog_utils.grt.lua table_utils.grt.lua tools.grt.lua wb_utils_grt.py + diff --git a/databases/mysql-workbench51/pkg-plist b/databases/mysql-workbench51/pkg-plist index f93e405a7b54..67ca0528b527 100644 --- a/databases/mysql-workbench51/pkg-plist +++ b/databases/mysql-workbench51/pkg-plist @@ -2,113 +2,113 @@ bin/grtshell bin/mysql-workbench bin/mysql-workbench-bin lib/mysql-workbench/libcdbc.a -lib/mysql-workbench/libcdbc.la lib/mysql-workbench/libcdbc.so lib/mysql-workbench/libcdbc.so.0 +lib/mysql-workbench/libcdbc.so.0.0.0 lib/mysql-workbench/libctemplate_wb.a -lib/mysql-workbench/libctemplate_wb.la lib/mysql-workbench/libctemplate_wb.so lib/mysql-workbench/libctemplate_wb.so.0 +lib/mysql-workbench/libctemplate_wb.so.0.0.0 lib/mysql-workbench/libgrt.a -lib/mysql-workbench/libgrt.la lib/mysql-workbench/libgrt.so lib/mysql-workbench/libgrt.so.0 +lib/mysql-workbench/libgrt.so.0.0.0 lib/mysql-workbench/libguiutil.a -lib/mysql-workbench/libguiutil.la lib/mysql-workbench/libguiutil.so lib/mysql-workbench/libguiutil.so.0 +lib/mysql-workbench/libguiutil.so.0.0.0 lib/mysql-workbench/liblinux_utilities.a -lib/mysql-workbench/liblinux_utilities.la lib/mysql-workbench/liblinux_utilities.so lib/mysql-workbench/liblinux_utilities.so.0 +lib/mysql-workbench/liblinux_utilities.so.0.0.0 lib/mysql-workbench/libmdcanvas.a -lib/mysql-workbench/libmdcanvas.la lib/mysql-workbench/libmdcanvas.so lib/mysql-workbench/libmdcanvas.so.0 +lib/mysql-workbench/libmdcanvas.so.0.0.0 lib/mysql-workbench/libmdcanvasgtk.a -lib/mysql-workbench/libmdcanvasgtk.la lib/mysql-workbench/libmdcanvasgtk.so lib/mysql-workbench/libmdcanvasgtk.so.0 +lib/mysql-workbench/libmdcanvasgtk.so.0.0.0 lib/mysql-workbench/libmforms.a -lib/mysql-workbench/libmforms.la lib/mysql-workbench/libmforms.so lib/mysql-workbench/libmforms.so.0 +lib/mysql-workbench/libmforms.so.0.0.0 lib/mysql-workbench/libsqlide.a -lib/mysql-workbench/libsqlide.la lib/mysql-workbench/libsqlide.so lib/mysql-workbench/libsqlide.so.0 +lib/mysql-workbench/libsqlide.so.0.0.0 lib/mysql-workbench/libsqlparser.a -lib/mysql-workbench/libsqlparser.la lib/mysql-workbench/libsqlparser.so lib/mysql-workbench/libsqlparser.so.0 +lib/mysql-workbench/libsqlparser.so.0.0.0 lib/mysql-workbench/libwbpublic.a -lib/mysql-workbench/libwbpublic.la lib/mysql-workbench/libwbpublic.so lib/mysql-workbench/libwbpublic.so.0 +lib/mysql-workbench/libwbpublic.so.0.0.0 lib/mysql-workbench/libwbscintilla.a -lib/mysql-workbench/libwbscintilla.la lib/mysql-workbench/libwbscintilla.so lib/mysql-workbench/libwbscintilla.so.0 +lib/mysql-workbench/libwbscintilla.so.0.0.0 lib/mysql-workbench/modules/catalog_utils.grt.lua lib/mysql-workbench/modules/db.mysql.grt.a -lib/mysql-workbench/modules/db.mysql.grt.la lib/mysql-workbench/modules/db.mysql.grt.so lib/mysql-workbench/modules/db.mysql.grt.so.0 +lib/mysql-workbench/modules/db.mysql.grt.so.0.0.0 lib/mysql-workbench/modules/db.mysql.sqlparser.grt.a -lib/mysql-workbench/modules/db.mysql.sqlparser.grt.la lib/mysql-workbench/modules/db.mysql.sqlparser.grt.so lib/mysql-workbench/modules/db.mysql.sqlparser.grt.so.0 +lib/mysql-workbench/modules/db.mysql.sqlparser.grt.so.0.0.0 lib/mysql-workbench/modules/dbutils.grt.a -lib/mysql-workbench/modules/dbutils.grt.la lib/mysql-workbench/modules/dbutils.grt.so lib/mysql-workbench/modules/dbutils.grt.so.0 +lib/mysql-workbench/modules/dbutils.grt.so.0.0.0 lib/mysql-workbench/modules/forms.grt.a -lib/mysql-workbench/modules/forms.grt.la lib/mysql-workbench/modules/forms.grt.so lib/mysql-workbench/modules/forms.grt.so.0 +lib/mysql-workbench/modules/forms.grt.so.0.0.0 lib/mysql-workbench/modules/table_utils.grt.lua lib/mysql-workbench/modules/tools.grt.lua lib/mysql-workbench/modules/wb.model.grt.a -lib/mysql-workbench/modules/wb.model.grt.la lib/mysql-workbench/modules/wb.model.grt.so lib/mysql-workbench/modules/wb.model.grt.so.0 +lib/mysql-workbench/modules/wb.model.grt.so.0.0.0 lib/mysql-workbench/modules/wb.mysql.import.grt.a -lib/mysql-workbench/modules/wb.mysql.import.grt.la lib/mysql-workbench/modules/wb.mysql.import.grt.so lib/mysql-workbench/modules/wb.mysql.import.grt.so.0 +lib/mysql-workbench/modules/wb.mysql.import.grt.so.0.0.0 lib/mysql-workbench/modules/wb.mysql.validation.grt.a -lib/mysql-workbench/modules/wb.mysql.validation.grt.la lib/mysql-workbench/modules/wb.mysql.validation.grt.so lib/mysql-workbench/modules/wb.mysql.validation.grt.so.0 +lib/mysql-workbench/modules/wb.mysql.validation.grt.so.0.0.0 lib/mysql-workbench/modules/wb.validation.grt.a -lib/mysql-workbench/modules/wb.validation.grt.la lib/mysql-workbench/modules/wb.validation.grt.so lib/mysql-workbench/modules/wb.validation.grt.so.0 +lib/mysql-workbench/modules/wb.validation.grt.so.0.0.0 lib/mysql-workbench/modules/wb_utils_grt.py lib/mysql-workbench/mysqlcppconn.a -lib/mysql-workbench/mysqlcppconn.la lib/mysql-workbench/mysqlcppconn.so lib/mysql-workbench/mysqlcppconn.so.0 +lib/mysql-workbench/mysqlcppconn.so.0.0.0 lib/mysql-workbench/plugins/db.mysql.diff.reporting.wbp.a -lib/mysql-workbench/plugins/db.mysql.diff.reporting.wbp.la lib/mysql-workbench/plugins/db.mysql.diff.reporting.wbp.so lib/mysql-workbench/plugins/db.mysql.diff.reporting.wbp.so.0 +lib/mysql-workbench/plugins/db.mysql.diff.reporting.wbp.so.0.0.0 lib/mysql-workbench/plugins/db.mysql.editors.wbp.a -lib/mysql-workbench/plugins/db.mysql.editors.wbp.la lib/mysql-workbench/plugins/db.mysql.editors.wbp.so lib/mysql-workbench/plugins/db.mysql.editors.wbp.so.0 +lib/mysql-workbench/plugins/db.mysql.editors.wbp.so.0.0.0 lib/mysql-workbench/plugins/db.mysql.wbp.a -lib/mysql-workbench/plugins/db.mysql.wbp.la lib/mysql-workbench/plugins/db.mysql.wbp.so lib/mysql-workbench/plugins/db.mysql.wbp.so.0 +lib/mysql-workbench/plugins/db.mysql.wbp.so.0.0.0 lib/mysql-workbench/plugins/wb.model.editors.wbp.a -lib/mysql-workbench/plugins/wb.model.editors.wbp.la lib/mysql-workbench/plugins/wb.model.editors.wbp.so lib/mysql-workbench/plugins/wb.model.editors.wbp.so.0 +lib/mysql-workbench/plugins/wb.model.editors.wbp.so.0.0.0 lib/mysql-workbench/plugins/wb.printing.wbp.a -lib/mysql-workbench/plugins/wb.printing.wbp.la lib/mysql-workbench/plugins/wb.printing.wbp.so lib/mysql-workbench/plugins/wb.printing.wbp.so.0 +lib/mysql-workbench/plugins/wb.printing.wbp.so.0.0.0 share/applications/MySQLWorkbench.desktop share/mysql-workbench/data/db_datatype_groups.xml share/mysql-workbench/data/main_menu.xml -- cgit v1.2.3