diff options
| author | mi <mi@FreeBSD.org> | 2015-03-09 08:01:44 +0800 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2015-03-09 08:01:44 +0800 |
| commit | ac9c86b47a4b86ea9810196f3c99299c299866a4 (patch) | |
| tree | 8a87307d28341d629358a4da46b115961b891525 | |
| parent | 9a1373b64f437cf74ae840c35d135f56a6489962 (diff) | |
| download | freebsd-ports-gnome-ac9c86b47a4b86ea9810196f3c99299c299866a4.tar.gz freebsd-ports-gnome-ac9c86b47a4b86ea9810196f3c99299c299866a4.tar.zst freebsd-ports-gnome-ac9c86b47a4b86ea9810196f3c99299c299866a4.zip | |
Unbreak by working-around the short-comings of the current scintilla
port -- the installed shared library no longer links with Gnome shared
libraries, which it is using requiring any users of -lscintilla to link
with them explicitly..
| -rw-r--r-- | databases/gtksql/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index e0fb8cf3ab1f..ecea3722ace5 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -12,10 +12,6 @@ COMMENT= Graphical query tool for PostgreSQL/MySQL/SQLite LICENSE= GPLv2 # (or later) -BROKEN= Fails to configure -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2015-03-28 - LIB_DEPENDS= libscintilla.so:${PORTSDIR}/x11-toolkits/scintilla RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils @@ -25,13 +21,14 @@ OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT= SQLITE USES= gettext gmake pkgconfig -USE_GNOME= gtk20 +USE_GNOME= gtk20 cairo glib20 pango GNU_CONFIGURE= yes MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" CPPFLAGS+= -I${LOCALBASE}/include/scintilla -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lscintilla -lscintilla_lexers +LDFLAGS+= -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgresql @@ -64,6 +61,8 @@ post-patch: /scintilla.a/s|^|#| ; \ /\/scintilla\/include/s|^|#| ; \ /ac_header/s|postgres.h|libpq-fe.h| ; \ + s|/usr/local|${PREFIX}| ; \ + s|-R|-Wl,-rpath=| ; \ /^packagedatadir/s|=.*|=share/gtksql|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e \ |