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

Update to 0.21, from MAINTAINER with libtool/ELF fix from me.

Browse Source 
ok todd@
This commit is contained in:
marcm 2002-11-14 21:03:41 +00:00
parent 6c2a0fc20b
commit 149985caaa
13 changed files with 70 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/gdk-pixbuf/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.22 2002/11/13 16:05:49 brad Exp $
# $OpenBSD: Makefile,v 1.23 2002/11/14 21:03:41 marcm Exp $
COMMENT= "GdkPixbuf graphics library"
COMMENT-gnome= "GdkPixbuf graphics library (GNOME Canvas)"
VERSION= 0.17.0
VERSION= 0.21.0
DISTNAME= gdk-pixbuf-${VERSION}
PKGNAME-gnome= gdk-pixbuf-gnome-${VERSION}
CATEGORIES= graphics
@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/0.17/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/0.21/}
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf

6
graphics/gdk-pixbuf/distinfo
View File

@ -1,3 +1,3 @@
MD5 (gdk-pixbuf-0.17.0.tar.gz) = 021914ad9104f265527c28220315e542
RMD160 (gdk-pixbuf-0.17.0.tar.gz) = 32d72514580416f0f30b0e5ad828f15e13f47cbb
SHA1 (gdk-pixbuf-0.17.0.tar.gz) = afff9706b5ff81bb1eaf631507ed331e0a5b7313
MD5 (gdk-pixbuf-0.21.0.tar.gz) = 5baa4e054bb358443fd7ac12b3a8752a
RMD160 (gdk-pixbuf-0.21.0.tar.gz) = 3d717f172abd0c6bde3d3adf9943fee1101e0971
SHA1 (gdk-pixbuf-0.21.0.tar.gz) = 04b78b15a9daf05e841e287634a4c31190d88bb6

12
graphics/gdk-pixbuf/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2002/05/31 02:41:44 brad Exp $
--- Makefile.in.orig Thu Apr 18 21:25:39 2002
+++ Makefile.in Sun May 26 12:11:19 2002
@@ -481,6 +481,9 @@ gdk_pixbufConf.sh: gdk_pixbufConf.sh.in
$OpenBSD: patch-Makefile_in,v 1.5 2002/11/14 21:03:41 marcm Exp $
--- Makefile.in.orig Sat Sep 28 01:10:27 2002
+++ Makefile.in Mon Oct 7 17:21:51 2002
@@ -491,6 +491,9 @@ gdk_pixbufConf.sh: gdk_pixbufConf.sh.in
-e 's?\@GDK_PIXBUF_INCLUDEDIR\@?$(GDK_PIXBUF_INCLUDEDIR)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@GDK_PIXBUF_LIBS\@?$(GDK_PIXBUF_LIBS)?g' \
@ -11,7 +11,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2002/05/31 02:41:44 brad Exp $
< $(srcdir)/gdk_pixbufConf.sh.in > gdk_pixbufConf.tmp \
&& mv gdk_pixbufConf.tmp gdk_pixbufConf.sh
@@ -489,6 +492,9 @@ gdk_pixbuf_xlibConf.sh: gdk_pixbuf_xlibC
@@ -499,6 +502,9 @@ gdk_pixbuf_xlibConf.sh: gdk_pixbuf_xlibC
-e 's?\@GDK_PIXBUF_XLIB_INCLUDEDIR\@?$(GDK_PIXBUF_XLIB_INCLUDEDIR)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@GDK_PIXBUF_XLIB_LIBS\@?$(GDK_PIXBUF_XLIB_LIBS)?g' \
@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2002/05/31 02:41:44 brad Exp $
< $(srcdir)/gdk_pixbuf_xlibConf.sh.in > gdk_pixbuf_xlibConf.tmp \
&& mv gdk_pixbuf_xlibConf.tmp gdk_pixbuf_xlibConf.sh
@@ -497,6 +503,9 @@ gnomecanvaspixbufConf.sh: gnomecanvaspix
@@ -507,6 +513,9 @@ gnomecanvaspixbufConf.sh: gnomecanvaspix
-e 's?\@GNOMECANVASPIXBUF_INCLUDEDIR\@?$(GNOMECANVASPIXBUF_INCLUDEDIR)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@GNOMECANVASPIXBUF_LIBS\@?$(GNOMECANVASPIXBUF_LIBS)?g' \

