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

Collapse All | Expand All

(-)databases/gtksql/Makefile (-40 / +47 lines)
Lines 3-75 Link Here
3
3
4
PORTNAME=	gtksql
4
PORTNAME=	gtksql
5
PORTVERSION=	0.4.5
5
PORTVERSION=	0.4.5
6
PORTREVISION=	1
6
CATEGORIES=	databases
7
CATEGORIES=	databases
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}/
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}
8
9
9
MAINTAINER=	ports@FreeBSD.org
10
MAINTAINER=	ports@FreeBSD.org
10
COMMENT=	Graphical query tool for PostgreSQL/MySQL/SQLite
11
COMMENT=	Graphical query tool for PostgreSQL/MySQL/SQLite
11
12
12
LICENSE=	GPLv2
13
LICENSE=	GPLv2 # (or later)
13
14
14
LIB_DEPENDS=	avahi-client:${PORTSDIR}/net/avahi-app
15
LIB_DEPENDS=	libscintilla.so:${PORTSDIR}/x11-toolkits/scintilla
16
RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
15
17
16
GNU_CONFIGURE=	yes
18
OPTIONS_DEFINE=	AVAHI
17
USE_AUTOTOOLS=	libtool
19
OPTIONS_MULTI=	DB
18
USES=		pkgconfig gmake
20
OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
19
USE_GNOME=	gtk20
21
OPTIONS_DEFAULT=	SQLITE
20
LDFLAGS+=	-L${LOCALBASE}/lib -lgmodule-2.0
21
22
22
MAN1=		${PORTNAME}.1
23
USES=		gettext gmake pkgconfig
23
PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
24
USE_GNOME=	gtk20
25
GNU_CONFIGURE=	yes
26
MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
27
		AUTOHEADER="${TRUE}"
24
28
25
OPTIONS_MULTI=		DB
29
CPPFLAGS+=	-I${LOCALBASE}/include/scintilla -I${LOCALBASE}/include
26
OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE3
30
LDFLAGS+=	-L${LOCALBASE}/lib -lscintilla -lscintilla_lexers
27
OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE3
28
31
29
NO_STAGE=	yes
30
.include <bsd.port.options.mk>
32
.include <bsd.port.options.mk>
31
33
32
.if ${PORT_OPTIONS:MMYSQL}
34
.if ${PORT_OPTIONS:MAVAHI}
33
USE_MYSQL=	yes
35
LIB_DEPENDS+=	libavahi-common.so:${PORTSDIR}/net/avahi-app
34
.else
36
.else
35
CONFIGURE_ARGS+=--without-mysql
37
CONFIGURE_ARGS+=	--without-avahi
36
.endif
38
.endif
37
39
38
.if ${PORT_OPTIONS:MNLS}
40
.if ${PORT_OPTIONS:MMYSQL}
39
USES+=		gettext
41
USE_MYSQL=	yes
40
PLIST_SUB+=	NLS=""
42
CPPFLAGS+=	-I${LOCALBASE}/include/mysql
43
LDFLAGS+=	-L${LOCALBASE}/lib/mysql
41
.else
44
.else
42
CONFIGURE_ARGS+=--disable-nls
45
CONFIGURE_ARGS+=	--without-mysql
43
PLIST_SUB+=	NLS="@comment "
44
.endif
46
.endif
45
47
46
.if ${PORT_OPTIONS:MPGSQL}
48
.if ${PORT_OPTIONS:MPGSQL}
47
USE_PGSQL=	yes
49
USE_PGSQL=	yes
48
.else
50
.else
49
CONFIGURE_ARGS+=--without-postgresql
51
CONFIGURE_ARGS+=	--without-postgresql
50
.endif
52
.endif
51
53
52
.if ${PORT_OPTIONS:MSQLITE3}
54
.if ${PORT_OPTIONS:MSQLITE}
53
LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
55
USE_SQLITE=	yes
54
.else
56
.else
55
CONFIGURE_ARGS+=--without-sqlite
57
CONFIGURE_ARGS+=	--without-sqlite
56
.endif
58
.endif
57
59
58
post-patch:
60
post-patch:
59
	@${REINPLACE_CMD} -e 's|/usr/include/mysql|${LOCALBASE}/include/mysql|g' \
