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

fix message catalogs, clean up; ok maintainer

Browse Source
This commit is contained in:
naddy 2001-09-17 20:54:41 +00:00
parent 02ea4b7a9b
commit 0472850bdb
5 changed files with 196 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/oaf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2001/09/14 14:41:30 todd Exp $
# $OpenBSD: Makefile,v 1.3 2001/09/17 20:54:41 naddy Exp $
COMMENT= "Object Activation Framework for GNOME"
V= 0.6.5
@ -22,7 +22,7 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

158
x11/gnome/oaf/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,158 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/09/17 20:54:41 naddy Exp $
--- aclocal.m4.orig Fri Mar 2 04:16:08 2001
+++ aclocal.m4 Mon Sep 17 21:31:42 2001
@@ -38,13 +38,12 @@ AC_DEFUN(AM_GNU_OAF_WITH_NLS,
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
AC_DEFINE(ENABLE_NLS)
-# AC_MSG_CHECKING([whether included gettext is requested])
-# AC_ARG_WITH(included-gettext,
-# [ --with-included-gettext use the GNU gettext library included here],
-# nls_cv_force_use_gnu_gettext=$withval,
-# nls_cv_force_use_gnu_gettext=no)
-# AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
- nls_cv_force_use_gnu_gettext="no"
+ AC_MSG_CHECKING([whether included gettext is requested])
+ AC_ARG_WITH(included-gettext,
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
@@ -63,10 +62,9 @@ AC_DEFUN(AM_GNU_OAF_WITH_NLS,
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi
@@ -90,13 +88,6 @@ AC_DEFUN(AM_GNU_OAF_WITH_NLS,
INSTOBJEXT=.mo
fi
fi
-
- # Added by Martin Baulig 12/15/98 for libc5 systems
- if test "$gt_cv_func_gettext_libc" != "yes" \
- && test "$gt_cv_func_gettext_libintl" = "yes"; then
- INTLLIBS=-lintl
- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
- fi
])
if test "$CATOBJEXT" = "NONE"; then
@@ -113,25 +104,24 @@ AC_DEFUN(AM_GNU_OAF_WITH_NLS,
[AC_DEFINE(HAVE_CATGETS)
INTLOBJS="\$(CATOBJS)"
AC_PATH_PROG(GENCAT, gencat, no)dnl
-# if test "$GENCAT" != "no"; then
-# AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-# if test "$GMSGFMT" = "no"; then
-# AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-# fi
-# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-# USE_INCLUDED_LIBINTL=yes
-# CATOBJEXT=.cat
-# INSTOBJEXT=.cat
-# DATADIRNAME=lib
-# INTLDEPS='$(top_builddir)/intl/libintl.a'
-# INTLLIBS=$INTLDEPS
-# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-# nls_cv_header_intl=intl/libintl.h
-# nls_cv_header_libgt=intl/libgettext.h
-# fi
- ])
+ if test "$GENCAT" != "no"; then
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+ if test "$GMSGFMT" = "no"; then
+ AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+ fi
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ USE_INCLUDED_LIBINTL=yes
+ CATOBJEXT=.cat
+ INSTOBJEXT=.cat
+ DATADIRNAME=lib
+ INTLDEPS='$(top_builddir)/intl/libintl.a'
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ nls_cv_header_intl=intl/libintl.h
+ nls_cv_header_libgt=intl/libgettext.h
+ fi])
fi
fi
@@ -143,27 +133,23 @@ AC_DEFUN(AM_GNU_OAF_WITH_NLS,
fi
if test "$nls_cv_use_gnu_gettext" != "yes"; then
- AC_DEFINE(ENABLE_NLS)
- else
- # Unset this variable since we use the non-zero value as a flag.
- CATOBJEXT=
-# dnl Mark actions used to generate GNU NLS library.
-# INTLOBJS="\$(GETTOBJS)"
-# AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-# AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-# AC_SUBST(MSGFMT)
-# USE_INCLUDED_LIBINTL=yes
-# CATOBJEXT=.gmo
-# INSTOBJEXT=.mo
-# DATADIRNAME=share
-# INTLDEPS='$(top_builddir)/intl/libintl.a'
-# INTLLIBS=$INTLDEPS
-# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-# nls_cv_header_intl=intl/libintl.h
-# nls_cv_header_libgt=intl/libgettext.h
+ dnl Mark actions used to generate GNU NLS library.
+ INTLOBJS="\$(GETTOBJS)"
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ AC_SUBST(MSGFMT)
+ USE_INCLUDED_LIBINTL=yes
+ CATOBJEXT=.gmo
+ INSTOBJEXT=.mo
+ DATADIRNAME=share
+ INTLDEPS='$(top_builddir)/intl/libintl.a'
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ nls_cv_header_intl=intl/libintl.h
+ nls_cv_header_libgt=intl/libgettext.h
fi
dnl Test whether we really found GNU xgettext.
@@ -193,12 +179,12 @@ AC_DEFUN(AM_GNU_OAF_WITH_NLS,
esac])
-# # If this is used in GNU gettext we have to set USE_NLS to `yes'
-# # because some of the sources are only built for this goal.
-# if test "$PACKAGE" = gettext; then
-# USE_NLS=yes
-# USE_INCLUDED_LIBINTL=yes
-# fi
+ # If this is used in GNU gettext we have to set USE_NLS to `yes'
+ # because some of the sources are only built for this goal.
+ if test "$PACKAGE" = gettext; then
+ USE_NLS=yes
+ USE_INCLUDED_LIBINTL=yes
+ fi
dnl These rules are solely for the distribution goal. While doing this
dnl we only have to keep exactly one list of the available catalogs