120
graphics/gdk-pixbuf/patches/patch-aclocal_m4
View File

@ -1,103 +1,25 @@
$OpenBSD: patch-aclocal_m4,v 1.4 2002/06/02 07:01:47 brad Exp $
--- aclocal.m4.orig Thu Apr 18 18:52:35 2002
+++ aclocal.m4 Sun Jun 2 02:55:01 2002
@@ -863,8 +863,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
fi
# Allow CC to be a program name with arguments.
@@ -1259,7 +1266,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
extract_expsyms_cmds=
case $host_os in
-cygwin* | mingw* | pw32* )
+cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -1267,7 +1274,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -1671,10 +1680,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
$OpenBSD: patch-aclocal_m4,v 1.5 2002/11/14 21:03:41 marcm Exp $
--- aclocal.m4.orig Fri Nov 8 09:43:43 2002
+++ aclocal.m4 Fri Nov 8 09:44:21 2002
@@ -1745,8 +1745,8 @@ else
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -2148,9 +2171,21 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_search_path_spec="/usr/lib /usr/local/lib"
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case "$host_os" in
+ openbsd2.[[89]] | openbsd2.[[89]].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -3281,6 +3316,10 @@ newos6*)
[lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;;
+
+openbsd*)
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
;;
osf3* | osf4* | osf5*)
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
@@ -1755,8 +1755,8 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
;;
esac
fi

5
graphics/gdk-pixbuf/patches/patch-configure_in
View File

@ -1,5 +1,6 @@
--- configure.in.orig Thu Apr 18 18:48:40 2002
+++ configure.in Sun May 26 12:11:19 2002
$OpenBSD: patch-configure_in,v 1.4 2002/11/14 21:03:41 marcm Exp $
--- configure.in.orig Sat Sep 28 01:09:15 2002
+++ configure.in Mon Oct 7 17:35:38 2002
@@ -231,7 +231,7 @@ AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG"
AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)

8
graphics/gdk-pixbuf/patches/patch-doc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.5 2002/05/31 02:41:44 brad Exp $
--- doc/Makefile.in.orig Thu Apr 18 21:25:44 2002
+++ doc/Makefile.in Sun May 26 12:11:19 2002
@@ -231,7 +231,7 @@ install-am: all-am
$OpenBSD: patch-doc_Makefile_in,v 1.6 2002/11/14 21:03:41 marcm Exp $
--- doc/Makefile.in.orig Sat Sep 28 01:10:28 2002
+++ doc/Makefile.in Mon Oct 7 17:36:43 2002
@@ -256,7 +256,7 @@ install-am: all-am
install: install-am
uninstall-am:
uninstall: uninstall-am

11
graphics/gdk-pixbuf/patches/patch-gdk-pixbuf-config_in
View File

@ -1,6 +1,7 @@
--- gdk-pixbuf-config.in.orig Thu Oct 25 04:00:14 2001
+++ gdk-pixbuf-config.in Sun May 26 12:11:19 2002
@@ -39,13 +39,13 @@ while test $# -gt 0; do
$OpenBSD: patch-gdk-pixbuf-config_in,v 1.5 2002/11/14 21:03:41 marcm Exp $
--- gdk-pixbuf-config.in.orig Tue Oct 9 22:49:55 2001
+++ gdk-pixbuf-config.in Mon Oct 7 17:38:36 2002
@@ -39,12 +39,12 @@ while test $# -gt 0; do
echo @GDK_PIXBUF_VERSION@
;;
--cflags)
@ -11,9 +12,7 @@
--libs)
libdirs=-L@libdir@
- echo $libdirs -lgdk_pixbuf `gtk-config --libs`
- ;;
+ echo $libdirs -lgdk_pixbuf `gtk-config --libs` @LIBTIFF@ @LIBJPEG@ @LIBPNG@
+;;
;;
*)
echo "${usage}" 1>&2
exit 1

