diff options
| author | hrs <hrs@FreeBSD.org> | 2009-12-21 00:59:04 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2009-12-21 00:59:04 +0800 |
| commit | 9ef9b15f645c4520d0da64402c3049ef415b58f3 (patch) | |
| tree | 63cd75676de7d7f7b532fa36a6a379cbad8c17a3 | |
| parent | 55195fb958f8fdf7718be8dfb39e842198ceb2d8 (diff) | |
| download | freebsd-ports-gnome-9ef9b15f645c4520d0da64402c3049ef415b58f3.tar.gz freebsd-ports-gnome-9ef9b15f645c4520d0da64402c3049ef415b58f3.tar.zst freebsd-ports-gnome-9ef9b15f645c4520d0da64402c3049ef415b58f3.zip | |
Fix build when WITH_FT_BRIDGE=1.
Reported by: Naveen Nathan
PR: ports/141798
| -rw-r--r-- | print/ghostscript8/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index 778d36aa1f53..8d8a0c47e3de 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -37,14 +37,17 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ EXTRALIBS="${EXTRALIBS}" \ SOC_LOADER="dxmainc.c" -CONFIGURE_ENV= ${MAKE_ENV} \ - CPPFLAGS="-DUPD_SIGNAL=0 -I. -I${WRKSRC}/jasper/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \ +CONFIGURE_ENV= ${MAKE_ENV} CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-compile-inits \ --enable-contrib \ --enable-dynamic \ --with-ijs \ --with-jasper +CPPFLAGS= -DUPD_SIGNAL=0 -I. \ + -I${WRKSRC}/jasper/src/libjasper/include \ + -I${LOCALBASE}/include/libpng \ + -I${LOCALBASE}/include XCFLAGS= ${PTHREAD_CFLAGS} XLDFLAGS= ${PTHREAD_LIBS} @@ -192,6 +195,7 @@ CONFIGURE_ARGS+= --disable-fontconfig .if !defined(WITHOUT_FT_BRIDGE) LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 MAKE_ENV+= FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".so" +CPPFLAGS+= -I${LOCALBASE}/include/freetype2 PLIST_SUB+= FAPI="" .else PLIST_SUB+= FAPI="@comment " @@ -245,10 +249,6 @@ pre-build: pre-build-drivers.mak ${MKDIR} ${WRKSRC}/freetype/objs ${LN} -s -f ${LOCALBASE}/lib/libfreetype.so \ ${WRKSRC}/freetype/objs/freetype214MT_D.so -# bug in 8.64. Fixed in r9467. - ${MV} ${WRKSRC}/base/write_t[12].[ch] \ - ${WRKSRC}/base/wrfont.[ch] \ - ${WRKSRC}/psi .endif pre-su-install: |