mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

- Fix build

Browse Source 
- Add new necessary dependencies
- Replace portions of CPPFLAGS and LDFLAGS with sed patches for
  ${WRKSRC}/configure
- Add sed patch to rename some deprecated structure names after
  v3.7.1 update of x11-toolkits/scintilla

PR:		217697
Submitted by:	lightside@gmx.com
Approved by:	mat (mentor)
Differential Revision: https://reviews.freebsd.org/D9974
This commit is contained in:
Kirill Ponomarev 2017-03-13 18:17:03 +00:00
parent ff469e3a6f
commit 78458da1c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=436103
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
databases/gtksql/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gtksql
PORTVERSION= 0.4.5
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}
@ -13,21 +13,17 @@ COMMENT= Graphical query tool for PostgreSQL/MySQL/SQLite
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libscintilla.so:x11-toolkits/scintilla
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig \
libscintilla.so:x11-toolkits/scintilla
RUN_DEPENDS= xdg-open:devel/xdg-utils
BROKEN= does not build (incomplete definition of type 'struct CharacterRange')
USES= gettext gmake pkgconfig
USE_GNOME= gtk20 cairo glib20 pango
USES= gettext gmake localbase pkgconfig
USE_GNOME= gdkpixbuf2 gtk20 cairo
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
OPTIONS_DEFINE= AVAHI DOCS
OPTIONS_MULTI= DB
OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE
@ -49,9 +45,9 @@ SQLITE_CONFIGURE_OFF= --without-sqlite
post-patch:
@${REINPLACE_CMD} -e \
'/-lstdc++/s|^|#| ; \
/scintilla.a/s|^|#| ; \
/\/scintilla\/include/s|^|#| ; \
's|-lstdc++|| ; \
/^PACKAGE_LIBS=/s|$${packagesrcdir}.*scintilla.a|-lscintilla -lscintilla_lexers| ; \
/^CPPFLAGS=/s|../scintilla/include|${LOCALBASE}/include/scintilla| ; \
/ac_header/s|postgres.h|libpq-fe.h| ; \
s|/usr/local|${PREFIX}| ; \
s|-R|-Wl,-rpath=| ; \
@ -70,5 +66,10 @@ post-patch:
@${REINPLACE_CMD} -e \
's|/usr/local/gtksql|${PREFIX}/lib/gtksql|' \
${WRKSRC}/src/plugins.c
# Some structure names were renamed in Scintilla.h (v3.7.1)
@${REINPLACE_CMD} -E \
's|^#include <string.h>$$|#include <stdlib.h>\${.newline}&| ; \
s|(CharacterRange\|TextRange)|Sci_&|' \
${WRKSRC}/src/gtksql_query_scintilla.c
.include <bsd.port.mk>

6
databases/gtksql/files/patch-Makefile.in
View File

@ -1,6 +1,6 @@
--- Makefile.in.orig 2013-10-08 11:01:04.306764000 +0200
+++ Makefile.in 2013-10-08 11:27:51.000000000 +0200
@@ -237,14 +237,12 @@
--- Makefile.in.orig 2007-11-01 14:05:59 UTC
+++ Makefile.in
@@ -237,14 +237,12 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@

4
databases/gtksql/files/patch-po__Makefile.in.in
View File

@ -1,5 +1,5 @@
--- ./po/Makefile.in.in.orig 2013-02-26 19:25:06.000000000 +0100
+++ ./po/Makefile.in.in 2013-02-26 19:25:37.000000000 +0100
--- po/Makefile.in.in.orig 2006-06-13 16:40:55 UTC
+++ po/Makefile.in.in
@@ -13,6 +13,7 @@
PACKAGE = @PACKAGE@
VERSION = @VERSION@