18
graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_Makefile_in
View File

@ -1,13 +1,17 @@
--- gdk-pixbuf/Makefile.in.orig Thu Apr 18 21:25:41 2002
+++ gdk-pixbuf/Makefile.in Sun May 26 12:11:19 2002
@@ -246,12 +246,12 @@ GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIB
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.9 2002/11/14 21:03:41 marcm Exp $
--- gdk-pixbuf/Makefile.in.orig Sat Sep 28 01:10:27 2002
+++ gdk-pixbuf/Makefile.in Mon Oct 7 17:41:44 2002
@@ -271,7 +271,7 @@ GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIB
# The GdkPixBuf library
#
-libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf-1.0/gdk-pixbuf
+libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf
libgdk_pixbuf_la_SOURCES = gdk-pixbuf.c gdk-pixbuf-animation.c gdk-pixbuf-data.c gdk-pixbuf-drawable.c gdk-pixbuf-io.c gdk-pixbuf-loader.c gdk-pixbuf-render.c gdk-pixbuf-scale.c gdk-pixbuf-util.c gdk-pixbuf-parse-color.c $(extra_sources)
libgdk_pixbuf_la_SOURCES = \
gdk-pixbuf.c \
@@ -287,7 +287,7 @@ libgdk_pixbuf_la_SOURCES = \
$(extra_sources)
-libgdk_pixbuf_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(GTK_LIBS)
@ -15,12 +19,12 @@
libgdk_pixbuf_la_LIBADD = pixops/libpixops.la
#
@@ -261,7 +261,7 @@ libgdk_pixbuf_la_LIBADD = pixops/libpixo
libgdk_pixbuf_xlib_la_SOURCES = gdk-pixbuf.c gdk-pixbuf-xlib.c gdk-pixbuf-animation.c gdk-pixbuf-data.c gdk-pixbuf-io.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-scale.c gdk-pixbuf-util.c gdk-pixbuf-xlibrgb.c gdk-pixbuf-parse-color.c $(extra_sources)
@@ -309,7 +309,7 @@ libgdk_pixbuf_xlib_la_SOURCES = \
$(extra_sources)
-libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS)
+libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS) $(LIBPNG) $(LIBJPEG) $(LIBTIFF)
libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
libgdk_pixbufinclude_HEADERS = gdk-pixbuf.h gdk-pixbuf-loader.h gdk-pixbuf-features.h gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.h $(CANVAS_PIXBUF_HEADERFILES)
libgdk_pixbufinclude_HEADERS = \

6
graphics/gdk-pixbuf/patches/patch-gdk_pixbufConf_sh_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gdk_pixbufConf_sh_in,v 1.4 2002/05/31 02:41:44 brad Exp $
--- gdk_pixbufConf.sh.in.orig Sun May 26 14:39:23 2002
+++ gdk_pixbufConf.sh.in Sun May 26 14:39:57 2002
$OpenBSD: patch-gdk_pixbufConf_sh_in,v 1.5 2002/11/14 21:03:41 marcm Exp $
--- gdk_pixbufConf.sh.in.orig Tue Jun 6 18:41:09 2000
+++ gdk_pixbufConf.sh.in Mon Oct 7 17:42:27 2002
@@ -2,6 +2,6 @@
# Configuration file for using the gdk-pixbuf library in GNOME applications
#

6
graphics/gdk-pixbuf/patches/patch-gdk_pixbuf_xlibConf_sh_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gdk_pixbuf_xlibConf_sh_in,v 1.4 2002/05/31 02:41:44 brad Exp $
--- gdk_pixbuf_xlibConf.sh.in.orig Sun May 26 14:42:36 2002
+++ gdk_pixbuf_xlibConf.sh.in Sun May 26 14:43:20 2002
$OpenBSD: patch-gdk_pixbuf_xlibConf_sh_in,v 1.5 2002/11/14 21:03:41 marcm Exp $
--- gdk_pixbuf_xlibConf.sh.in.orig Sat Aug 26 06:36:32 2000
+++ gdk_pixbuf_xlibConf.sh.in Mon Oct 7 17:42:48 2002
@@ -2,6 +2,6 @@
# Configuration file for using the gdk-pixbuf library in Xlib applications
#

