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

add -lz for freetype, prompted by naddy@

Browse Source 
adjust all WANTLIBs while here
This commit is contained in:
steven 2007-04-01 19:43:56 +00:00
parent ba11d387e1
commit ff685b00eb
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
math/plplot/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2007/02/14 11:51:07 steven Exp $
# $OpenBSD: Makefile,v 1.12 2007/04/01 19:43:56 steven Exp $
SHARED_ONLY= Yes
@ -18,11 +18,11 @@ SHARED_LIBS= csirocsa 0.1 \
plplottcltkd 11.0 \
tclmatrixd 11.0
PKGNAME-main= ${DISTNAME}p0
PKGNAME-c++ = plplot-c++-${VERSION}p0
PKGNAME-f77= plplot-f77-${VERSION}p0
PKGNAME-octave= plplot-octave-${VERSION}p2
PKGNAME-tcl= plplot-tcl-${VERSION}p1
PKGNAME-main= ${DISTNAME}p1
PKGNAME-c++ = plplot-c++-${VERSION}p1
PKGNAME-f77= plplot-f77-${VERSION}p1
PKGNAME-octave= plplot-octave-${VERSION}p3
PKGNAME-tcl= plplot-tcl-${VERSION}p2
CATEGORIES= math graphics
@ -36,7 +36,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
myWANTLIB= m freetype
myWANTLIB= m z freetype
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=plplot/}
@ -108,11 +108,11 @@ MULTI_PACKAGES+=-octave
MODULES= converters/libiconv
WANTLIB-main= ${myWANTLIB} X11 c fontconfig z png jpeg
WANTLIB-main= ${myWANTLIB} X11 Xau Xdmcp expat c fontconfig z png jpeg
WANTLIB-c++ = ${myWANTLIB}
WANTLIB-f77+= ${myWANTLIB} g2c
WANTLIB-octave+= ${myWANTLIB} g2c ncurses readline blas lapack fftw3
WANTLIB-tcl+= ${myWANTLIB} X11 c
WANTLIB-tcl+= ${myWANTLIB} X11 Xau Xdmcp c
LIB_DEPENDS-main= ${MODLIBICONV_LIB_DEPENDS} \
${myLIB_DEPENDS} \

19
math/plplot/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.2 2006/06/06 13:36:28 steven Exp $
$OpenBSD: patch-configure,v 1.3 2007/04/01 19:43:56 steven Exp $
--- configure.orig Tue May 30 01:07:42 2006
+++ configure Wed May 31 18:32:16 2006
+++ configure Sun Apr 1 21:36:50 2007
@@ -468,7 +468,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.2 2006/06/06 13:36:28 steven Exp $
test -z "$LIB_DIR" && LIB_DIR='${libdir}'
@@ -3578,7 +3579,7 @@ test -z "$BIN_DIR" && BIN_DIR='${bindir}
@@ -3578,7 +3579,7 @@ test -z "$BIN_DIR" && BIN_DIR='${bindir}'
test -z "$TCL_DIR" && TCL_DIR="$DATA_DIR/tcl"
@ -30,7 +30,7 @@ $OpenBSD: patch-configure,v 1.2 2006/06/06 13:36:28 steven Exp $
### Documentation directory
@@ -12753,6 +12754,14 @@ if test -z "$aix_libpath"; then aix_libp
@@ -12753,6 +12754,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
fi
output_verbose_link_cmd='echo'
;;
@ -54,7 +54,16 @@ $OpenBSD: patch-configure,v 1.2 2006/06/06 13:36:28 steven Exp $
# ----------------------------------------------------------------------------
# Make some guesses where the Tcl/Tk include files and libraries are.
@@ -23563,36 +23572,36 @@ with_freetype_symbol_bold_italic_font=ti
@@ -23211,7 +23220,7 @@ echo "$as_me: \"User-specified path to libfreetype2 is
if test "$with_freetype2_libdir" = "/usr/lib"; then
with_freetype2_libdir=default
fi
- FREETYPELIBSTR=-lfreetype
+ FREETYPELIBSTR="-lfreetype -lz"
FREETYPELIBCMD=""
FREETYPELIBPATH=""
@@ -23563,36 +23572,36 @@ with_freetype_symbol_bold_italic_font=timesbi.ttf
;;
*)