ports/176402: commit references a PR
dfilter service
dfilter at FreeBSD.ORG
Tue Feb 26 20:10:01 UTC 2013
The following reply was made to PR ports/176402; it has been noted by GNATS.
From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/176402: commit references a PR
Date: Tue, 26 Feb 2013 20:08:04 +0000 (UTC)
Author: pawel
Date: Tue Feb 26 20:07:49 2013
New Revision: 313003
URL: http://svnweb.freebsd.org/changeset/ports/313003
Log:
- Update to version 4.5, now GTK+2 based
- Convert to OptionsNG, respect NLS option
- Add support for sqlite3
- Add license info
- Respect CFLAGS during build
- Update COMMENT, pkg-descr to describe actual state
PR: ports/176402
Reported by: Aldis Berjoza <graudeejs at gmail.com>
Added:
head/databases/gtksql/files/patch-Makefile.am (contents, props changed)
head/databases/gtksql/files/patch-po__Makefile.in.in (contents, props changed)
head/databases/gtksql/files/patch-src__Makefile.am (contents, props changed)
Deleted:
head/databases/gtksql/files/patch-aa
head/databases/gtksql/files/patch-postgres.c
Modified:
head/databases/gtksql/Makefile
head/databases/gtksql/distinfo
head/databases/gtksql/pkg-descr
head/databases/gtksql/pkg-plist
Modified: head/databases/gtksql/Makefile
==============================================================================
--- head/databases/gtksql/Makefile Tue Feb 26 18:47:53 2013 (r313002)
+++ head/databases/gtksql/Makefile Tue Feb 26 20:07:49 2013 (r313003)
@@ -2,59 +2,74 @@
# $FreeBSD$
PORTNAME= gtksql
-PORTVERSION= 0.3
-PORTREVISION= 6
+PORTVERSION= 0.4.5
CATEGORIES= databases
-MASTER_SITES= http://membres.lycos.fr/bbrox/GtkSQL/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}/
MAINTAINER= ports at FreeBSD.org
-COMMENT= Graphical query tool for PostgreSQL and/or MySQL
+COMMENT= Graphical query tool for PostgreSQL/MySQL/SQLite
-.if defined(PACKAGE_BUILDING) && !defined(WITH_MYSQL) && !defined(WITH_PGSQL)
-BROKEN= Needs modification to work with newer MySQL
-EXPIRATION_DATE= 2011-11-30
-WITH_MYSQL= yes
-.endif
+LICENSE= GPLv2
+
+LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app
+
+GNU_CONFIGURE= yes
+USE_AUTOTOOLS= aclocal libtool
+ACLOCAL_ARGS= -I${LOCALBASE}/share/aclocal
+USE_PKGCONFIG= build
+USE_GMAKE= yes
+USE_GNOME= gtk20
+
+MAN1= ${PORTNAME}.1
+PORTDOCS= AUTHORS ChangeLog NEWS README TODO
-USE_GNOME= gtk12
+OPTIONS_MULTI= DB
+OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE3
+OPTIONS_DEFAULT= MYSQL PGSQL SQLITE3
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_MYSQL) || (exists(${LOCALBASE}/lib/mysql/libmysqlclient.a) \
- && !defined(WITHOUT_MYSQL))
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
-.endif
-.if defined(WITH_PGSQL) || (exists(${LOCALBASE}/lib/libpq.a) \
- && !defined(WITHOUT_PGSQL))
-HAVE_PGSQL= yes
-USE_PGSQL= yes
+.else
+CONFIGURE_ARGS+=--without-mysql
.endif
-pre-patch:
-.if !defined(USE_MYSQL) && !defined(HAVE_PGSQL)
- @${ECHO} "You must specify which database to use, possible are:"
- @${ECHO}
- @${ECHO} "make WITH_MYSQL=yes (for MySQL support)"
- @${ECHO} "make WITH_PGSQL=yes (for PostgreSQL support)"
- @${ECHO} "make WITH_MYSQL=yes WITH_PGSQL=yes (for both MySQL and PostgreSQL support)"
- @${FALSE}
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
-do-configure:
-.if defined(USE_MYSQL)
- @${REINPLACE_CMD} -e "s/^#MYSQL/MYSQL/g" ${WRKSRC}/Makefile
-.endif
-.if defined(HAVE_PGSQL)
- @${REINPLACE_CMD} -e "s/^#PGSQL/PGSQL/g" ${WRKSRC}/Makefile
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PGSQL= yes
+.else
+CONFIGURE_ARGS+=--without-postgresql
.endif
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/gtksql ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/gtksql
-.for file in Changelog README
- ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtksql
+.if ${PORT_OPTIONS:MSQLITE3}
+LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
+.else
+CONFIGURE_ARGS+=--without-sqlite
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/usr/include/mysql|${LOCALBASE}/include/mysql|g' \
+ -e 's|/usr/include/postgresql|${LOCALBASE}/include/postgresql/server|g' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} 's|make|$$(MAKE)|' \
+ ${WRKSRC}/scintilla/Makefile.in
+ @${REINPLACE_CMD} 's|-Os|${CFLAGS}|g' \
+ ${WRKSRC}/scintilla/gtk/makefile
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+ @${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/databases/gtksql/distinfo
==============================================================================
--- head/databases/gtksql/distinfo Tue Feb 26 18:47:53 2013 (r313002)
+++ head/databases/gtksql/distinfo Tue Feb 26 20:07:49 2013 (r313003)
@@ -1,2 +1,2 @@
-SHA256 (gtksql-0.3.tar.gz) = 736e93497e7a4e546144294e53c472e2ab67baaeb5e0442ef4c05b4e73a2d5c9
-SIZE (gtksql-0.3.tar.gz) = 50557
+SHA256 (gtksql-0.4.5.tar.gz) = 114f8a857f5987922c6d571cb498db033cc20dc8efe25201b3eb7297f77dc6e0
+SIZE (gtksql-0.4.5.tar.gz) = 1393651
Added: head/databases/gtksql/files/patch-Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/gtksql/files/patch-Makefile.am Tue Feb 26 20:07:49 2013 (r313003)
@@ -0,0 +1,21 @@
+--- ./Makefile.am.orig 2007-07-20 17:16:40.000000000 +0200
++++ ./Makefile.am 2013-02-26 19:07:58.000000000 +0100
+@@ -2,18 +2,6 @@
+
+ SUBDIRS = Pics po scintilla intl src pixmaps man gnome
+
+-gtksqldocdir = ${prefix}/doc/gtksql
+-gtksqldoc_DATA = \
+- README\
+- COPYING\
+- AUTHORS\
+- ChangeLog\
+- INSTALL\
+- NEWS\
+- TODO
+-
+-EXTRA_DIST = $(gtksqldoc_DATA)
+-
+ # Copy all the spec files. Of course, only one is actually used.
+ dist-hook:
+ for specfile in *.spec; do \
Added: head/databases/gtksql/files/patch-po__Makefile.in.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/gtksql/files/patch-po__Makefile.in.in Tue Feb 26 20:07:49 2013 (r313003)
@@ -0,0 +1,10 @@
+--- ./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
+@@ -13,6 +13,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++GETTEXT_PACKAGE= @PACKAGE@
+
+ SHELL = /bin/sh
+ @SET_MAKE@
Added: head/databases/gtksql/files/patch-src__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/gtksql/files/patch-src__Makefile.am Tue Feb 26 20:07:49 2013 (r313003)
@@ -0,0 +1,13 @@
+--- ./src/Makefile.am.orig 2007-11-01 15:06:11.000000000 +0100
++++ ./src/Makefile.am 2013-02-26 19:07:58.000000000 +0100
+@@ -4,9 +4,7 @@
+ $(PACKAGE_CFLAGS)
+
+ AM_CFLAGS =\
+- -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith\
+- -O1\
+- -g
++ -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith
+
+ bin_PROGRAMS = gtksql
+
Modified: head/databases/gtksql/pkg-descr
==============================================================================
--- head/databases/gtksql/pkg-descr Tue Feb 26 18:47:53 2013 (r313002)
+++ head/databases/gtksql/pkg-descr Tue Feb 26 20:07:49 2013 (r313003)
@@ -1,5 +1,5 @@
-GtkSQL is a graphical query tool for PostgreSQL/MySQL. You can work on
-multiple queries simultaneously:
+GtkSQL is a graphical query tool for PostgreSQL/MySQL/SQLite. You can
+work on multiple queries simultaneously:
* send the current query to the database
* add a new query
@@ -11,4 +11,4 @@ multiple queries simultaneously:
* SQL keyword, table name and field name autocompletion
* rescan the table database.
-WWW: http://membres.lycos.fr/bbrox/GtkSQL/
+WWW: http://sourceforge.net/projects/gtksql/
Modified: head/databases/gtksql/pkg-plist
==============================================================================
--- head/databases/gtksql/pkg-plist Tue Feb 26 18:47:53 2013 (r313002)
+++ head/databases/gtksql/pkg-plist Tue Feb 26 20:07:49 2013 (r313003)
@@ -1,4 +1,36 @@
bin/gtksql
-%%PORTDOCS%%share/doc/gtksql/Changelog
-%%PORTDOCS%%share/doc/gtksql/README
-%%PORTDOCS%%@dirrm share/doc/gtksql
+share/applications/gtksql.desktop
+%%NLS%%share/locale/de_DE/LC_MESSAGES/gtksql.mo
+share/pixmaps/connect-grey.xpm
+share/pixmaps/connect.png
+share/pixmaps/connect.xpm
+share/pixmaps/delete-grey.xpm
+share/pixmaps/delete.xpm
+share/pixmaps/disconnect-grey.xpm
+share/pixmaps/disconnect.png
+share/pixmaps/disconnect.xpm
+share/pixmaps/export-grey.xpm
+share/pixmaps/export.xpm
+share/pixmaps/gtksql.png
+share/pixmaps/gtksql.xpm
+share/pixmaps/gtksql_db.png
+share/pixmaps/gtksql_field.png
+share/pixmaps/gtksql_gnome_icon.png
+share/pixmaps/gtksql_table.png
+share/pixmaps/new-grey.xpm
+share/pixmaps/new.xpm
+share/pixmaps/open-grey.xpm
+share/pixmaps/open.xpm
+share/pixmaps/question.xpm
+share/pixmaps/refresh-grey.xpm
+share/pixmaps/refresh.xpm
+share/pixmaps/rename-grey.xpm
+share/pixmaps/rename.xpm
+share/pixmaps/save-grey.xpm
+share/pixmaps/save.xpm
+share/pixmaps/send-grey.xpm
+share/pixmaps/send.xpm
+share/pixmaps/warning.xpm
+%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de_DE
+ at dirrmtry share/applications
_______________________________________________
svn-ports-all at freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"
More information about the freebsd-ports-bugs
mailing list