diff options
Diffstat (limited to 'databases')
-rw-r--r-- | databases/akonadi/Makefile | 4 | ||||
-rw-r--r-- | databases/libdrizzle/Makefile | 2 | ||||
-rw-r--r-- | databases/libdrizzle/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | databases/libmongo-client/Makefile | 1 | ||||
-rw-r--r-- | databases/mdbtools/Makefile | 1 | ||||
-rw-r--r-- | databases/opendbx/Makefile | 2 | ||||
-rw-r--r-- | databases/opendbx/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | databases/postgresql-libpqxx/Makefile | 2 | ||||
-rw-r--r-- | databases/postgresql-libpqxx/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | databases/postgresql-libpqxx3/Makefile | 2 | ||||
-rw-r--r-- | databases/postgresql-libpqxx3/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | databases/sqlite2/Makefile | 2 | ||||
-rw-r--r-- | databases/sqlite2/files/patch-Makefile.in | 22 | ||||
-rw-r--r-- | databases/sqlrelay/Makefile | 3 | ||||
-rw-r--r-- | databases/sqlrelay/files/patch-Makefile | 16 | ||||
-rw-r--r-- | databases/tokyocabinet/Makefile | 7 | ||||
-rw-r--r-- | databases/tokyotyrant/Makefile | 6 |
17 files changed, 22 insertions, 92 deletions
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index cc41907..f51f3ca 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs BUILD_DEPENDS= xsltproc:textproc/libxslt USES= cmake:outsource execinfo kde:4 shared-mime-info \ - compiler:c++11-lang tar:bzip2 + compiler:c++11-lang pathfix tar:bzip2 USE_KDE= automoc4 soprano USE_QT4= corelib dbus gui network qtestlib_build sql xml \ moc_build qmake_build rcc_build uic_build @@ -48,8 +48,6 @@ SQLITE_CMAKE_OFF= -DAKONADI_BUILD_QSQLITE=off OPTIONS_DEFAULT= MYSQL post-patch: - ${REINPLACE_CMD} -e '/akonadi.pc/ s|pkgconfig|../libdata/pkgconfig|' \ - ${PATCH_WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e '/find_program/ s|mysqld|mysqld_safe ${LOCALBASE}/bin|g' \ ${PATCH_WRKSRC}/server/CMakeLists.txt ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ diff --git a/databases/libdrizzle/Makefile b/databases/libdrizzle/Makefile index 6c7396e..8b592b6 100644 --- a/databases/libdrizzle/Makefile +++ b/databases/libdrizzle/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 OPTIONS_DEFINE= DOXYGEN EXAMPLES DOCS GNU_CONFIGURE= yes -USES= gmake libtool +USES= gmake libtool pathfix CONFIGURE_ARGS+=--enable-libsqlite3 USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/databases/libdrizzle/files/patch-Makefile.in b/databases/libdrizzle/files/patch-Makefile.in deleted file mode 100644 index 4a44232..0000000 --- a/databases/libdrizzle/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.in.orig 2010-03-12 12:09:51.000000000 -0500 -+++ ./Makefile.in 2010-03-12 12:10:03.000000000 -0500 -@@ -526,7 +526,7 @@ - docs/doxygen.h \ - tests/run.sh - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = support/libdrizzle.pc - TESTS_ENVIRONMENT = ${top_srcdir}/tests/run.sh - TESTS = $(check_PROGRAMS) diff --git a/databases/libmongo-client/Makefile b/databases/libmongo-client/Makefile index 6e8a572..8d20b9c 100644 --- a/databases/libmongo-client/Makefile +++ b/databases/libmongo-client/Makefile @@ -19,6 +19,5 @@ GNU_CONFIGURE= yes USES= autoreconf libtool pkgconfig gmake pathfix USE_GNOME= glib20 USE_LDCONFIG= yes -PATHFIX_MAKEFILEIN=Makefile.am .include <bsd.port.mk> diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile index 7690c8b..e415624 100644 --- a/databases/mdbtools/Makefile +++ b/databases/mdbtools/Makefile @@ -22,7 +22,6 @@ OPTIONS_SUB= yes USES= autoreconf bison iconv libtool pathfix pkgconfig USE_GITHUB= yes GH_ACCOUNT= brianb -PATHFIX_MAKEFILEIN= Makefile.am USE_LDCONFIG= yes USE_GNOME= glib20 GNU_CONFIGURE= yes diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile index fa0f147..a3b3aa3 100644 --- a/databases/opendbx/Makefile +++ b/databases/opendbx/Makefile @@ -12,7 +12,7 @@ COMMENT= C library for accessing databases with a single API LICENSE= LGPL21 -USES= gmake libtool readline +USES= gmake libtool pathfix readline CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${WRKSRC}/lib -L${LOCALBASE}/lib diff --git a/databases/opendbx/files/patch-Makefile.in b/databases/opendbx/files/patch-Makefile.in deleted file mode 100644 index 0e25f1e1..0000000 --- a/databases/opendbx/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.in.orig 2012-06-10 18:33:53.000000000 -0300 -+++ ./Makefile.in 2014-01-19 00:08:50.000000000 -0200 -@@ -308,7 +308,7 @@ - opendbx.spec \ - ABOUT-NLS - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(exec_prefix)/libdata/pkgconfig - pkgconfig_DATA = opendbx.pc opendbxplus.pc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile index ed9ed98..89228c5 100644 --- a/databases/postgresql-libpqxx/Makefile +++ b/databases/postgresql-libpqxx/Makefile @@ -17,7 +17,7 @@ LICENSE= BSD3CLAUSE CONFLICTS= postgresql-libpqxx-3.* postgresql-libpqxx3-3.* PORTSCOUT= limit:^2\. -USES+= gmake libtool pgsql python:build shebangfix +USES+= gmake libtool pathfix pgsql python:build shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION:R} diff --git a/databases/postgresql-libpqxx/files/patch-Makefile.in b/databases/postgresql-libpqxx/files/patch-Makefile.in deleted file mode 100644 index 3d2b02a..0000000 --- a/databases/postgresql-libpqxx/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2011-09-12 11:39:56.000000000 +0200 -+++ Makefile.in 2011-09-12 11:40:48.000000000 +0200 -@@ -270,7 +270,7 @@ - MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \ - stamp-h.in - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libpqxx.pc - bin_SCRIPTS = pqxx-config - all: all-recursive diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile index 9acfb01..591a12c 100644 --- a/databases/postgresql-libpqxx3/Makefile +++ b/databases/postgresql-libpqxx3/Makefile @@ -16,7 +16,7 @@ COMMENT= New C++ interface for PostgreSQL CONFLICTS= postgresql-libpqxx-[2-4].* PORTSCOUT= limit:^2\. -USES+= gmake libtool pgsql pkgconfig python:build shebangfix +USES+= gmake libtool pathfix pgsql pkgconfig python:build shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/databases/postgresql-libpqxx3/files/patch-Makefile.in b/databases/postgresql-libpqxx3/files/patch-Makefile.in deleted file mode 100644 index 3d2b02a..0000000 --- a/databases/postgresql-libpqxx3/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2011-09-12 11:39:56.000000000 +0200 -+++ Makefile.in 2011-09-12 11:40:48.000000000 +0200 -@@ -270,7 +270,7 @@ - MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \ - stamp-h.in - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libpqxx.pc - bin_SCRIPTS = pqxx-config - all: all-recursive diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile index 8933b8c..6fd3199 100644 --- a/databases/sqlite2/Makefile +++ b/databases/sqlite2/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= SQL database engine in a C library GNU_CONFIGURE= yes -USES= gmake libtool pkgconfig readline +USES= gmake libtool pathfix pkgconfig readline USE_LDCONFIG= yes CONFIGURE_ARGS= --with-hints=freebsd.hints diff --git a/databases/sqlite2/files/patch-Makefile.in b/databases/sqlite2/files/patch-Makefile.in index 59f1598..64cb2b0 100644 --- a/databases/sqlite2/files/patch-Makefile.in +++ b/databases/sqlite2/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2005-04-23 18:43:23.000000000 -0400 -+++ Makefile.in 2015-03-26 18:36:07.358178000 -0400 -@@ -38,7 +38,7 @@ +--- Makefile.in.orig 2005-04-23 22:43:23 UTC ++++ Makefile.in +@@ -38,7 +38,7 @@ RELEASE = @ALLOWRELEASE@ # libtool compile/link/install LTCOMPILE = $(LIBTOOL) --mode=compile $(TCC) @@ -9,18 +9,14 @@ LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) # Compiler options needed for programs that use the TCL library. -@@ -471,8 +471,12 @@ - $(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin - $(INSTALL) -d $(DESTDIR)$(prefix)/include - $(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include -- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; -- $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; -+ $(INSTALL) -d $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig -+ $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig -+ +@@ -474,6 +474,10 @@ install: sqlite libsqlite.la sqlite.h + $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; + $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; + +install-tcl: libtclsqlite.la + $(INSTALL) -d $(DESTDIR)$(prefix)/lib/sqlite + $(LTINSTALL) libtclsqlite.la $(DESTDIR)$(prefix)/lib/sqlite - ++ clean: rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.* + rm -rf .libs .deps diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 4f43829..51562be 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -14,7 +14,8 @@ LICENSE= LGPL20 LIB_DEPENDS= librudiments.so:devel/rudiments WANT_GNOME= yes -USES= gmake libtool python +USES= gmake libtool pathfix python +PATHFIX_MAKEFILEIN= Makefile CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ diff --git a/databases/sqlrelay/files/patch-Makefile b/databases/sqlrelay/files/patch-Makefile index d6de735..1647709 100644 --- a/databases/sqlrelay/files/patch-Makefile +++ b/databases/sqlrelay/files/patch-Makefile @@ -1,6 +1,6 @@ --- Makefile.orig 2016-01-17 07:20:04 UTC +++ Makefile -@@ -30,16 +30,13 @@ install-doc: +@@ -30,9 +30,6 @@ install-doc: cd doc $(AND) $(MAKE) install install-license: @@ -9,19 +9,7 @@ - $(CHMOD) 0644 $(licensedir)/COPYING install-pkgconfig: -- $(MKINSTALLDIRS) $(libdir)/pkgconfig -- $(CP) sqlrelay-c.pc $(libdir)/pkgconfig/$(SQLRELAY)-c.pc -- $(CHMOD) 0644 $(libdir)/pkgconfig/$(SQLRELAY)-c.pc -- $(CP) sqlrelay-c++.pc $(libdir)/pkgconfig/$(SQLRELAY)-c++.pc -- $(CHMOD) 0644 $(libdir)/pkgconfig/$(SQLRELAY)-c++.pc -+ $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig -+ $(CP) sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc -+ $(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c.pc -+ $(CP) sqlrelay-c++.pc $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc -+ $(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc - - uninstall: $(UNINSTALLSUBDIRS) - $(RMTREE) $(libexecdir) + $(MKINSTALLDIRS) $(libdir)/pkgconfig @@ -63,7 +60,6 @@ uninstall-doc: cd doc $(AND) $(MAKE) uninstall diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile index 297382d..d62b1d2 100644 --- a/databases/tokyocabinet/Makefile +++ b/databases/tokyocabinet/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USES= gmake +USES= pathfix gmake USE_LDCONFIG= yes PORTDOCS= * @@ -66,11 +66,8 @@ SHLIB_VER_MAJ= 9 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} SHLIB_VER_MAJ=${SHLIB_VER_MAJ} -# Because gnomehack will search "(libdir)" and it doesn't work, we need -# to patch it manually. post-patch: - ${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \ - -e 's|@datarootdir@|@datarootdir@/doc|' \ + ${REINPLACE_CMD} -e 's|@datarootdir@|@datarootdir@/doc|' \ ${WRKSRC}/Makefile.in post-patch-FASTEST-on: diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile index 6e818ad..4bc6432 100644 --- a/databases/tokyotyrant/Makefile +++ b/databases/tokyotyrant/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= gmake +USES= gmake pathfix USE_RC_SUBR= ttserver OPTIONS_DEFINE= LUA @@ -29,11 +29,7 @@ LUA_CFLAGS+= -I${LUA_INCDIR} LUA_CPPFLAGS+= -I${LUA_INCDIR} LUA_USES= lua -# Since gnomehack only works for "(libdir)" case, we need to patch it -# manually. post-patch: - ${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g' \ - ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g' ${WRKSRC}/configure post-install: |