gd-nox11-2.0.15 (graphics/gd-nox11) won't build

[Jon Noack]

That did it -- worked on 4.8-RELEASE, 4.8-STABLE, and 5.1-RELEASE.

Thanks!
Jon Noack

daichi said the following on 7/10/2003 7:43 AM:

> Hi Jon
> 
> Please try follow patch and report me your result. I think that
> your problem depends on your CFLAGS's value of /etc/make.conf.
> 
> 
> diff -urN /usr/ports/graphics/gd2/Makefile graphics/gd2/Makefile
> --- /usr/ports/graphics/gd2/Makefile	Thu Jul 10 21:25:03 2003
> +++ graphics/gd2/Makefile	Thu Jul 10 21:30:17 2003
> @@ -22,34 +22,29 @@
>  
>  LATEST_LINK=	gd2
>  
> -MAKE_ENV=	WRKSRC="${WRKSRC}" LDADD="${LDADD}"
> +MAKE_ENV=	WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>  MAKEFILE=	${FILESDIR}/Makefile.bsd
>  INSTALLS_SHLIB=	yes
>  
> -CFLAGS+=	-I${WRKSRC} -I${LOCALBASE}/include/freetype2/freetype \
> -        	-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \
> -        	-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ
> -LDADD=		-L${LOCALBASE}/lib -lpng -lz -ljpeg -lfreetype -lm
> -
>  .include <bsd.port.pre.mk>
>  
>  .if defined(WITHOUT_X11) || defined(WITHOUT_XPM)
>  PKGNAMESUFFIX=	-nox11
>  .if !defined(WITHOUT_XPM)
>  LIB_DEPENDS+=	Xpm:${PORTSDIR}/graphics/xpm
> -CFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM \
> +CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM \
>  		-DXPM_NOX
> -LDADD+=		-L${X11BASE}/lib -lXpm
> +LDFLAGS+=	-L${X11BASE}/lib -lXpm
>  .endif
>  .else
>  USE_XPM=	yes
> -CFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
> -LDADD+=		-L${X11BASE}/lib -lXpm -lX11
> +CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
> +LDFLAGS+=	-L${X11BASE}/lib -lXpm -lX11
>  .endif
>  
>  .if defined(WITH_LZW) || defined(HAVE_UNISYS_LICENSE) || \
>      (defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES")
> -CFLAGS+=	-DLZW_LICENSED
> +CPPFLAGS+=	-DLZW_LICENSED
>  .endif
>  
>  .if defined(GD_FONTS)
> diff -urN /usr/ports/graphics/gd2/files/Makefile.bsd graphics/gd2/files/Makefile.bsd
> --- /usr/ports/graphics/gd2/files/Makefile.bsd	Thu Jul 10 21:25:03 2003
> +++ graphics/gd2/files/Makefile.bsd	Thu Jul 10 21:24:28 2003
> @@ -18,6 +18,13 @@
>  SHLIB_NAME!=	${MAKE} -V SHLIB_NAME LIB=${LIB} \
>  	SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} -f ${MAKEDIR}/bsd.lib.mk
>  
> +CFLAGS+=	-I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \
> +		-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \
> +		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ \
> +		${CPPFLAGS}
> +LDADD=		-L${LOCALBASE}/lib -lpng -lz -ljpeg -lfreetype -lm \
> +		${LDFLAGS}
> +
>  # The package comes with tests, but without any sort of test-harness,
>  # to run them all automaticly. So building tests is disabled here.	-mi
>  all: lib${LIB}.a ${SHLIB_NAME} ${PROGS} # ${TESTS}
> 
> --
>   Daichi GOTO, http://people.freebsd.org/~daichi
> 
>