Commits

Jim Razmus II committed 3b261b5

cvs up

Comments (0)

Files changed (9)

 /README/1.20/Tue Jan  3 00:38:27 2012//
 D/meta////
 /Makefile/1.69/Mon May 28 11:01:38 2012//
-/INDEX/1.386/Thu Jul 26 13:34:55 2012//
+/INDEX/1.387/Tue Jul 31 11:04:06 2012//
 gdb-7.4.1|devel/gdb||GNU debugger|devel/gdb/pkg/DESCR|Pascal Stumpf <Pascal.Stumpf@cubes.de>|devel lang/python|lang/python/2.7|devel/gmake|lang/python/2.7|any|y|y|y|y
 geany-0.20p5|devel/geany||small and lightweight IDE|devel/geany/pkg/DESCR|Jonathan Armani <armani@openbsd.org>|devel|STEM->=0.10.38:devel/gettext converters/libiconv x11/gtk+2|STEM->=0.10.38:devel/gettext STEM->=0.41.1p0:textproc/intltool STEM->=1.21:textproc/groff archivers/bzip2 devel/gmake|STEM->=0.10.38:devel/gettext devel/desktop-file-utils devel/vte x11/gtk+2,-guic|any|y|y|y|y
 libgeotiff-1.3.0|devel/geotiff||GIS TIFF interchange library|devel/geotiff/pkg/DESCR|Landry Breuil <gaston@gcu.info>|devel geo|devel/proj graphics/tiff|||any|y|y|y|y
-gettext-0.18.1p2|devel/gettext||GNU gettext|devel/gettext/pkg/DESCR|Christian Weisgerber <naddy@openbsd.org>|devel|converters/libiconv||converters/libiconv|any|y|y|y|y
+gettext-0.18.1p3|devel/gettext||GNU gettext|devel/gettext/pkg/DESCR|Christian Weisgerber <naddy@openbsd.org>|devel|converters/libiconv||converters/libiconv|any|y|y|y|y
 gflags-1.2p1|devel/gflags||c++ commandline flags processing library|devel/gflags/pkg/DESCR|Vincent Auclair <auclair.vincent@gmail.com>|devel||||any|y|y|y|y
 giblib-1.2.4p5|devel/giblib||utility library including a imlib2 wrapper|devel/giblib/pkg/DESCR|Victor Sahlstedt <salan@legonet.org>|devel|graphics/imlib2|||any|y|y|y|y
 giggle-0.6.1p2|devel/giggle||gtk-based git repository viewer|devel/giggle/pkg/DESCR|Jasper Lievisse Adriaanse <jasper@openbsd.org>|devel x11 x11/gnome|STEM->=0.10.38:devel/gettext converters/libiconv x11/gtksourceview3|STEM->=0.10.38:devel/gettext STEM->=0.20.10:x11/gnome/doc-utils STEM->=0.41.1p0:textproc/intltool archivers/xz devel/git devel/gmake textproc/itstool|STEM->=0.10.38:devel/gettext devel/desktop-file-utils devel/git x11/gnome/yelp x11/gtk+2,-guic|any|y|y|y|y

devel/gettext/CVS/Entries

 D/patches////
 D/pkg////
 /gettext.port.mk/1.12/Mon Jan  2 23:36:53 2012//
-/Makefile/1.56/Sat Jul 14 11:03:34 2012//
 /distinfo/1.9/Sat Jul 14 11:03:34 2012//
+/Makefile/1.57/Tue Jul 31 11:07:13 2012//

devel/gettext/Makefile

-# $OpenBSD: Makefile,v 1.56 2012/07/13 19:43:18 naddy Exp $
+# $OpenBSD: Makefile,v 1.57 2012/07/30 15:37:10 naddy Exp $
 
 COMMENT=	GNU gettext
 
 DISTNAME=	gettext-0.18.1
-REVISION=	2
+REVISION=	3
 SHARED_LIBS +=  intl                 6.0      # .9.1
 SHARED_LIBS +=  asprintf             1.0      # .0.0
 SHARED_LIBS +=  gettextlib           3.0      # .0.0

devel/gettext/patches/CVS/Entries

 /patch-gettext-tools_gnulib-lib_string_in_h/1.1/Mon Jan  2 23:36:53 2012//
 /patch-gettext-tools_src_Makefile_in/1.4/Mon Jan  2 23:36:53 2012//
 /patch-gettext-tools_tests_Makefile_in/1.4/Mon Jan  2 23:36:53 2012//
