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

gettext fixes, improve db3 handling, miscellaneous clean-ups

Browse Source
This commit is contained in:
naddy 2001-09-18 14:22:14 +00:00
parent 511ce96e8a
commit 0cda765a34
8 changed files with 138 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/gconf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2001/09/14 14:41:29 todd Exp $
# $OpenBSD: Makefile,v 1.4 2001/09/18 14:22:14 naddy Exp $
COMMENT= "configuration database system written for GNOME"
V= 1.0.1
@ -24,7 +24,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"
@ -38,11 +38,11 @@ CONFIGURE_ENV+= GUILE_CONFIG=/usr/bin/false
.if ${FLAVOR:L:Mdb3}
LIB_DEPENDS+= db::databases/db
CONFIGURE_ENV+= BDB_LIBS="-ldb"
CONFIGURE_ARGS+= --enable-db3
.endif
post-install:
install -d ${PREFIX}/share/gconf; \
${INSTALL_DATA_DIR} ${PREFIX}/share/gconf; \
cp -r ${PREFIX}/../../etc/* ${PREFIX}/share/gconf; \
mv ${PREFIX}/share/gconf/gconf/1/path.example ${PREFIX}/share/gconf/gconf/1/path

16
devel/gconf/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/09/18 14:22:14 naddy Exp $
--- aclocal.m4.orig Tue Sep 18 16:09:46 2001
+++ aclocal.m4 Tue Sep 18 16:12:11 2001
@@ -64,10 +64,9 @@ AC_DEFUN(AM_GCONF_WITH_NLS,
if test "$gt_cv_func_dgettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for dgettext in libintl],
- gt_cv_func_dgettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_dgettext_libintl,
[AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes,
+ [gt_cv_func_dgettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_dgettext_libintl=no)],
gt_cv_func_dgettext_libintl=no)])
fi

54
devel/gconf/patches/patch-configure
View File

@ -1,54 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2001/09/13 20:52:08 todd Exp $
--- configure.orig Mon May 14 19:54:14 2001
+++ configure Sun Sep 9 11:31:50 2001
@@ -2998,47 +2998,13 @@ GNOME_CFLAGS=`$GNOME_CONFIG --cflags gno
-BDB_LIBS=
BDB_CFLAGS=
-echo $ac_n "checking for db_env_create in -ldb-3""... $ac_c" 1>&6
-echo "configure:3006: checking for db_env_create in -ldb-3" >&5
-ac_lib_var=`echo db-3'_'db_env_create | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo $ac_n "checking whether the Berkely db backend should be enabled... $ac_c" 1>&6
+if test -z "$BDB_LIBS"; then
+ echo "$ac_t" "no" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-ldb-3 $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3014 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char db_env_create();
-
-int main() {
-db_env_create()
-; return 0; }
-EOF
-if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- BDB_LIBS=-ldb-3
-else
- echo "$ac_t""no" 1>&6
fi

23
devel/gconf/patches/patch-configure_in Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-configure_in,v 1.1 2001/09/18 14:22:14 naddy Exp $
--- configure.in.orig Tue Sep 18 15:28:19 2001
+++ configure.in Tue Sep 18 15:37:25 2001
@@ -167,11 +167,14 @@ AC_SUBST(GNOME_CFLAGS)
BDB_LIBS=
BDB_CFLAGS=
-AC_CHECK_LIB(db-3, db_env_create, BDB_LIBS=-ldb-3)
-
-if test "x$BDB_LIBS" = x; then
- AC_MSG_WARN(No db3 library found. Not building bdb backend.)
-fi
+AC_ARG_ENABLE(db3,
+ [ --enable-db3=[no/yes] build bdb backend],[
+ AC_CHECK_LIB(db, db_env_create, BDB_LIBS=-ldb,
+ AC_CHECK_LIB(db-3, db_env_create, BDB_LIBS=-ldb-3))
+ if test "x$BDB_LIBS" = x; then
+ AC_MSG_WARN(No db3 library found. Not building bdb backend.)
+ fi
+ ],)
AM_CONDITIONAL(BDB, test -n "$BDB_LIBS")

1
devel/gconf/patches/patch-ltconfig
View File

@ -1,3 +1,4 @@
$OpenBSD: patch-ltconfig,v 1.2 2001/09/18 14:22:14 naddy Exp $
--- ltconfig.orig Mon May 14 19:54:12 2001
+++ ltconfig Mon Aug 27 14:05:38 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)

1
devel/gconf/patches/patch-ltmain.sh
View File

@ -1,3 +1,4 @@
$OpenBSD: patch-ltmain.sh,v 1.2 2001/09/18 14:22:14 naddy Exp $
--- ltmain.sh.orig Mon May 14 19:54:12 2001
+++ ltmain.sh Mon Aug 27 14:05:38 2001
@@ -1079,7 +1079,18 @@ compiler."

67
devel/gconf/patches/patch-po_Makefile_in_in Normal file
View File

@ -0,0 +1,67 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/09/18 14:22:14 naddy Exp $
--- po/Makefile.in.in.orig Fri Sep 15 06:30:24 2000
+++ po/Makefile.in.in Tue Sep 18 15:41:36 2001
@@ -24,6 +24,8 @@ gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
+DESTDIR =
+
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
@@ -111,16 +113,16 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
+ *) destdir=$(DESTDIR)$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
@@ -153,12 +155,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
@@ -171,12 +173,12 @@ uninstall:
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all

28
devel/gconf/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/09/13 20:52:08 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/09/18 14:22:14 naddy Exp $
bin/gconf-config
bin/gconf-config-1
bin/gconfd-1
@ -24,6 +24,30 @@ lib/pkgconfig/gconfgtk.pc
share/aclocal/gconf-1.m4
share/gconf/gconf/1/path
share/gconf/gconf/schemas/desktop.schemas
share/locale/az/LC_MESSAGES/GConf.mo
share/locale/ca/LC_MESSAGES/GConf.mo
share/locale/cs/LC_MESSAGES/GConf.mo
share/locale/da/LC_MESSAGES/GConf.mo
share/locale/de/LC_MESSAGES/GConf.mo
share/locale/el/LC_MESSAGES/GConf.mo
share/locale/es/LC_MESSAGES/GConf.mo
share/locale/fi/LC_MESSAGES/GConf.mo
share/locale/fr/LC_MESSAGES/GConf.mo
share/locale/ga/LC_MESSAGES/GConf.mo
share/locale/hu/LC_MESSAGES/GConf.mo
share/locale/it/LC_MESSAGES/GConf.mo
share/locale/ja/LC_MESSAGES/GConf.mo
share/locale/ko/LC_MESSAGES/GConf.mo
share/locale/nl/LC_MESSAGES/GConf.mo
share/locale/no/LC_MESSAGES/GConf.mo
share/locale/pt_BR/LC_MESSAGES/GConf.mo
share/locale/ru/LC_MESSAGES/GConf.mo
share/locale/sk/LC_MESSAGES/GConf.mo
share/locale/sl/LC_MESSAGES/GConf.mo
share/locale/sv/LC_MESSAGES/GConf.mo
share/locale/tr/LC_MESSAGES/GConf.mo
share/locale/uk/LC_MESSAGES/GConf.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/GConf.mo
share/oaf/gconfd-1.oafinfo
%%SHARED%%
@dirrm share/gconf/gconf/1
@ -34,4 +58,4 @@ share/oaf/gconfd-1.oafinfo
@dirrm lib/GConf
@dirrm include/gconf/1/gconf
@dirrm include/gconf/1
@dirrm include/gconf
@dirrm include/gconf