diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/gigabase/Makefile | 12 | ||||
| -rw-r--r-- | databases/gigabase/files/patch-Makefile.in | 36 | ||||
| -rw-r--r-- | databases/gigabase/files/patch-configure.in | 19 | ||||
| -rw-r--r-- | databases/mdbtools/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql-workbench51/Makefile | 38 | ||||
| -rw-r--r-- | databases/mysql-workbench51/files/patch-configure.in | 10 | ||||
| -rw-r--r-- | databases/mysql-workbench52/Makefile | 8 | ||||
| -rw-r--r-- | databases/tora/Makefile | 12 |
8 files changed, 38 insertions, 101 deletions
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile index bf5d402ad34a..a85606900a50 100644 --- a/databases/gigabase/Makefile +++ b/databases/gigabase/Makefile @@ -14,16 +14,10 @@ LICENSE= MIT WRKSRC= ${WRKDIR}/${PORTNAME} -USES= dos2unix gmake libtool -DOS2UNIX_FILES= Makefile.in *.cpp *.h +GNU_CONFIGURE= yes +USES= autoreconf dos2unix gmake libtool +DOS2UNIX_FILES= Makefile.in configure.in *.cpp *.h USE_GCC= any -USE_AUTOTOOLS= libtoolize aclocal autoconf USE_LDCONFIG= yes -LDFLAGS+= -pthread - -post-patch: - @${REINPLACE_CMD} -e \ - 's|-lpthread|-pthread|' ${WRKSRC}/GiST/Makefile - .include <bsd.port.mk> diff --git a/databases/gigabase/files/patch-Makefile.in b/databases/gigabase/files/patch-Makefile.in index aaf5e0d7a13f..c00995326e14 100644 --- a/databases/gigabase/files/patch-Makefile.in +++ b/databases/gigabase/files/patch-Makefile.in @@ -1,15 +1,5 @@ --- Makefile.in.orig 2012-05-14 15:11:18.000000000 +0600 +++ Makefile.in 2012-05-14 15:14:15.000000000 +0600 -@@ -6,7 +6,8 @@ - exec_prefix = @exec_prefix@ - VPATH = @srcdir@ - LIBTOOL = ./libtool --INSTALL = @INSTALL@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_DATA = @INSTALL_DATA@ - - # Coment this for AIX/xlC 5.0 - LIBEXT=la @@ -41,7 +42,7 @@ SUFF=@SUFF@ @@ -28,24 +18,6 @@ CXXFLAGS = @CXXFLAGS@ $(DEFS) CFLAGS = @CFLAGS@ $(DEFS) LD = $(CXX) -@@ -70,7 +71,7 @@ - - $(GB_LIB): $(OBJS) - # Coment this for AIX/xlC 5.0 -- $(LIBTOOL) --mode=link $(CXX) -o $@ $(OBJS) $(LDFLAGS) @LTHREADSLIB@ -rpath $(libdir) -version-info $(VERSION) -+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(OBJS) $(LDFLAGS) -rpath $(libdir) -version-info $(VERSION) - # Uncoment this for AIX/xlC 5.0 - # mkdir .libs - # xlC_r -qmkshrobj=-10 -o .libs/gigabase.so $(OBJS) -@@ -80,7 +81,7 @@ - - $(CLI_LIB): $(CLI_OBJS) - # Coment this for AIX/xlC 5.0 -- $(LIBTOOL) --mode=link $(CXX) -o $@ $(CLI_OBJS) $(LDFLAGS) @LTHREADSLIB@ -rpath $(libdir) -version-info $(VERSION) -+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(CLI_OBJS) $(LDFLAGS) -rpath $(libdir) -version-info $(VERSION) - # Uncoment this for AIX/xlC 5.0 - # xlC_r -qmkshrobj=-10 -o .libs/cli.so $(CLI_OBJS) - # ar rv .libs/libcli_r.a .libs/cli.so @@ -154,15 +155,15 @@ $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o testleak testleak.o $(GB_LIB) $(SLHACK) @@ -56,16 +28,16 @@ - $(LIBTOOL) --mode=install $(INSTALL) $(GB_LIB) $(CLI_LIB) $(libdir) - mkdir -p $(bindir) + mkdir -p $(DESTDIR)$(includedir) -+ $(INSTALL_DATA) $(INCS) $(CLI_INCS) $(DESTDIR)$(includedir) ++ $(BSD_INSTALL_DATA) $(INCS) $(CLI_INCS) $(DESTDIR)$(includedir) + mkdir -p $(DESTDIR)$(libdir) -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(GB_LIB) $(CLI_LIB) $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(GB_LIB) $(CLI_LIB) $(DESTDIR)$(libdir) + mkdir -p $(DESTDIR)$(bindir) if test -x .libs/subsql ; then \ - cp .libs/subsql $(bindir); \ -+ $(INSTALL_PROGRAM) .libs/subsql $(DESTDIR)$(bindir)/subsql_gb; \ ++ $(BSD_INSTALL_PROGRAM) .libs/subsql $(DESTDIR)$(bindir)/subsql_gb; \ else \ - cp subsql $(bindir); \ -+ $(INSTALL_PROGRAM) subsql $(DESTDIR)$(bindir)/subsql_gb; \ ++ $(BSD_INSTALL_PROGRAM) subsql $(DESTDIR)$(bindir)/subsql_gb; \ fi # strip $(bindir)/subsql diff --git a/databases/gigabase/files/patch-configure.in b/databases/gigabase/files/patch-configure.in new file mode 100644 index 000000000000..427c8fccb8ca --- /dev/null +++ b/databases/gigabase/files/patch-configure.in @@ -0,0 +1,19 @@ +--- configure.in.orig 2015-04-18 16:58:56 UTC ++++ configure.in +@@ -4,7 +4,6 @@ AC_INIT(gigabase.h) + AC_CANONICAL_SYSTEM + AC_AIX + GB_VERSION=`$srcdir/mkversion` +-AM_INIT_AUTOMAKE(gigabase, $GB_VERSION) + + AC_ARG_ENABLE(pthreads, [ + --disable-pthreads use this for single-threaded libs], +@@ -84,7 +83,7 @@ AC_FUNC_STRFTIME + AC_CACHE_CHECK(for compiler option for pthreads, ac_cv_pthreads, + [SAVE_CXXFLAGS="$CXXFLAGS" + SAVE_CFLAGS="$CFLAGS" +-for i in "" -pthread -pthreads -mthreads -mt; do ++for i in -lpthread -pthreads -mthreads -mt; do + CXXFLAGS="$SAVE_CXXFLAGS $i" + CFLAGS="$SAVE_CFLAGS $i" + AC_LANG_CPLUSPLUS diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile index 79e541ed5892..11befc968deb 100644 --- a/databases/mdbtools/Makefile +++ b/databases/mdbtools/Makefile @@ -18,10 +18,8 @@ BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk \ txt2man:${PORTSDIR}/textproc/txt2man LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC -USES= bison iconv libtool pathfix pkgconfig +USES= autoreconf bison iconv libtool pathfix pkgconfig PATHFIX_MAKEFILEIN= Makefile.am -USE_AUTOTOOLS= libtoolize aclocal autoconf automake -AUTOMAKE_ARGS= -a -c -f USE_LDCONFIG= yes USE_GNOME= glib20 WANT_GNOME= yes diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile index dccf4d4ab0f2..f1a0eb542a30 100644 --- a/databases/mysql-workbench51/Makefile +++ b/databases/mysql-workbench51/Makefile @@ -21,13 +21,9 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= PYTHON -USE_AUTOTOOLS= libtoolize aclocal autoconf autoheader automake -ACLOCAL_ARGS= -I m4 -AUTOMAKE_ARGS= -a -c -f --foreign USE_LDCONFIG= ${PREFIX}/lib/mysql-workbench -SUBDIRS= ext/yassl/taocrypt ext/yassl ext/ctemplate/ctemplate-src . -USES= dos2unix libtool lua:51 +USES= autoreconf dos2unix libtool lua:51 DOS2UNIX_REGEX= .*ext/yassl/.*(Makefile.am|configure.in) USE_GL= gl USE_GNOME= cairo gtkmm24 libglade2 libgnome libsigc++20 libxml2 @@ -63,34 +59,8 @@ 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} && \ - ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} ${ACLOCAL_ARGS}) -.endfor - -run-autotools-autoheader: -.for dir in ${SUBDIRS} - @(cd ${WRKSRC}/${dir} && \ - ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} ${AUTOHEADER_ARGS}) -.endfor - -run-autotools-automake: -.for dir in ${SUBDIRS} - @(cd ${WRKSRC}/${dir} && \ - ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} ${AUTOMAKE_ARGS}) -.endfor - -run-autotools-autoconf: -.for dir in ${SUBDIRS} - @(cd ${WRKSRC}/${dir} && \ - ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} ${AUTOCONF_ARGS}) -.endfor +pre-configure: + (cd ${WRKSRC}/ext/yassl && ${LOCALBASE}/bin/autoreconf -f -i) + (cd ${WRKSRC}/ext/yassl/taocrypt && ${LOCALBASE}/bin/autoreconf -f -i) .include <bsd.port.mk> diff --git a/databases/mysql-workbench51/files/patch-configure.in b/databases/mysql-workbench51/files/patch-configure.in deleted file mode 100644 index 7453b98e36a5..000000000000 --- a/databases/mysql-workbench51/files/patch-configure.in +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.in.orig 2009-06-26 03:33:18.000000000 +0300 -+++ configure.in 2009-06-26 20:42:05.000000000 +0300 -@@ -422,7 +422,6 @@ - - ( - cd ./ext/ctemplate/ctemplate-src && -- autoreconf -i -s; - ./configure --prefix=$prefix --libdir=$libdir/mysql-workbench --disable-dependency-tracking - ) - diff --git a/databases/mysql-workbench52/Makefile b/databases/mysql-workbench52/Makefile index 5eeccfd88c9e..b594379347cd 100644 --- a/databases/mysql-workbench52/Makefile +++ b/databases/mysql-workbench52/Makefile @@ -33,9 +33,9 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \ OPTIONS_DEFINE= PYTHON_UTILS UNIXODBC PYTHON_UTILS_DESC= Python scripts useful for administering MySQL -USES= compiler:gcc-c++11-lib desktop-file-utils gettext gmake iconv \ - libtool lua:51 pathfix pkgconfig python:2 shared-mime-info \ - shebangfix +USES= autoreconf compiler:gcc-c++11-lib desktop-file-utils gettext \ + gmake iconv libtool lua:51 pathfix pkgconfig python:2 \ + shared-mime-info shebangfix SHEBANG_FILES= ext/ctemplate/ctemplate-src/src/htmlparser/*.py \ ext/mysql-utilities/*.py \ ext/mysql-utilities/scripts/*.py \ @@ -51,8 +51,6 @@ USE_GL= gl USE_GNOME= gtk20 libxml2 USE_MYSQL= client USE_SQLITE= 3 -USE_AUTOTOOLS= libtoolize aclocal automake autoheader autoconf -AUTOMAKE_ARGS= --add-missing --copy --force-missing --foreign GNU_CONFIGURE= yes CONFIGURE_ENV= LUA_CFLAGS="$$(pkg-config --cflags lua-${LUA_VER})" \ LUA_LIBS="$$(pkg-config --libs lua-${LUA_VER})" \ diff --git a/databases/tora/Makefile b/databases/tora/Makefile index f12ed15dc6ef..057ff5dcfe14 100644 --- a/databases/tora/Makefile +++ b/databases/tora/Makefile @@ -21,9 +21,8 @@ OPTIONS_DEFINE= PGSQL MYSQL DOCS OPTIONS_DEFINE_i386= ORACLE OPTIONS_DEFAULT= PGSQL MYSQL -USE_AUTOTOOLS= aclocal automake autoconf autoheader libtoolize USE_QT4= gui corelib sql xml network linguist moc_build uic_build rcc_build -USES= gmake libtool makeinfo +USES= autoreconf gmake libtool makeinfo GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pcre=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib @@ -55,15 +54,12 @@ ORACLE_VER= 8i # Client version CONFIGURE_ARGS+= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu} .endif -run-autotools: - (cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh) - -pre-configure: +post-patch: .if ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e 's|/etc/torarc|${PREFIX}/etc/torarc|' \ + @${REINPLACE_CMD} 's|/etc/torarc|${PREFIX}/etc/torarc|' \ ${PREFIX2FIX:S|^|${WRKSRC}/|} .else - ${REINPLACE_CMD} -e 's|test doc|test|' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} 's|test doc|test|' ${WRKSRC}/Makefile.am .endif .include <bsd.port.mk> |