61
	@${REINPLACE_CMD} -e \
60
	-e 's|/usr/include/postgresql|${LOCALBASE}/include/postgresql/server|g' \
62
		'/-lstdc++/s|^|#| ; \
63
		 /scintilla.a/s|^|#| ; \
64
		 /\/scintilla\/include/s|^|#| ; \
65
		 /ac_header/s|postgres.h|libpq-fe.h| ; \
66
		 /^packagedatadir/s|=.*|=share/gtksql|' \
61
		${WRKSRC}/configure
67
		${WRKSRC}/configure
62
	@${REINPLACE_CMD} 's|make|$$(MAKE)|' \
68
	@${REINPLACE_CMD} -e \
63
		${WRKSRC}/scintilla/Makefile.in
69
		's|-O1|| ; \
64
	@${REINPLACE_CMD} 's|-Os|${CFLAGS}|g' \
70
		 s|-g$$|-DGTK|' \
65
		${WRKSRC}/scintilla/gtk/makefile
71
		${WRKSRC}/src/Makefile.in
66
72
	@${REINPLACE_CMD} -e \
67
post-install:
73
		's|<postgres\.h>|<postgresql/internal/c.h>|' \
68
.if ${PORT_OPTIONS:MDOCS}
74
		${WRKSRC}/src/d_postgres_f.c
69
	@${MKDIR} ${DOCSDIR}
75
	@${REINPLACE_CMD} -e \
70
.for file in ${PORTDOCS}
76
		's|mozilla|xdg-open|' \
71
	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
77
		${WRKSRC}/src/gtkui-object.c
72
.endfor
78
	@${REINPLACE_CMD} -e \
73
.endif
79
		's|/usr/local/gtksql|${PREFIX}/lib/gtksql|' \
80
		${WRKSRC}/src/plugins.c
74
81
75
.include <bsd.port.mk>
82
.include <bsd.port.mk>
(-)databases/gtksql/files/patch-Makefile.in (-17 / +16 lines)
Lines 1-20 Link Here
1
--- Makefile.in.orig	2013-10-08 11:01:04.306764000 +0200
1
--- Makefile.in.orig	2013-10-08 11:01:04.306764000 +0200
2
+++ Makefile.in	2013-10-08 11:27:51.000000000 +0200
2
+++ Makefile.in	2013-10-08 11:27:51.000000000 +0200
3
@@ -728,7 +728,7 @@
3
@@ -237,14 +237,12 @@
4
 target_alias = @target_alias@
5
 top_builddir = @top_builddir@
6
 top_srcdir = @top_srcdir@
7
-SUBDIRS = Pics po scintilla intl src pixmaps man gnome
8
-gtksqldocdir = ${prefix}/doc/gtksql
9
+SUBDIRS = Pics po src pixmaps man gnome
10
+gtksqldocdir = ${docdir}
11
 gtksqldoc_DATA = \
12
 	README\
13
-	COPYING\
14
 	AUTHORS\
15
 	ChangeLog\
16
-	INSTALL\
17
 	NEWS\
18
 	TODO
4
 
19
 
5
 info-am:
6
 
7
-install-data-am: install-gtksqldocDATA
8
+install-data-am: 
9
 
10
 install-dvi: install-dvi-recursive
11
 
12
@@ -764,7 +764,7 @@
13
 
14
 ps-am:
15
 
16
-uninstall-am: uninstall-gtksqldocDATA
17
+uninstall-am: 
18
 
19
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
20
 	install-strip
