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

Update to 1.0.5, fix LIB_DEPENDS, take MAINTAINER.

Browse Source 
ok sturm@
This commit is contained in:
marcm 2002-12-23 04:57:56 +00:00
parent ee6063f683
commit 64a19369b6
11 changed files with 54 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devel/pango/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.2 2002/08/09 21:26:43 nino Exp $
# $OpenBSD: Makefile,v 1.3 2002/12/23 04:57:56 marcm Exp $
COMMENT= "library for layout and rendering of text"
DISTNAME= pango-1.0.4
DISTNAME= pango-1.0.5
CATEGORIES= devel x11
HOMEPAGE= http://www.gtk.org
MAINTAINER= Nils Nordman <nino@openbsd.org>
MAINTAINER= Marc Matteo <marcm@openbsd.org>
# LGPL
PERMIT_PACKAGE_CDROM= Yes
@ -17,14 +17,14 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/
EXTRACT_SUFX= .tar.bz2
LIB_DEPENDS= glib-2.0.=0,gmodule-2.0.=0,gobject-2.0.=0::devel/glib2
LIB_DEPENDS= glib-2.0.0.0,gmodule-2.0.0.0,gobject-2.0.0.0::devel/glib2
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
# library versions (major:minor)
LIBPANGO_VERSION= 0:3
LIBPANGOFT2_VERSION= 0:3
LIBPANGOX_VERSION= 0:3
LIBPANGOXFT_VERSION= 0:3
LIBPANGO_VERSION= 0:5
LIBPANGOFT2_VERSION= 0:5
LIBPANGOX_VERSION= 0:5
LIBPANGOXFT_VERSION= 0:5
SEPARATE_BUILD= concurrent
USE_X11= Yes

6
devel/pango/distinfo
View File

@ -1,3 +1,3 @@
MD5 (pango-1.0.4.tar.bz2) = 9147cdbe3c4eac36047257e552665a65
RMD160 (pango-1.0.4.tar.bz2) = b864264b202afedb97901018575f794a840cad27
SHA1 (pango-1.0.4.tar.bz2) = 07f9fbfba22fd9015638787779fd81329372223c
MD5 (pango-1.0.5.tar.bz2) = e300e5c163bc28e180e45c8e20543b4b
RMD160 (pango-1.0.5.tar.bz2) = d388f68f2e278f6e5cdf3eaadfc60316400ffcdc
SHA1 (pango-1.0.5.tar.bz2) = af78ce8851f21f030abf2a3bf10d7108578ae2cd

12
devel/pango/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
--- configure.orig Thu Jun 13 23:04:03 2002
+++ configure Mon Jun 24 17:18:07 2002
@@ -5607,8 +5607,8 @@ else
$OpenBSD: patch-configure,v 1.2 2002/12/23 04:57:56 marcm Exp $
--- configure.orig Sun Oct 13 09:41:22 2002
+++ configure Wed Dec 4 12:34:06 2002
@@ -5608,8 +5608,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
@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
@@ -5617,8 +5617,8 @@ else
@@ -5618,8 +5618,8 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@ -23,7 +23,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
;;
esac
fi
@@ -6134,6 +6134,8 @@ openbsd*)
@@ -6135,6 +6135,8 @@ openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no

