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

- gettext fixes

Browse Source 
- sync libtool patches
- miscellaneous clean-ups
This commit is contained in:
naddy 2001-09-18 20:28:53 +00:00
parent dc02c22979
commit 7830044a52
8 changed files with 198 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11/gnome/controlcenter/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.2 2001/09/14 14:41:30 todd Exp $
# $OpenBSD: Makefile,v 1.3 2001/09/18 20:28:53 naddy Exp $
COMMENT= "the GNOME control center"
COMMENT= "GNOME control center"
V= 1.4.0.1
DISTNAME= control-center-${V}
CATEGORIES= x11 gnome
@ -14,8 +14,8 @@ MASTER_SITE_SUBDIR= stable/sources/control-center
LIB_DEPENDS= gnomecanvaspixbuf.::graphics/gdk-pixbuf,gnome \
gnome.36::x11/gnome/libs \
gnomevfs.::x11/gnome/vfs
BUILD_DEPENDS= scrollkeeper-config::textproc/scrollkeeper
RUN_DEPENDS= scrollkeeper-config::textproc/scrollkeeper
BUILD_DEPENDS= scrollkeeper-config::textproc/scrollkeeper
RUN_DEPENDS= ${BUILD_DEPENDS}
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -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_ARGS+= --localstatedir=/var/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@ -35,7 +35,7 @@ post-extract:
${WRKSRC}/capplets/screensaver-properties/screensaver-desktops/Superquadrics.desktop.in;
post-install:
@install -d ${PREFIX}/share/control-center; \
@${INSTALL_DATA_DIR} ${PREFIX}/share/control-center; \
cp -r ${PREFIX}/../../etc/* ${PREFIX}/share/control-center/
.include <bsd.port.mk>

14
x11/gnome/controlcenter/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/09/18 20:28:53 naddy Exp $
--- aclocal.m4.orig Tue Sep 18 19:52:12 2001
+++ aclocal.m4 Tue Sep 18 19:52:56 2001
@@ -1503,6 +1503,10 @@ AC_DEFUN(AM_GNOME_WITH_NLS,
gt_cv_func_gettext_libintl=no)])
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ LIBS="$LIBS -lintl";
+ fi
+
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
AC_DEFINE(HAVE_GETTEXT)

12
x11/gnome/controlcenter/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2001/09/13 21:38:02 todd Exp $
--- configure.orig Thu Aug 30 16:36:43 2001
+++ configure Thu Aug 30 16:37:11 2001
@@ -3323,7 +3323,7 @@ else
FALSE_FALSE=
fi
-ALL_LINGUAS="az bg ca cs da de el en_GB es et eu fi fr ga gl hr hu it ja ko lt nl no pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN.GB2312 zh_TW.Big5"
+ALL_LINGUAS="az bg ca cs da de el en_GB es et eu fi fr ga gl hr hu it ko lt nl no pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN.GB2312 zh_TW.Big5"
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:3329: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then

66
x11/gnome/controlcenter/patches/patch-ltconfig
View File

@ -1,16 +1,34 @@
$OpenBSD: patch-ltconfig,v 1.2 2001/09/18 20:28:53 naddy Exp $
--- ltconfig.orig Fri Mar 9 17:21:39 2001
+++ ltconfig Thu Aug 30 16:35:15 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
+++ ltconfig Tue Sep 18 19:48:57 2001
@@ -501,7 +501,14 @@ fi
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1105,7 +1112,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,21 @@ else
ld_shlibs=yes
@@ -1402,10 +1411,21 @@ else
;;
openbsd*)
@ -20,32 +38,44 @@
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2022,13 +2036,10 @@ netbsd*)
@@ -2022,9 +2042,23 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=no
+ need_version=no
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

48
x11/gnome/controlcenter/patches/patch-ltmain.sh
View File

@ -1,45 +1,45 @@
$OpenBSD: patch-ltmain.sh,v 1.2 2001/09/18 20:28:53 naddy Exp $
--- ltmain.sh.orig Fri Mar 9 17:21:39 2001
+++ ltmain.sh Thu Aug 30 16:35:15 2001
@@ -1079,7 +1079,18 @@ compiler."
+++ ltmain.sh Tue Sep 18 19:49:00 2001
@@ -1079,6 +1079,17 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1799,6 +1814,9 @@ compiler."
@@ -1795,6 +1810,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*-*-rhapsody*)
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0

67
x11/gnome/controlcenter/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 20:28:53 naddy Exp $
--- po/Makefile.in.in.orig Fri Mar 9 17:21:39 2001
+++ po/Makefile.in.in Tue Sep 18 19:49:56 2001
@@ -25,6 +25,8 @@ gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
+DESTDIR =
+
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
@@ -112,16 +114,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; \
@@ -154,12 +156,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
@@ -172,12 +174,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

4
x11/gnome/controlcenter/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/09/13 21:38:02 todd Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/09/18 20:28:53 naddy Exp $
lib/libcapplet.so.0.0
DYNLIBDIR(%D/lib)
DYNLIBDIR(%B)

38
x11/gnome/controlcenter/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/09/13 21:38:02 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/09/18 20:28:53 naddy Exp $
bin/background-properties-capplet
bin/file-types-capplet
bin/gnome-edit-properties-capplet
@ -253,6 +253,42 @@ share/gnome/wm-properties/Scwm.desktop
share/gnome/wm-properties/WindowMaker.desktop
share/gnome/wm-properties/twm.desktop
share/idl/control-center.idl
share/locale/az/LC_MESSAGES/control-center.mo
share/locale/bg/LC_MESSAGES/control-center.mo
share/locale/ca/LC_MESSAGES/control-center.mo
share/locale/cs/LC_MESSAGES/control-center.mo
share/locale/da/LC_MESSAGES/control-center.mo
share/locale/de/LC_MESSAGES/control-center.mo
share/locale/el/LC_MESSAGES/control-center.mo
share/locale/en_GB/LC_MESSAGES/control-center.mo
share/locale/es/LC_MESSAGES/control-center.mo
share/locale/et/LC_MESSAGES/control-center.mo
share/locale/eu/LC_MESSAGES/control-center.mo
share/locale/fi/LC_MESSAGES/control-center.mo
share/locale/fr/LC_MESSAGES/control-center.mo
share/locale/ga/LC_MESSAGES/control-center.mo
share/locale/gl/LC_MESSAGES/control-center.mo
share/locale/hr/LC_MESSAGES/control-center.mo
share/locale/hu/LC_MESSAGES/control-center.mo
share/locale/it/LC_MESSAGES/control-center.mo
share/locale/ja/LC_MESSAGES/control-center.mo
share/locale/ko/LC_MESSAGES/control-center.mo
share/locale/lt/LC_MESSAGES/control-center.mo
share/locale/nl/LC_MESSAGES/control-center.mo
share/locale/no/LC_MESSAGES/control-center.mo
share/locale/pl/LC_MESSAGES/control-center.mo
share/locale/pt/LC_MESSAGES/control-center.mo
share/locale/pt_BR/LC_MESSAGES/control-center.mo
share/locale/ro/LC_MESSAGES/control-center.mo
share/locale/ru/LC_MESSAGES/control-center.mo
share/locale/sk/LC_MESSAGES/control-center.mo
share/locale/sl/LC_MESSAGES/control-center.mo
share/locale/sv/LC_MESSAGES/control-center.mo
share/locale/tr/LC_MESSAGES/control-center.mo
share/locale/uk/LC_MESSAGES/control-center.mo
share/locale/wa/LC_MESSAGES/control-center.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo
share/omf/control-center/control-center-C.omf
share/pixmaps/ccsplash.png
share/pixmaps/control-center.png