View | Details | Raw Unified | Return to bug 217697 | Differences between
and this patch

Collapse All | Expand All

(-)gtksql/Makefile (-12 / +12 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	gtksql
4
PORTNAME=	gtksql
5
PORTVERSION=	0.4.5
5
PORTVERSION=	0.4.5
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	databases
7
CATEGORIES=	databases
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}
9
9
Lines 13-33 Link Here
13
LICENSE=	GPLv2+
13
LICENSE=	GPLv2+
14
LICENSE_FILE=	${WRKSRC}/COPYING
14
LICENSE_FILE=	${WRKSRC}/COPYING
15
15
16
LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
16
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
17
		libfontconfig.so:x11-fonts/fontconfig \
18
		libscintilla.so:x11-toolkits/scintilla
17
RUN_DEPENDS=	xdg-open:devel/xdg-utils
19
RUN_DEPENDS=	xdg-open:devel/xdg-utils
18
20
19
BROKEN=		does not build (incomplete definition of type 'struct CharacterRange')
20
21
USES=		gettext gmake localbase pkgconfig
21
USES=		gettext gmake localbase pkgconfig
22
USE_GNOME=	gtk20 cairo glib20 pango
22
USE_GNOME=	gdkpixbuf2 gtk20 cairo
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
24
MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
25
		AUTOHEADER="${TRUE}"
25
		AUTOHEADER="${TRUE}"
26
26
27
CPPFLAGS+=	-I${LOCALBASE}/include/scintilla -I${LOCALBASE}/include
28
LDFLAGS+=	-L${LOCALBASE}/lib -lscintilla -lscintilla_lexers
29
LDFLAGS+=	-lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo
30
31
OPTIONS_DEFINE=	AVAHI DOCS
27
OPTIONS_DEFINE=	AVAHI DOCS
32
OPTIONS_MULTI=	DB
28
OPTIONS_MULTI=	DB
33
OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
29
OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
Lines 49-57 Link Here
49
45
50
post-patch:
46
post-patch:
51
	@${REINPLACE_CMD} -e \
47
	@${REINPLACE_CMD} -e \
52
		'/-lstdc++/s|^|#| ; \
48
		's|-lstdc++|| ; \
53
		 /scintilla.a/s|^|#| ; \
49
		 /^PACKAGE_LIBS=/s|$${packagesrcdir}.*scintilla.a|-lscintilla -lscintilla_lexers| ; \
54
		 /\/scintilla\/include/s|^|#| ; \
50
		 /^CPPFLAGS=/s|../scintilla/include|${LOCALBASE}/include/scintilla| ; \
55
		 /ac_header/s|postgres.h|libpq-fe.h| ; \
51
		 /ac_header/s|postgres.h|libpq-fe.h| ; \
56
		 s|/usr/local|${PREFIX}| ; \
52
		 s|/usr/local|${PREFIX}| ; \
57
		 s|-R|-Wl,-rpath=| ; \
53
		 s|-R|-Wl,-rpath=| ; \
Lines 70-74 Link Here
70
	@${REINPLACE_CMD} -e \
66
	@${REINPLACE_CMD} -e \
71
		's|/usr/local/gtksql|${PREFIX}/lib/gtksql|' \
67
		's|/usr/local/gtksql|${PREFIX}/lib/gtksql|' \
72
		${WRKSRC}/src/plugins.c
68
		${WRKSRC}/src/plugins.c
69
# Structure names in Scintilla.h without "Sci_" prefix was deprecated in v3.7.1
70
	@${REINPLACE_CMD} -E \
71
		's|(CharacterRange\|TextRange)|Sci_&|' \
72
		${WRKSRC}/src/gtksql_query_scintilla.c
73
73
74
.include <bsd.port.mk>
74
.include <bsd.port.mk>
(-)gtksql/files/patch-Makefile.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- Makefile.in.orig	2013-10-08 11:01:04.306764000 +0200
1
--- Makefile.in.orig	2007-11-01 14:05:59 UTC
2
+++ Makefile.in	2013-10-08 11:27:51.000000000 +0200
2
+++ Makefile.in
3
@@ -237,14 +237,12 @@
3
@@ -237,14 +237,12 @@ sysconfdir = @sysconfdir@
4
 target_alias = @target_alias@
4
 target_alias = @target_alias@
5
 top_builddir = @top_builddir@
5
 top_builddir = @top_builddir@
6
 top_srcdir = @top_srcdir@
6
 top_srcdir = @top_srcdir@
(-)gtksql/files/patch-po__Makefile.in.in (-2 / +2 lines)
Lines 1-5 Link Here
1
--- ./po/Makefile.in.in.orig	2013-02-26 19:25:06.000000000 +0100
1
--- po/Makefile.in.in.orig	2006-06-13 16:40:55 UTC
2
+++ ./po/Makefile.in.in	2013-02-26 19:25:37.000000000 +0100
2
+++ po/Makefile.in.in
3
@@ -13,6 +13,7 @@
3
@@ -13,6 +13,7 @@
4
 PACKAGE = @PACKAGE@
4
 PACKAGE = @PACKAGE@
5
 VERSION = @VERSION@
5
 VERSION = @VERSION@

Return to bug 217697