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

fix png support by looking in the right include directory

Browse Source 
bump to 1.11bp2
This commit is contained in:
jcs 2005-03-01 18:35:37 +00:00
parent b3719fff03
commit 82991fe673
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/magicpoint/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.37 2005/03/01 18:19:52 jcs Exp $ # $OpenBSD: Makefile,v 1.38 2005/03/01 18:35:37 jcs Exp $
COMMENT= "X11-based presentation tool" COMMENT= "X11-based presentation tool"
DISTNAME= magicpoint-1.09a DISTNAME= magicpoint-1.09a
# hack # hack
PKGNAME= magicpoint-1.11bp1 PKGNAME= magicpoint-1.11bp2
CATEGORIES= misc productivity CATEGORIES= misc productivity
MASTER_SITES= ftp://ftp.mew.org/pub/MagicPoint/ MASTER_SITES= ftp://ftp.mew.org/pub/MagicPoint/

22
misc/magicpoint/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.3 2005/03/01 18:19:52 jcs Exp $ $OpenBSD: patch-configure_in,v 1.4 2005/03/01 18:35:37 jcs Exp $
--- configure.in.orig Tue May 22 01:09:42 2001 --- configure.in.orig Tue May 22 01:09:42 2001
+++ configure.in Tue Mar 1 12:11:33 2005 +++ configure.in Tue Mar 1 12:30:48 2005
@@ -103,6 +103,8 @@ @@ -103,6 +103,8 @@
ac_cv_ft_include="$dir/include" ac_cv_ft_include="$dir/include"
elif test -d $dir/include/freetype -a -f $dir/include/freetype/freetype.h; then elif test -d $dir/include/freetype -a -f $dir/include/freetype/freetype.h; then
@ -19,6 +19,24 @@ $OpenBSD: patch-configure_in,v 1.3 2005/03/01 18:19:52 jcs Exp $
OPTFLAGS="-I$ac_cv_ft_include $OPTFLAGS" OPTFLAGS="-I$ac_cv_ft_include $OPTFLAGS"
DEPLIBS="$ac_cv_ft_lib/$ac_cv_ft_libpath $DEPLIBS" DEPLIBS="$ac_cv_ft_lib/$ac_cv_ft_libpath $DEPLIBS"
AC_CHECK_LIB(intl, dgettext) AC_CHECK_LIB(intl, dgettext)
@@ -244,7 +246,7 @@
fi
for i in /usr/pkg /usr/local /usr; do
- if test -f $i/include/png.h; then
+ if test -f $i/include/libpng/png.h; then
if test -f $i/lib/libpng.a ; then
DEPLIBS="$DEPLIBS $i/lib/libpng.a"
elif test -f $i/lib/libpng.so ; then
@@ -253,7 +255,7 @@
break;
fi
LIBS="$LIBS -L$i/lib"
- OPTFLAGS="$OPTFLAGS -I$i/include"
+ OPTFLAGS="$OPTFLAGS -I$i/include/libpng"
AC_CHECK_LIB(png, png_read_image,
[LIBS="$LIBS -lpng"
AC_DEFINE(USE_PNG)],
@@ -274,7 +276,7 @@ @@ -274,7 +276,7 @@
else else
break; break;