cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* make another branch of the libintl test deal with our ancient gettext

Browse Source 
* clean-up
This commit is contained in:
naddy 2004-08-11 20:55:50 +00:00
parent f13de20069
commit a6daef6d27
4 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
textproc/gdiff/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2004/08/04 16:12:14 naddy Exp $
# $OpenBSD: Makefile,v 1.9 2004/08/11 20:55:50 naddy Exp $
COMMENT= "GNU versions of the diff utilities"
@ -22,8 +22,7 @@ SEPARATE_BUILD= simple
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --program-prefix=g
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
MAKEINFO="makeinfo --no-split"
LDFLAGS="-L${LOCALBASE}/lib"
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
.include <bsd.port.mk>

29
textproc/gdiff/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2003/07/24 14:56:09 naddy Exp $
--- configure.orig Sun Mar 24 08:54:40 2002
+++ configure Thu Jul 24 16:36:52 2003
@@ -3722,7 +3722,7 @@
$OpenBSD: patch-configure,v 1.3 2004/08/11 20:55:50 naddy Exp $
--- configure.orig Fri Apr 5 14:48:26 2002
+++ configure Wed Aug 11 14:29:49 2004
@@ -3722,7 +3722,7 @@ _ACEOF
cat >>confdefs.h <<\_ACEOF
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.2 2003/07/24 14:56:09 naddy Exp $
_ACEOF
@@ -5793,7 +5793,6 @@
@@ -5870,7 +5870,6 @@ else
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@ -18,7 +18,24 @@ $OpenBSD: patch-configure,v 1.2 2003/07/24 14:56:09 naddy Exp $
extern
#ifdef __cplusplus
"C"
@@ -5809,7 +5808,7 @@
@@ -5886,7 +5885,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;
}
@@ -5917,7 +5916,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"
@@ -5933,7 +5931,7 @@ int
main ()
{
bindtextdomain ("", "");

9
textproc/gdiff/patches/patch-m4_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-m4_Makefile_in,v 1.1 2003/07/23 21:58:28 naddy Exp $
--- m4/Makefile.in.orig Wed Jul 23 21:01:23 2003
+++ m4/Makefile.in Wed Jul 23 21:01:42 2003
@@ -256,7 +256,7 @@
$OpenBSD: patch-m4_Makefile_in,v 1.2 2004/08/11 20:55:50 naddy Exp $
--- m4/Makefile.in.orig Fri Apr 5 15:19:17 2002
+++ m4/Makefile.in Wed Aug 11 12:09:52 2004
@@ -257,14 +257,14 @@ uninstall-am: uninstall-info-am
Makefile.am: Makefile.am.in
rm -f $@ $@t
@ -10,7 +10,6 @@ $OpenBSD: patch-m4_Makefile_in,v 1.1 2003/07/23 21:58:28 naddy Exp $
(((echo EXTRA_DIST =; \
echo " README jm-glibc-io.m4 Makefile.am.in" \
) | tr '\012' @); \
@@ -263,7 +263,7 @@
(echo *.m4|tr ' ' @) ) \
|sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
>> $@t

8
textproc/gdiff/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2004/08/03 09:55:37 espie Exp $
@comment $OpenBSD: PLIST,v 1.5 2004/08/11 20:55:50 naddy Exp $
bin/gcmp
bin/gdiff
bin/gdiff3
@ -14,14 +14,10 @@ share/locale/de/LC_MESSAGES/diffutils.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/diffutils.mo
share/locale/eo/
share/locale/eo/LC_MESSAGES/
share/locale/eo/LC_MESSAGES/diffutils.mo
share/locale/es/LC_MESSAGES/diffutils.mo
share/locale/fr/LC_MESSAGES/diffutils.mo
share/locale/gl/LC_MESSAGES/diffutils.mo
share/locale/he/
share/locale/he/LC_MESSAGES/
share/locale/he/LC_MESSAGES/diffutils.mo
share/locale/id/LC_MESSAGES/diffutils.mo
share/locale/ja/LC_MESSAGES/diffutils.mo
@ -29,6 +25,4 @@ share/locale/pl/LC_MESSAGES/diffutils.mo
share/locale/ru/LC_MESSAGES/diffutils.mo
share/locale/sv/LC_MESSAGES/diffutils.mo
share/locale/tr/LC_MESSAGES/diffutils.mo
share/locale/zh_TW/
share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/diffutils.mo