-/patch-gettext-runtime_intl_dcigettext_c/1.3/Sat Jul 14 11:03:34 2012//
-/patch-gettext-runtime_intl_l10nflist_c/1.1/Fri Jul 13 19:43:18 2012//
+/patch-gettext-runtime_intl_dcigettext_c/1.4/Tue Jul 31 11:07:13 2012//
 D

devel/gettext/patches/patch-gettext-runtime_intl_dcigettext_c

-$OpenBSD: patch-gettext-runtime_intl_dcigettext_c,v 1.3 2012/07/13 19:43:18 naddy Exp $
---- gettext-runtime/intl/dcigettext.c.orig	Sat Dec 26 14:42:37 2009
-+++ gettext-runtime/intl/dcigettext.c	Tue Jul 10 20:08:14 2012
-@@ -507,6 +507,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
-   const char *localename;
- #endif
-   size_t domainname_len;
-+  size_t xdomainname_len;
- 
-   /* If no real MSGID is given return NULL.  */
-   if (msgid1 == NULL)
-@@ -627,6 +628,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
- 	  /* We have a relative path.  Make it absolute now.  */
- 	  size_t dirname_len = strlen (dirname) + 1;
- 	  size_t path_max;
-+	  size_t resolved_dirname_len;
- 	  char *resolved_dirname;
- 	  char *ret;
- 
-@@ -635,7 +637,8 @@ DCIGETTEXT (const char *domainname, const char *msgid1
- 
- 	  for (;;)
- 	    {
--	      resolved_dirname = (char *) alloca (path_max + dirname_len);
-+	      resolved_dirname_len = path_max + dirname_len;
-+	      resolved_dirname = (char *) alloca (resolved_dirname_len);
- 	      ADD_BLOCK (block_list, tmp_dirname);
- 
- 	      __set_errno (0);
-@@ -652,7 +655,8 @@ DCIGETTEXT (const char *domainname, const char *msgid1
- 	       error but simply return the default string.  */
- 	    goto return_untranslated;
- 
--	  stpcpy (stpcpy (strchr (resolved_dirname, '\0'), "/"), dirname);
-+	  strlcat (resolved_dirname, "/", resolved_dirname_len);
-+	  strlcat (resolved_dirname, dirname, resolved_dirname_len);
- 	  dirname = resolved_dirname;
- 	}
- #ifndef IN_LIBGLOCALE
-@@ -670,13 +674,14 @@ DCIGETTEXT (const char *domainname, const char *msgid1
- #endif
- 
-   domainname_len = strlen (domainname);
--  xdomainname = (char *) alloca (strlen (categoryname)
--				 + domainname_len + 5);
-+  xdomainname_len = strlen (categoryname) + domainname_len + 5;
-+  xdomainname = (char *) alloca (xdomainname_len);
-   ADD_BLOCK (block_list, xdomainname);
- 
--  stpcpy ((char *) mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
--			    domainname, domainname_len),
--	  ".mo");
-+  strlcpy (xdomainname, categoryname, xdomainname_len);
-+  strlcat (xdomainname, "/", xdomainname_len);
-+  strlcat (xdomainname, domainname, xdomainname_len);
-+  strlcat (xdomainname, ".mo", xdomainname_len);
- 
-   /* Creating working area.  */
-   single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-@@ -769,13 +774,17 @@ DCIGETTEXT (const char *domainname, const char *msgid1
+$OpenBSD: patch-gettext-runtime_intl_dcigettext_c,v 1.4 2012/07/30 15:37:10 naddy Exp $
+--- gettext-runtime/intl/dcigettext.c.orig	Mon Jun 28 20:23:14 2010
++++ gettext-runtime/intl/dcigettext.c	Mon Jun 28 20:25:07 2010
+@@ -769,13 +769,17 @@ DCIGETTEXT (const char *domainname, const char *msgid1
  		  /* Create a new entry and add it to the search tree.  */
  		  size_t msgid_len;
  		  size_t size;
  #endif
  		  newp = (struct known_translation_t *) malloc (size);
  		  if (newp != NULL)
-@@ -791,7 +800,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
+@@ -791,7 +795,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
  		      memcpy (new_domainname, domainname, domainname_len + 1);
  #ifdef HAVE_PER_THREAD_LOCALE
  		      new_localename = new_domainname + domainname_len + 1;

devel/gettext/patches/patch-gettext-runtime_intl_l10nflist_c

-$OpenBSD: patch-gettext-runtime_intl_l10nflist_c,v 1.1 2012/07/13 19:43:18 naddy Exp $
---- gettext-runtime/intl/l10nflist.c.orig	Sun Jun 28 21:44:04 2009
-+++ gettext-runtime/intl/l10nflist.c	Tue Jul 10 23:41:41 2012
-@@ -183,6 +183,7 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_
-   struct loaded_l10nfile **lastp;
-   struct loaded_l10nfile *retval;
-   char *cp;
-+  size_t abs_filename_len;
-   size_t dirlist_count;
-   size_t entries;
-   int cnt;
-@@ -193,7 +194,7 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_
-     dirlist_len = 0;
- 
-   /* Allocate room for the full file name.  */
--  abs_filename = (char *) malloc (dirlist_len
-+  abs_filename_len =		 (dirlist_len
- 				  + strlen (language)
- 				  + ((mask & XPG_TERRITORY) != 0
- 				     ? strlen (territory) + 1 : 0)
-@@ -204,6 +205,7 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_
- 				  + ((mask & XPG_MODIFIER) != 0
- 				     ? strlen (modifier) + 1 : 0)
- 				  + 1 + strlen (filename) + 1);
-+  abs_filename = (char *) malloc (abs_filename_len);
- 
-   if (abs_filename == NULL)
-     return NULL;
-@@ -218,31 +220,31 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_
-       cp[-1] = '/';
-     }
- 
--  cp = stpcpy (cp, language);
-+  strlcat (abs_filename, language, abs_filename_len);
- 
-   if ((mask & XPG_TERRITORY) != 0)
-     {
--      *cp++ = '_';
--      cp = stpcpy (cp, territory);
-+      strlcat (abs_filename, "_", abs_filename_len);
-+      strlcat (abs_filename, territory, abs_filename_len);
-     }
-   if ((mask & XPG_CODESET) != 0)
-     {
--      *cp++ = '.';
--      cp = stpcpy (cp, codeset);
-+      strlcat (abs_filename, ".", abs_filename_len);
-+      strlcat (abs_filename, codeset, abs_filename_len);
-     }
-   if ((mask & XPG_NORM_CODESET) != 0)
-     {
--      *cp++ = '.';
--      cp = stpcpy (cp, normalized_codeset);
-+      strlcat (abs_filename, ".", abs_filename_len);
-+      strlcat (abs_filename, normalized_codeset, abs_filename_len);
-     }
-   if ((mask & XPG_MODIFIER) != 0)
-     {
--      *cp++ = '@';
--      cp = stpcpy (cp, modifier);
-+      strlcat (abs_filename, "@", abs_filename_len);
-+      strlcat (abs_filename, modifier, abs_filename_len);
-     }
- 
--  *cp++ = '/';
--  stpcpy (cp, filename);
-+  strlcat (abs_filename, "/", abs_filename_len);
-+  strlcat (abs_filename, filename, abs_filename_len);
- 
-   /* Look in list of already loaded domains whether it is already
-      available.  */
-@@ -366,7 +368,7 @@ _nl_normalize_codeset (const char *codeset, size_t nam
-   if (retval != NULL)
-     {
-       if (only_digit)
--	wp = stpcpy (retval, "iso");
-+	wp = (char *) memcpy (retval, "iso", 3) + 3;
-       else
- 	wp = retval;
- 

lang/go/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.4/Thu Jul  5 11:04:36 2012//
 /distinfo/1.3/Thu Jul  5 11:04:36 2012//
 /systrace.filter/1.2/Thu Jul  5 11:04:36 2012//
+/Makefile/1.5/Tue Jul 31 11:13:03 2012//
-# $OpenBSD: Makefile,v 1.4 2012/07/04 15:18:39 jsing Exp $
+# $OpenBSD: Makefile,v 1.5 2012/07/30 15:49:55 espie Exp $
 
 ONLY_FOR_ARCHS =	amd64 i386
 
 EXEPREFIX =		8
 PKG_ARGS +=		-Damd64=0
 PKG_ARGS +=		-Di386=1
+.else
+PKG_ARGS += 		-Damd64=0 -Di386=0
 .endif
+
 GOCFG =			/${GOOS}_${GOARCH}
 GOEXE =			${GOCFG}/${EXEPREFIX}