8
devel/pango/patches/patch-examples_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-examples_Makefile_in,v 1.2 2002/08/09 21:26:43 nino Exp $
--- examples/Makefile.in.orig Thu Aug 1 14:24:05 2002
+++ examples/Makefile.in Fri Aug 9 22:26:55 2002
@@ -508,7 +508,7 @@ pango.modules:
$OpenBSD: patch-examples_Makefile_in,v 1.3 2002/12/23 04:57:56 marcm Exp $
--- examples/Makefile.in.orig Sun Oct 13 09:50:53 2002
+++ examples/Makefile.in Wed Dec 4 12:34:06 2002
@@ -510,7 +510,7 @@ pango.modules:
if find ../modules -name '*.so' | grep 'so' > /dev/null ; then \
echo "Writing a pango.modules file to use when running examples before installing Pango."; \
(cd ../modules && \

33
devel/pango/patches/patch-modules_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-modules_Makefile_in,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
--- modules/Makefile.in.orig Thu Jun 13 23:04:52 2002
+++ modules/Makefile.in Thu Jul 11 15:27:26 2002
$OpenBSD: patch-modules_Makefile_in,v 1.2 2002/12/23 04:57:56 marcm Exp $
--- modules/Makefile.in.orig Sun Oct 13 09:50:50 2002
+++ modules/Makefile.in Wed Dec 4 13:54:30 2002
@@ -115,6 +115,7 @@ WIN32_LIBS = @WIN32_LIBS@
XFT_LIBS = @XFT_LIBS@
YACC = @YACC@
@ -9,14 +9,29 @@ $OpenBSD: patch-modules_Makefile_in,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
SUBDIRS = \
arabic \
@@ -335,8 +336,9 @@ maintainer-clean-generic clean mostlycle
@@ -336,21 +337,11 @@ maintainer-clean-generic clean mostlycle
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
- $(top_builddir)/pango/pango-querymodules \
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules
+ LD_LIBRARY_PATH=$(top_builddir)/pango/.libs $(top_builddir)/pango/pango-querymodules \
+ `find $(DESTDIR)$(moduledir) -name '*.so'` | sed 's,$(DESTDIR),,' \
- @if $(RUN_QUERY_IMMODULES_TEST) ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
- $(top_builddir)/pango/pango-querymodules \
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
- $(top_builddir)/pango/pango-querymodules \
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- else \
- echo "***" ; \
- echo "*** Warning: pango.modules not created" ; \
- echo "***" ; \
- echo "*** Generate this file on the target system" ; \
- echo "*** system using pango-querymodules" ; \
- echo "***" ; \
- fi
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
+ LD_LIBRARY_PATH=$(top_builddir)/pango/.libs \
+ $(top_builddir)/pango/pango-querymodules \
+ `find $(DESTDIR)$(moduledir) -name '*.so'` | sed 's,$(DESTDIR),,' \
+ > $(DESTDIR)$(sysconfdir)/pango/pango.modules
included-modules:

12
devel/pango/patches/patch-modules_arabic_arabic-ft2_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-modules_arabic_arabic-ft2_c,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
--- modules/arabic/arabic-ft2.c.orig Thu Jan 24 16:18:06 2002
+++ modules/arabic/arabic-ft2.c Fri Jul 19 21:17:59 2002
@@ -49,7 +49,7 @@ static PangoEngineInfo script_engines[]
}
};
-void
+static void
maybe_add_feature (PangoOTRuleset *ruleset,
PangoOTInfo *info,
guint script_index,

39
devel/pango/patches/patch-modules_basic_tables-big_i
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-modules_basic_tables-big_i,v 1.2 2002/08/09 21:26:43 nino Exp $
--- modules/basic/tables-big.i.orig Sat Jul 27 01:36:20 2002
+++ modules/basic/tables-big.i Fri Aug 9 22:28:13 2002
@@ -31,7 +31,7 @@ enum {
ENC_ISO_10646 = 1 << 29
};
-Charset charsets[] = {
+static Charset charsets[] = {
{ 0, NULL, "iso8859-1", conv_ucs4 },
{ 1, "ISO-8859-2", "iso8859-2", conv_8bit },
{ 2, "ISO-8859-3", "iso8859-3", conv_8bit },
@@ -64,7 +64,7 @@ Charset charsets[] = {
{ 29, NULL, "iso10646-1", conv_ucs4 }
};
-CharsetOrdering charset_orderings[] = {
+static CharsetOrdering charset_orderings[] = {
{ "ja", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 19, 16, 17, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29} },
{ "ko", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29} },
{ "zh-cn", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 22, 23, 28, 16, 17, 15, 18, 19, 20, 21, 24, 25, 26, 27, 29} },
@@ -73,7 +73,7 @@ CharsetOrdering charset_orderings[] = {
{ "zh-hk", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 24, 20, 21, 25, 26, 27, 22, 23, 16, 17, 15, 18, 19, 28, 29} },
{ NULL, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 29, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28} }
};
-const guint32 char_mask_map[] = {
+static const guint32 char_mask_map[] = {
0,
ENC_ISO_8859_10|ENC_ISO_8859_1|ENC_ISO_8859_13|ENC_ISO_8859_14|ENC_ISO_8859_15|ENC_ISO_8859_2|ENC_ISO_8859_3|ENC_ISO_8859_4|ENC_ISO_8859_5|ENC_ISO_8859_6|ENC_ISO_8859_7|ENC_ISO_8859_8|ENC_ISO_8859_9|ENC_KOI8_R,
ENC_ISO_8859_10|ENC_ISO_8859_1|ENC_ISO_8859_13|ENC_ISO_8859_14|ENC_ISO_8859_15|ENC_ISO_8859_2|ENC_ISO_8859_3|ENC_ISO_8859_4|ENC_ISO_8859_5|ENC_ISO_8859_6|ENC_ISO_8859_7|ENC_ISO_8859_8|ENC_ISO_8859_9|ENC_JIS_0201|ENC_KOI8_R|ENC_TIS_620,
@@ -297,7 +297,7 @@ const guint32 char_mask_map[] = {
ENC_BIG5|ENC_BIG5|ENC_BIG5|ENC_BIG5|ENC_BIG5|ENC_BIG5|ENC_BIG5,
};
-const guchar char_masks[] = {
+static const guchar char_masks[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,

12
devel/pango/patches/patch-modules_hebrew_hebrew-ft2_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-modules_hebrew_hebrew-ft2_c,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
--- modules/hebrew/hebrew-ft2.c.orig Fri Jul 19 21:21:27 2002
+++ modules/hebrew/hebrew-ft2.c Fri Jul 19 21:21:30 2002
@@ -67,7 +67,7 @@ get_glyph (PangoFont *font,
}
/* This should be extended to support various encodings... */
-gint get_glyph_num(PangoFont *font,
+static gint get_glyph_num(PangoFont *font,
gunichar uch)
{
return uch;

12
devel/pango/patches/patch-modules_hebrew_hebrew-x_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-modules_hebrew_hebrew-x_c,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
--- modules/hebrew/hebrew-x.c.orig Fri Jul 19 21:20:19 2002
+++ modules/hebrew/hebrew-x.c Fri Jul 19 21:20:26 2002
@@ -257,7 +257,7 @@ add_cluster(HebrewFontInfo *font_info,
}
}
-gint get_glyph_num(HebrewFontInfo *font_info,
+static gint get_glyph_num(HebrewFontInfo *font_info,
PangoFont *font,
gunichar uch)
{

11
devel/pango/pkg/PFRAG.shared
View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
lib/libpango-1.0.so.0.3
lib/libpangoft2-1.0.so.0.3
lib/libpangox-1.0.so.0.3
lib/libpangoxft-1.0.so.0.3
@comment $OpenBSD: PFRAG.shared,v 1.2 2002/12/23 04:57:56 marcm Exp $
lib/libpango-1.0.so.0.5
lib/libpangoft2-1.0.so.0.5
lib/libpangox-1.0.so.0.5
lib/libpangoxft-1.0.so.0.5
lib/pango/1.0.0/modules/pango-arabic-ft2.so
lib/pango/1.0.0/modules/pango-arabic-x.so
lib/pango/1.0.0/modules/pango-arabic-xft.so
@ -21,4 +21,5 @@ lib/pango/1.0.0/modules/pango-myanmar-x.so
lib/pango/1.0.0/modules/pango-tamil-x.so
lib/pango/1.0.0/modules/pango-tamil-xft.so
lib/pango/1.0.0/modules/pango-thai-x.so
lib/pango/1.0.0/modules/pango-thai-xft.so
DYNLIBDIR(%D/lib)

4
devel/pango/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/12/23 04:57:56 marcm Exp $
bin/pango-querymodules
include/pango-1.0/pango/pango-attributes.h
include/pango-1.0/pango/pango-break.h
@ -66,6 +66,8 @@ lib/pango/1.0.0/modules/pango-tamil-xft.a
lib/pango/1.0.0/modules/pango-tamil-xft.la
lib/pango/1.0.0/modules/pango-thai-x.a
lib/pango/1.0.0/modules/pango-thai-x.la
lib/pango/1.0.0/modules/pango-thai-xft.a
lib/pango/1.0.0/modules/pango-thai-xft.la
lib/pkgconfig/pango.pc
lib/pkgconfig/pangoft2.pc
lib/pkgconfig/pangox.pc