6
graphics/gdk-pixbuf/patches/patch-gnomecanvaspixbufConf_sh_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gnomecanvaspixbufConf_sh_in,v 1.4 2002/05/31 02:41:44 brad Exp $
--- gnomecanvaspixbufConf.sh.in.orig Sun May 26 14:46:32 2002
+++ gnomecanvaspixbufConf.sh.in Sun May 26 14:46:46 2002
$OpenBSD: patch-gnomecanvaspixbufConf_sh_in,v 1.5 2002/11/14 21:03:41 marcm Exp $
--- gnomecanvaspixbufConf.sh.in.orig Mon Jan 17 07:32:23 2000
+++ gnomecanvaspixbufConf.sh.in Mon Oct 7 17:43:09 2002
@@ -2,6 +2,6 @@
# Configuration file for using the gnomecanvaspixbuf library in GNOME applications
#

8
graphics/gdk-pixbuf/patches/patch-ltmain_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.5 2002/06/09 16:43:16 brad Exp $
--- ltmain.sh.orig Thu May 30 22:04:26 2002
+++ ltmain.sh Thu May 30 22:04:51 2002
@@ -1725,11 +1725,6 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.6 2002/11/14 21:03:41 marcm Exp $
--- ltmain.sh.orig Sat Sep 28 01:10:07 2002
+++ ltmain.sh Mon Oct 7 17:44:07 2002
@@ -1737,11 +1737,6 @@ compiler."
continue
fi

22
graphics/gdk-pixbuf/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2002/08/25 22:30:40 brad Exp $
@comment $OpenBSD: PLIST,v 1.15 2002/11/14 21:03:41 marcm Exp $
bin/gdk-pixbuf-config
include/gdk-pixbuf/gdk-pixbuf-features.h
include/gdk-pixbuf/gdk-pixbuf-loader.h
@ -13,14 +13,7 @@ lib/libgdk_pixbuf_xlib.a
lib/libgdk_pixbuf_xlib.la
%%SHARED%%
share/aclocal/gdk-pixbuf.m4
share/doc/gdk-pixbuf/a2605.html
share/doc/gdk-pixbuf/a3640.html
share/doc/gdk-pixbuf/a3652.html
share/doc/gdk-pixbuf/a3657.html
share/doc/gdk-pixbuf/a3694.html
share/doc/gdk-pixbuf/a3696.html
share/doc/gdk-pixbuf/a3716.html
share/doc/gdk-pixbuf/book1.html
share/doc/gdk-pixbuf/compiling.html
share/doc/gdk-pixbuf/extra-configuration-options.html
share/doc/gdk-pixbuf/gdk-pixbuf-animation.html
@ -40,22 +33,9 @@ share/doc/gdk-pixbuf/gdkpixbufloader.html
share/doc/gdk-pixbuf/gnomecanvaspixbuf.html
share/doc/gdk-pixbuf/index.html
share/doc/gdk-pixbuf/license.html
share/doc/gdk-pixbuf/r15.html
share/doc/gdk-pixbuf/r27.html
share/doc/gdk-pixbuf/x2624.html
share/doc/gdk-pixbuf/x2676.html
share/doc/gdk-pixbuf/x3659.html
share/doc/gdk-pixbuf/x3671.html
share/doc/gdk-pixbuf/x3676.html
share/doc/gdk-pixbuf/x3711.html
share/doc/gdk-pixbuf/x3713.html
share/doc/gdk-pixbuf/x3715.html
share/doc/gdk-pixbuf/x3723.html
share/doc/gdk-pixbuf/x3728.html
share/doc/gdk-pixbuf/x3735.html
share/doc/gdk-pixbuf/x3765.html
share/doc/gdk-pixbuf/x3767.html
share/doc/gdk-pixbuf/x3787.html
@dirrm share/doc/gdk-pixbuf
@exec mkdir -p %D/lib/gdk-pixbuf/loaders
@unexec rmdir %D/lib/gdk-pixbuf/loaders 2>/dev/null || true