Date: Mon, 9 Mar 2015 00:01:45 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380807 - head/databases/gtksql Message-ID: <201503090001.t2901jwd037129@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Mon Mar 9 00:01:44 2015 New Revision: 380807 URL: https://svnweb.freebsd.org/changeset/ports/380807 QAT: https://qat.redports.org/buildarchive/r380807/ Log: 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.. Modified: head/databases/gtksql/Makefile Modified: head/databases/gtksql/Makefile ============================================================================== --- head/databases/gtksql/Makefile Sun Mar 8 23:13:21 2015 (r380806) +++ head/databases/gtksql/Makefile Mon Mar 9 00:01:44 2015 (r380807) @@ -12,10 +12,6 @@ COMMENT= Graphical query tool for Postgr 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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503090001.t2901jwd037129>