9
x11/gnome/oaf/patches/patch-ltconfig
View File

@ -1,5 +1,6 @@
--- ltconfig.orig Sun Oct 3 15:17:34 1999
+++ ltconfig Tue Feb 20 17:11:31 2001
$OpenBSD: patch-ltconfig,v 1.2 2001/09/17 20:54:41 naddy Exp $
--- ltconfig.orig Fri Mar 2 04:16:08 2001
+++ ltconfig Mon Sep 17 20:33:14 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
@ -10,7 +11,7 @@
esac
@@ -1391,10 +1394,21 @@ else
@@ -1402,10 +1405,21 @@ else
;;
openbsd*)
@ -34,7 +35,7 @@
;;
os2*)
@@ -1955,13 +1969,10 @@ netbsd*)
@@ -2021,13 +2035,10 @@ netbsd*)
openbsd*)
version_type=sunos

17
x11/gnome/oaf/patches/patch-ltmain.sh
View File

@ -1,6 +1,7 @@
--- ltmain.sh.orig Sun Oct 3 15:17:34 1999
+++ ltmain.sh Tue Feb 20 17:12:45 2001
@@ -1073,7 +1073,18 @@ compiler."
$OpenBSD: patch-ltmain.sh,v 1.2 2001/09/17 20:54:41 naddy Exp $
--- ltmain.sh.orig Fri Mar 2 04:16:08 2001
+++ ltmain.sh Mon Sep 17 20:33:14 2001
@@ -1079,7 +1079,18 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
@ -19,7 +20,7 @@
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1085,6 +1096,10 @@ compiler."
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
@ -30,9 +31,9 @@
-module)
module=yes
continue
@@ -1789,6 +1804,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
@@ -1799,6 +1814,9 @@ compiler."
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
@ -40,7 +41,7 @@
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3522,40 +3540,6 @@ libdir='$install_libdir'\
@@ -3571,40 +3589,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0

44
x11/gnome/oaf/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/09/13 20:23:11 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/09/17 20:54:41 naddy Exp $
bin/oaf-client
bin/oaf-config
bin/oaf-run-query
@ -19,31 +19,31 @@ include/liboaf/oaf-servreg.h
include/liboaf/oaf-util.h
include/liboaf/oaf.h
lib/liboaf.la
lib/locale/da/LC_MESSAGES/oaf.mo
lib/locale/de/LC_MESSAGES/oaf.mo
lib/locale/es/LC_MESSAGES/oaf.mo
lib/locale/fi/LC_MESSAGES/oaf.mo
lib/locale/fr/LC_MESSAGES/oaf.mo
lib/locale/ga/LC_MESSAGES/oaf.mo
lib/locale/gl/LC_MESSAGES/oaf.mo
lib/locale/hu/LC_MESSAGES/oaf.mo
lib/locale/it/LC_MESSAGES/oaf.mo
lib/locale/ja/LC_MESSAGES/oaf.mo
lib/locale/ko/LC_MESSAGES/oaf.mo
lib/locale/no/LC_MESSAGES/oaf.mo
lib/locale/pl/LC_MESSAGES/oaf.mo
lib/locale/pt_BR/LC_MESSAGES/oaf.mo
lib/locale/ro/LC_MESSAGES/oaf.mo
lib/locale/ru/LC_MESSAGES/oaf.mo
lib/locale/sk/LC_MESSAGES/oaf.mo
lib/locale/sl/LC_MESSAGES/oaf.mo
lib/locale/sv/LC_MESSAGES/oaf.mo
lib/locale/tr/LC_MESSAGES/oaf.mo
lib/locale/uk/LC_MESSAGES/oaf.mo
lib/oafConf.sh
share/aclocal/oaf.m4
share/idl/oaf-factory.idl
share/idl/oaf.idl
share/locale/da/LC_MESSAGES/oaf.mo
share/locale/de/LC_MESSAGES/oaf.mo
share/locale/es/LC_MESSAGES/oaf.mo
share/locale/fi/LC_MESSAGES/oaf.mo
share/locale/fr/LC_MESSAGES/oaf.mo
share/locale/ga/LC_MESSAGES/oaf.mo
share/locale/gl/LC_MESSAGES/oaf.mo
share/locale/hu/LC_MESSAGES/oaf.mo
share/locale/it/LC_MESSAGES/oaf.mo
share/locale/ja/LC_MESSAGES/oaf.mo
share/locale/ko/LC_MESSAGES/oaf.mo
share/locale/no/LC_MESSAGES/oaf.mo
share/locale/pl/LC_MESSAGES/oaf.mo
share/locale/pt_BR/LC_MESSAGES/oaf.mo
share/locale/ro/LC_MESSAGES/oaf.mo
share/locale/ru/LC_MESSAGES/oaf.mo
share/locale/sk/LC_MESSAGES/oaf.mo
share/locale/sl/LC_MESSAGES/oaf.mo
share/locale/sv/LC_MESSAGES/oaf.mo
share/locale/tr/LC_MESSAGES/oaf.mo
share/locale/uk/LC_MESSAGES/oaf.mo
share/oaf/OAF_naming-service.oaf
share/oaf/empty.oafinfo
share/oaf/oaf/oaf-config.xml