Update to 0.2.8.3

This commit is contained in:
alek 2005-05-16 19:22:16 +00:00
parent fa4741d238
commit 990822374a
8 changed files with 56 additions and 98 deletions

View File

@ -1,29 +1,41 @@
# $OpenBSD: Makefile,v 1.8 2004/11/30 01:06:37 espie Exp $
# $OpenBSD: Makefile,v 1.9 2005/05/16 19:22:16 alek Exp $
COMMENT= "WMF handling and conversion library"
DISTNAME= libwmf-0.2.6
DISTNAME= libwmf-0.2.8.3
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
HOMEPAGE= http://www.wvware.com/
HOMEPAGE= http://wvware.sf.net/
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 c freetype iconv m z
WANTLIB= ICE SM X11 c freetype m z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
MODULES= converters/libiconv
LIB_DEPENDS= xml2::textproc/libxml \
jpeg.62::graphics/jpeg \
png.2::graphics/png
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.54
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --enable-static
CONFIGURE_ARGS+= --with-png=${LOCALBASE} --with-freetype=${X11BASE}
CONFIGURE_ARGS+= --with-jpeg=${LOCALBASE} --with-zlib=/usr
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-static \
--with-png=${LOCALBASE} \
--with-freetype=${X11BASE} \
--with-jpeg=${LOCALBASE} \
--with-zlib=/usr \
--without-expat \
--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts/ \
--disable-gd
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng" \
PKG_CONFIG="/usr/bin/false"
USE_X11= Yes
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (libwmf-0.2.6.tar.gz) = 618dd6c361ee749449e3d19228b402b4
RMD160 (libwmf-0.2.6.tar.gz) = 965acce98473cab8ef36d6e7a0e2abd5b47c9210
SHA1 (libwmf-0.2.6.tar.gz) = 4a9957de35e479df626e91a95d2057f460df0de9
SIZE (libwmf-0.2.6.tar.gz) = 1585645
MD5 (libwmf-0.2.8.3.tar.gz) = 3b058327bb14d2373260a74beb7f3e2f
RMD160 (libwmf-0.2.8.3.tar.gz) = 7d53ade95ff9123dfb12b00033eb1451cabcdee5
SHA1 (libwmf-0.2.8.3.tar.gz) = 7408b83ba9f8aebada94b7ffdb0a8baab3b19c96
SIZE (libwmf-0.2.8.3.tar.gz) = 1750358

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2004/11/07 10:11:23 espie Exp $
--- configure.ac.orig Sun Nov 7 10:48:31 2004
+++ configure.ac Sun Nov 7 10:52:01 2004
@@ -433,16 +433,12 @@ AC_CHECK_HEADER(freetype/freetype.h,[
])
if [ test "$have_ft_header" != "yes" ]; then
- no_ft_cppflags=$CPPFLAGS
- CPPFLAGS="-I/usr/include/freetype2 $CPPFLAGS"
AC_CHECK_HEADER(freetype/ftglyph.h,[
- WMF_FT_CFLAGS="-I/usr/include/freetype2"
- WMF_FT_CONFIG_CFLAGS="-I/usr/include/freetype2"
- ],[ CPPFLAGS=$no_ft_cppflags
- CPPFLAGS="-I/usr/local/include/freetype2 -I/usr/local/include $CPPFLAGS"
- AC_CHECK_HEADER(freetype/fttypes.h,[
- WMF_FT_CFLAGS="-I/usr/local/include/freetype2 -I/usr/local/include"
- WMF_FT_CONFIG_CFLAGS="-I/usr/local/include/freetype2 -I/usr/local/include"
+ WMF_FT_CFLAGS="$freetype_cflags"
+ WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
+ ],[ AC_CHECK_HEADER(freetype/fttypes.h,[
+ WMF_FT_CFLAGS="$freetype_cflags"
+ WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
],[ AC_MSG_ERROR([* * * Okay, I give up. Where are those darned headers? * * *])
])
])

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-include_libwmf_types_h,v 1.1 2004/11/07 10:11:23 espie Exp $
--- include/libwmf/types.h.orig Sun Nov 7 10:56:56 2004
+++ include/libwmf/types.h Sun Nov 7 10:57:14 2004
@@ -23,7 +23,8 @@
#include <stdio.h>
#include <sys/types.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include <libwmf/fund.h>

View File

@ -1,15 +1,12 @@
$OpenBSD: patch-ltmain_sh,v 1.2 2002/09/08 11:55:35 avsm Exp $
--- ltmain.sh.orig Fri Aug 30 17:21:02 2002
+++ ltmain.sh Fri Aug 30 17:21:28 2002
@@ -1747,11 +1747,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
$OpenBSD: patch-ltmain_sh,v 1.3 2005/05/16 19:22:16 alek Exp $
--- ltmain.sh.orig Sun May 8 01:31:48 2005
+++ ltmain.sh Sun May 8 01:31:58 2005
@@ -2225,7 +2225,7 @@ EOF
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
+ need_relink=no
fi
# This is a shared library

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_extra_gd_gdft_c,v 1.1 2004/11/07 10:11:23 espie Exp $
--- src/extra/gd/gdft.c.orig Sun Nov 7 10:53:55 2004
+++ src/extra/gd/gdft.c Sun Nov 7 10:56:03 2004
@@ -39,8 +39,9 @@ gdImageStringFT (gdImage * im, int *brec
#else
#include "gdcache.h"
-#include "freetype/freetype.h"
-#include "freetype/ftglyph.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
/* number of fonts cached before least recently used is replaced */
#define FONTCACHESIZE 6

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/15 00:50:09 espie Exp $
@lib lib/libwmf-0.2.so.6.0
@lib lib/libwmf.so.6.0
@lib lib/libwmflite-0.2.so.6.0
@lib lib/libwmflite.so.6.0
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/05/16 19:22:16 alek Exp $
@lib lib/libwmf-0.2.so.8.0
@lib lib/libwmf.so.8.0
@lib lib/libwmflite-0.2.so.7.1
@lib lib/libwmflite.so.7.1

View File

@ -1,13 +1,14 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:50:09 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2005/05/16 19:22:16 alek Exp $
%%SHARED%%
bin/libwmf-config
bin/libwmf-fontmap
bin/wmf2eps
bin/wmf2fig
bin/wmf2gd
bin/wmf2svg
bin/wmf2x
include/libwmf/
include/libwmf/api.h
include/libwmf/canvas.h
include/libwmf/color.h
include/libwmf/defs.h
include/libwmf/eps.h
@ -17,15 +18,6 @@ include/libwmf/foreign.h
include/libwmf/fund.h
include/libwmf/gd/
include/libwmf/gd.h
include/libwmf/gd/gd.h
include/libwmf/gd/gd_clip.h
include/libwmf/gd/gd_io.h
include/libwmf/gd/gdcache.h
include/libwmf/gd/gdfontg.h
include/libwmf/gd/gdfontl.h
include/libwmf/gd/gdfontmb.h
include/libwmf/gd/gdfonts.h
include/libwmf/gd/gdfontt.h
include/libwmf/ipa.h
include/libwmf/macro.h
include/libwmf/svg.h
@ -120,6 +112,7 @@ share/doc/libwmf/html/annotated.html
share/doc/libwmf/html/api_8c.html
share/doc/libwmf/html/api_8h.html
share/doc/libwmf/html/bbuf_8c.html
share/doc/libwmf/html/canvas_8h.html
share/doc/libwmf/html/classes.html
share/doc/libwmf/html/clip_8h.html
share/doc/libwmf/html/coord_8h.html
@ -150,6 +143,7 @@ share/doc/libwmf/html/globals.html
share/doc/libwmf/html/include_2libwmf_2color_8h.html
share/doc/libwmf/html/include_2libwmf_2font_8h.html
share/doc/libwmf/html/index.html
share/doc/libwmf/html/io-wmf_8c.html
share/doc/libwmf/html/ipa_2bmp_8h.html
share/doc/libwmf/html/ipa_2eps_2region_8h.html
share/doc/libwmf/html/ipa_2fig_2region_8h.html
@ -168,6 +162,7 @@ share/doc/libwmf/html/magick_8c.html
share/doc/libwmf/html/magick_8h.html
share/doc/libwmf/html/meta_8c.html
share/doc/libwmf/html/meta_8h.html
share/doc/libwmf/html/metadefs_8h.html
share/doc/libwmf/html/player_2region_8h.html
share/doc/libwmf/html/player_8c.html
share/doc/libwmf/html/plot_2bmp_8h.html
@ -176,6 +171,8 @@ share/doc/libwmf/html/plot_2draw_8h.html
share/doc/libwmf/html/plot_8c.html
share/doc/libwmf/html/plot_8h.html
share/doc/libwmf/html/record_8h.html
share/doc/libwmf/html/recorder_8c.html
share/doc/libwmf/html/recorder_8h.html
share/doc/libwmf/html/src_2font_8h.html
share/doc/libwmf/html/src_2ipa_2fig_2color_8h.html
share/doc/libwmf/html/src_2ipa_2fig_2font_8h.html
@ -186,6 +183,7 @@ share/doc/libwmf/html/src_2ipa_2x_2font_8h.html
share/doc/libwmf/html/src_2ipa_2xgd_2font_8h.html
share/doc/libwmf/html/src_2player_2color_8h.html
share/doc/libwmf/html/stream_8c.html
share/doc/libwmf/html/structWmfContext.html
share/doc/libwmf/html/struct__wmfAPI.html
share/doc/libwmf/html/struct__wmfAPI__Options.html
share/doc/libwmf/html/struct__wmfAttributeStore.html
@ -194,7 +192,11 @@ share/doc/libwmf/html/struct__wmfBMP.html
share/doc/libwmf/html/struct__wmfBMP__Draw__t.html
share/doc/libwmf/html/struct__wmfBMP__Read__t.html
share/doc/libwmf/html/struct__wmfBrush.html
share/doc/libwmf/html/struct__wmfCanvasBrush.html
share/doc/libwmf/html/struct__wmfCanvasFont.html
share/doc/libwmf/html/struct__wmfCanvasPen.html
share/doc/libwmf/html/struct__wmfColorData.html
share/doc/libwmf/html/struct__wmfConstruct.html
share/doc/libwmf/html/struct__wmfDC.html
share/doc/libwmf/html/struct__wmfD__Coord.html
share/doc/libwmf/html/struct__wmfD__Rect.html
@ -225,6 +227,7 @@ share/doc/libwmf/html/struct__wmfPolyPoly__t.html
share/doc/libwmf/html/struct__wmfPolyRectangle__t.html
share/doc/libwmf/html/struct__wmfRGB.html
share/doc/libwmf/html/struct__wmfROP__Draw__t.html
share/doc/libwmf/html/struct__wmfRecordBox.html
share/doc/libwmf/html/struct__wmfStream.html
share/doc/libwmf/html/struct__wmfUserData__t.html
share/doc/libwmf/html/struct__wmfWriteFileInfo.html
@ -298,4 +301,3 @@ share/libwmf/fonts/n022024l.afm
share/libwmf/fonts/n022024l.pfb
share/libwmf/fonts/s050000l.afm
share/libwmf/fonts/s050000l.pfb
%%SHARED%%