(-)databases/gtksql/pkg-plist (-33 / +42 lines)
Lines 1-35 Link Here
1
bin/gtksql
1
bin/gtksql
2
man/man1/gtksql.1.gz
2
share/applications/gtksql.desktop
3
share/applications/gtksql.desktop
3
%%NLS%%share/locale/de_DE/LC_MESSAGES/gtksql.mo
4
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
4
share/pixmaps/connect-grey.xpm
5
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
5
share/pixmaps/connect.png
6
%%PORTDOCS%%%%DOCSDIR%%/NEWS
6
share/pixmaps/connect.xpm
7
%%PORTDOCS%%%%DOCSDIR%%/README
7
share/pixmaps/delete-grey.xpm
8
%%PORTDOCS%%%%DOCSDIR%%/TODO
8
share/pixmaps/delete.xpm
9
%%DATADIR%%/pixmaps/connect-grey.xpm
9
share/pixmaps/disconnect-grey.xpm
10
%%DATADIR%%/pixmaps/connect.png
10
share/pixmaps/disconnect.png
11
%%DATADIR%%/pixmaps/connect.xpm
11
share/pixmaps/disconnect.xpm
12
%%DATADIR%%/pixmaps/delete-grey.xpm
12
share/pixmaps/export-grey.xpm
13
%%DATADIR%%/pixmaps/delete.xpm
13
share/pixmaps/export.xpm
14
%%DATADIR%%/pixmaps/disconnect-grey.xpm
14
share/pixmaps/gtksql.png
15
%%DATADIR%%/pixmaps/disconnect.png
15
share/pixmaps/gtksql.xpm
16
%%DATADIR%%/pixmaps/disconnect.xpm
16
share/pixmaps/gtksql_db.png
17
%%DATADIR%%/pixmaps/export-grey.xpm
17
share/pixmaps/gtksql_field.png
18
%%DATADIR%%/pixmaps/export.xpm
18
share/pixmaps/gtksql_gnome_icon.png
19
%%DATADIR%%/pixmaps/gtksql.png
19
share/pixmaps/gtksql_table.png
20
%%DATADIR%%/pixmaps/gtksql.xpm
20
share/pixmaps/new-grey.xpm
21
%%DATADIR%%/pixmaps/gtksql_db.png
21
share/pixmaps/new.xpm
22
%%DATADIR%%/pixmaps/gtksql_field.png
22
share/pixmaps/open-grey.xpm
23
%%DATADIR%%/pixmaps/gtksql_gnome_icon.png
23
share/pixmaps/open.xpm
24
%%DATADIR%%/pixmaps/gtksql_table.png
24
share/pixmaps/question.xpm
25
%%DATADIR%%/pixmaps/new-grey.xpm
25
share/pixmaps/refresh-grey.xpm
26
%%DATADIR%%/pixmaps/new.xpm
26
share/pixmaps/refresh.xpm
27
%%DATADIR%%/pixmaps/open-grey.xpm
27
share/pixmaps/rename-grey.xpm
28
%%DATADIR%%/pixmaps/open.xpm
28
share/pixmaps/rename.xpm
29
%%DATADIR%%/pixmaps/question.xpm
29
share/pixmaps/save-grey.xpm
30
%%DATADIR%%/pixmaps/refresh-grey.xpm
30
share/pixmaps/save.xpm
31
%%DATADIR%%/pixmaps/refresh.xpm
31
share/pixmaps/send-grey.xpm
32
%%DATADIR%%/pixmaps/rename-grey.xpm
32
share/pixmaps/send.xpm
33
%%DATADIR%%/pixmaps/rename.xpm
33
share/pixmaps/warning.xpm
34
%%DATADIR%%/pixmaps/save-grey.xpm
34
%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
35
%%DATADIR%%/pixmaps/save.xpm
35
%%NLS%%@dirrmtry share/locale/de_DE
36
%%DATADIR%%/pixmaps/send-grey.xpm
37
%%DATADIR%%/pixmaps/send.xpm
38
%%DATADIR%%/pixmaps/warning.xpm
39
share/locale/de_DE/LC_MESSAGES/gtksql.mo
40
@dirrmtry share/locale/de_DE/LC_MESSAGES
41
@dirrmtry share/locale/de_DE
42
@dirrm %%DATADIR%%/pixmaps
43
@dirrm %%DATADIR%%
44
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 184234