Make ports with autoconf macros from gettext 0.11.1 actually detect

our gettext.  libintl is still linked in statically, though.

Also some related clean-up.
This commit is contained in:
naddy 2003-05-13 00:12:37 +00:00
parent f8ef6fa9b7
commit 698067a9ab
6 changed files with 120 additions and 14 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2002/12/29 19:29:57 fgsch Exp $
# $OpenBSD: Makefile,v 1.5 2003/05/13 00:12:37 naddy Exp $
COMMENT= "audio file volume normalizer"
@ -31,5 +31,3 @@ LIB_DEPENDS+= mad::audio/mad \
audiofile::devel/libaudiofile
.include <bsd.port.mk>

View File

@ -0,0 +1,37 @@
$OpenBSD: patch-configure,v 1.1 2003/05/13 00:12:38 naddy Exp $
--- configure.orig Mon May 12 17:29:18 2003
+++ configure Mon May 12 17:30:28 2003
@@ -13288,7 +13288,6 @@ else
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -13304,7 +13303,7 @@ int
main ()
{
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
;
return 0;
}
@@ -13335,7 +13334,6 @@ rm -f conftest.$ac_objext conftest$ac_ex
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -13351,7 +13349,7 @@ int
main ()
{
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
;
return 0;
}

View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2002/06/04 21:17:04 jasoni Exp $
@comment $OpenBSD: PLIST,v 1.3 2003/05/13 00:12:38 naddy Exp $
bin/normalize
bin/normalize-mp3
bin/normalize-ogg
man/man1/normalize-mp3.1
man/man1/normalize.1
share/locale/en_GB/LC_MESSAGES/normalize.mo
share/locale/fr/LC_MESSAGES/normalize.mo

View File

@ -0,0 +1,37 @@
$OpenBSD: patch-configure,v 1.1 2003/05/13 00:12:37 naddy Exp $
--- configure.orig Mon May 12 16:37:29 2003
+++ configure Mon May 12 16:42:29 2003
@@ -9649,7 +9649,6 @@ else
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -9665,7 +9664,7 @@ int
main ()
{
bindtextdomain ("", "");
-return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_expand_alias (0)
;
return 0;
}
@@ -9696,7 +9695,6 @@ rm -f conftest.$ac_objext conftest$ac_ex
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -9712,7 +9710,7 @@ int
main ()
{
bindtextdomain ("", "");
-return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_expand_alias (0)
;
return 0;
}

View File

@ -1,14 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.5 2003/04/29 00:32:14 margarida Exp $
--- Makefile.in.orig Thu Dec 12 21:49:20 2002
+++ Makefile.in Thu Jan 16 21:12:04 2003
@@ -114,8 +114,8 @@ EXTRA_DIST = config.rpath \
$OpenBSD: patch-Makefile_in,v 1.6 2003/05/13 00:12:37 naddy Exp $
--- Makefile.in.orig Mon Mar 3 18:08:01 2003
+++ Makefile.in Mon May 12 17:47:51 2003
@@ -114,7 +114,7 @@ EXTRA_DIST = config.rpath \
gqview.1
-helpdir = $(prefix)/share/gqview
-help_DATA = README
+helpdir = $(prefix)/share/doc/gqview
+help_DATA = README
help_DATA = README
@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/gnome/apps/Graphics
@HAVE_GNOME_TRUE@desktop_DATA = @HAVE_GNOME_TRUE@gqview.desktop

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.6 2003/01/17 04:26:57 brad Exp $
--- configure.orig Thu Dec 12 21:27:43 2002
+++ configure Thu Jan 16 21:12:04 2003
$OpenBSD: patch-configure,v 1.7 2003/05/13 00:12:37 naddy Exp $
--- configure.orig Mon Mar 3 18:07:43 2003
+++ configure Mon May 12 17:50:30 2003
@@ -2927,7 +2927,7 @@ fi
@ -10,3 +10,37 @@ $OpenBSD: patch-configure,v 1.6 2003/01/17 04:26:57 brad Exp $
EOF
@@ -5242,7 +5242,6 @@ else
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -5250,7 +5249,7 @@ extern
const char *_nl_expand_alias ();
int main() {
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
; return 0; }
EOF
if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -5270,7 +5269,6 @@ rm -f conftest*
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -5278,7 +5276,7 @@ extern
const char *_nl_expand_alias ();
int main() {
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
; return 0; }
EOF
if { (eval echo configure:5285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then