Date: Wed, 19 Apr 2006 11:18:19 +0800 (CST) From: Dryice Liu <dryice@dryice.name> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96035: [update] net/gq: update to 1.0rc1 and take maintainership Message-ID: <200604190318.k3J3IJ6J055228@readonline.info> Resent-Message-ID: <200604190320.k3J3KDrn007191@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96035
>Category: ports
>Synopsis: [update] net/gq: update to 1.0rc1 and take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 19 03:20:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Dryice Liu
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD dryice.3322.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Thu Dec 1 15:59:44 CST 2005
>Description:
changes:
- update to 1.0 rc1
- change patch file names and utilize DATADIR to make
portlint happy
- take maintainership. Thanks the previous
maintainers!
>How-To-Repeat:
>Fix:
--- attached file begins here ---
diff -ruN gq.old/Makefile gq/Makefile
--- gq.old/Makefile Sat Apr 8 07:33:55 2006
+++ gq/Makefile Wed Apr 19 11:15:11 2006
@@ -6,14 +6,14 @@
#
PORTNAME= gq
-PORTVERSION= 1.0b1
-PORTREVISION= 6
+PORTVERSION= 1.0r1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+ http://dryice.name/computer/FreeBSD/distfiles/
MASTER_SITE_SUBDIR= gqclient
-DISTNAME= gq-${PORTVERSION:S/b/beta/}
+DISTNAME= gq-${PORTVERSION:S/r/rc/}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dryice@dryice.name
COMMENT= GTK-based LDAP client
USE_GMAKE= yes
diff -ruN gq.old/distinfo gq/distinfo
--- gq.old/distinfo Sat Nov 26 03:10:04 2005
+++ gq/distinfo Wed Apr 19 10:16:05 2006
@@ -1,3 +1,3 @@
-MD5 (gq-1.0beta1.tar.gz) = c904ff52f513a58516d9543f8dc3fe5b
-SHA256 (gq-1.0beta1.tar.gz) = 93fed2f77dedf4ececa475a11fab25d126720165c36c4179c8cd13b50e636552
-SIZE (gq-1.0beta1.tar.gz) = 475081
+MD5 (gq-1.0rc1.tar.gz) = c7944d681382d32440d4bf0241142697
+SHA256 (gq-1.0rc1.tar.gz) = 8f5a2c1aeb26a75c1de3232df2595a43e87cd252f2911354add4cd9c59514112
+SIZE (gq-1.0rc1.tar.gz) = 562766
diff -ruN gq.old/files/patch-configure gq/files/patch-configure
--- gq.old/files/patch-configure Tue Mar 16 22:21:03 2004
+++ gq/files/patch-configure Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- configure.orig Tue Feb 17 00:38:43 2004
-+++ configure Tue Feb 17 00:39:12 2004
-@@ -6702,7 +6702,7 @@
- fi;
-
- if test "x$GCC" = "xyes"; then
-- for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith -Wfloat-equal
-+ for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith
- do
- # The following should work as well, but might (?) be less portable
- # if ! echo "$CFLAGS" | grep -q -w -- "$A" ; then
diff -ruN gq.old/files/patch-icons-Makefile.in gq/files/patch-icons-Makefile.in
--- gq.old/files/patch-icons-Makefile.in Thu Jan 1 08:00:00 1970
+++ gq/files/patch-icons-Makefile.in Wed Apr 19 10:27:09 2006
@@ -0,0 +1,11 @@
+--- icons/Makefile.in.orig Mon Apr 10 19:22:45 2006
++++ icons/Makefile.in Wed Apr 19 10:26:21 2006
+@@ -193,7 +193,7 @@
+ warning.xpm
+
+ EXTRA_DIST = $(PIXMAPS)
+-pixmapdir = $(datadir)/pixmaps/gq
++pixmapdir = $(datadir)/gq
+ pixmap_DATA = $(PIXMAPS)
+ all: all-am
+
diff -ruN gq.old/files/patch-icons::Makefile.in gq/files/patch-icons::Makefile.in
--- gq.old/files/patch-icons::Makefile.in Tue Mar 16 22:21:03 2004
+++ gq/files/patch-icons::Makefile.in Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- icons/Makefile.in.orig Thu Jun 8 14:42:26 2000
-+++ icons/Makefile.in Thu Jun 8 14:42:40 2000
-@@ -70,7 +70,7 @@
-
- EXTRA_DIST = $(PIXMAPS)
-
--pixmapdir = $(datadir)/pixmaps/gq
-+pixmapdir = $(datadir)/gq
- pixmap_DATA = $(PIXMAPS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff -ruN gq.old/files/patch-src-state.c gq/files/patch-src-state.c
--- gq.old/files/patch-src-state.c Thu Jan 1 08:00:00 1970
+++ gq/files/patch-src-state.c Thu Jul 29 07:52:35 2004
@@ -0,0 +1,11 @@
+--- src/state.c.orig Thu Jul 29 09:44:27 2004
++++ src/state.c Thu Jul 29 09:44:51 2004
+@@ -754,7 +754,7 @@
+ }
+ }
+
+- if (n != NULL && v->type != 0) {
++ if (n != NULL && v!=NULL && v->type != 0) {
+ char *ep;
+
+ assert(v);
diff -ruN gq.old/files/patch-src-xmlparse.c gq/files/patch-src-xmlparse.c
--- gq.old/files/patch-src-xmlparse.c Thu Jan 1 08:00:00 1970
+++ gq/files/patch-src-xmlparse.c Wed Apr 19 10:43:07 2006
@@ -0,0 +1,24 @@
+--- src/xmlparse.c.orig Wed Apr 5 08:53:55 2006
++++ src/xmlparse.c Wed Apr 19 10:35:15 2006
+@@ -51,7 +51,7 @@
+ #include "xmlparse.h"
+
+ #define malloc g_malloc
+-#define calloc(n,s) g_malloc0(n * s)
++#define calloc(n,s) g_malloc0((n) * (s))
+
+ #define TAGSTACK_INCR 20
+
+@@ -162,10 +162,11 @@
+ e->attrs = NULL;
+ if (attrs) {
+ for (i = 0 ; attrs[i] ; i++) ;
+- e->attrs = calloc(i, sizeof(xmlChar *));
++ e->attrs = calloc(i+1, sizeof(xmlChar *));
+ for (i = 0 ; attrs[i] ; i++) {
+ e->attrs[i] = (guchar*)strdup((gchar*)attrs[i]);
+ }
++ e->attrs[i] = NULL;
+ }
+
+ /* lookup handler */
diff -ruN gq.old/files/patch-src::state.c gq/files/patch-src::state.c
--- gq.old/files/patch-src::state.c Thu Jul 29 07:52:35 2004
+++ gq/files/patch-src::state.c Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- src/state.c.orig Thu Jul 29 09:44:27 2004
-+++ src/state.c Thu Jul 29 09:44:51 2004
-@@ -754,7 +754,7 @@
- }
- }
-
-- if (n != NULL && v->type != 0) {
-+ if (n != NULL && v!=NULL && v->type != 0) {
- char *ep;
-
- assert(v);
diff -ruN gq.old/files/patch-src::util.c gq/files/patch-src::util.c
--- gq.old/files/patch-src::util.c Sun Oct 31 08:31:55 2004
+++ gq/files/patch-src::util.c Thu Jan 1 08:00:00 1970
@@ -1,20 +0,0 @@
---- src/util.c.orig Mon Nov 3 23:28:24 2003
-+++ src/util.c Thu Oct 14 12:46:42 2004
-@@ -1909,7 +1909,7 @@
- char **gq_ldap_explode_dn(const char *dn, int dummy)
- {
- int i, rc;
-- LDAPDN *parts;
-+ LDAPDN parts;
- char **v = 0;
-
- rc = ldap_str2dn(dn, &parts, LDAP_DN_FORMAT_LDAPV3);
-@@ -1921,7 +1921,7 @@
- v = (char **) calloc((i + 2), sizeof(char*));
-
- for( i = 0 ; parts[i] ; i++ ) {
-- ldap_rdn2str(parts[0][i], &v[i],
-+ ldap_rdn2str(parts[i], &v[i],
- LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
- }
- return v;
diff -ruN gq.old/files/patch-src::xmlparse.c gq/files/patch-src::xmlparse.c
--- gq.old/files/patch-src::xmlparse.c Thu Jul 29 07:52:35 2004
+++ gq/files/patch-src::xmlparse.c Thu Jan 1 08:00:00 1970
@@ -1,24 +0,0 @@
---- src/xmlparse.c.orig Thu Jul 29 09:46:26 2004
-+++ src/xmlparse.c Thu Jul 29 09:47:09 2004
-@@ -51,7 +51,7 @@
- #include "xmlparse.h"
-
- #define malloc g_malloc
--#define calloc(n,s) g_malloc0(n * s)
-+#define calloc(n,s) g_malloc0((n) * (s))
-
- #define TAGSTACK_INCR 20
-
-@@ -162,10 +162,11 @@
- e->attrs = NULL;
- if (attrs) {
- for (i = 0 ; attrs[i] ; i++) ;
-- e->attrs = calloc(i, sizeof(xmlChar *));
-+ e->attrs = calloc(i+1, sizeof(xmlChar *));
- for (i = 0 ; attrs[i] ; i++) {
- e->attrs[i] = strdup(attrs[i]);
- }
-+ e->attrs[i] = NULL;
- }
-
- /* lookup handler */
diff -ruN gq.old/pkg-plist gq/pkg-plist
--- gq.old/pkg-plist Tue Mar 16 22:21:03 2004
+++ gq/pkg-plist Wed Apr 19 11:08:25 2006
@@ -1,10 +1,9 @@
bin/gq
-share/gnome/apps/Internet/gq.desktop
-share/gq/bomb.xpm
-share/gq/hide.xpm
-share/gq/line.xpm
-share/gq/logo.xpm
-share/gq/new.xpm
-share/gq/textarea.xpm
-share/gq/warning.xpm
-@dirrm share/gq
+%%DATADIR%%/bomb.xpm
+%%DATADIR%%/hide.xpm
+%%DATADIR%%/line.xpm
+%%DATADIR%%/logo.xpm
+%%DATADIR%%/new.xpm
+%%DATADIR%%/textarea.xpm
+%%DATADIR%%/warning.xpm
+@dirrm %%DATADIR%%
--- attached file ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604190318.k3J3IJ6J055228>