diff options
| author | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
| commit | f22b8c42a61ccfbb462bf2b94c3486b7baec18bd (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /graphics | |
| parent | 71eaa77968f19e23d72fdc88e5f38259b8f7cdf3 (diff) | |
| download | pkgsrc-f22b8c42a61ccfbb462bf2b94c3486b7baec18bd.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'graphics')
81 files changed, 879 insertions, 446 deletions
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile index 680b2c987bb..328fc6a12b2 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -1,33 +1,23 @@ -# $NetBSD: Makefile,v 1.43 2001/11/29 01:12:34 hubertf Exp $ +# $NetBSD: Makefile,v 1.44 2002/08/25 18:38:54 jlam Exp $ # -.include "Makefile.common" - -DISTNAME= Mesa-${MESA_VERSION} +PKGNAME= Mesa-${MESA_VERSION} PKGREVISION= 1 -CATEGORIES= graphics MASTER_SITES= # empty DISTFILES= # empty MAINTAINER= packages@netbsd.org -HOMEPAGE= http://www.mesa3d.org/ COMMENT= Graphics library meta package, similar to SGI's OpenGL - CONFLICTS= Mesa-glx-[0-9]* -CHECK_MESA= yes -.include "../../mk/bsd.prefs.mk" - -.if ${HAVE_BUILTIN_MESA} == "NO" -DEPENDS+= MesaLib-${MESA_VERSION}:../../graphics/MesaLib -.endif +.include "Makefile.common" -.if ${HAVE_BUILTIN_GLU} == "NO" -DEPENDS+= glu-${MESA_VERSION}:../../graphics/glu -.endif +BUILDLINK_DEPENDS.MesaLib= MesaLib-${MESA_VERSION} +BUILDLINK_DEPENDS.glu= glu-${MESA_VERSION} +BUILDLINK_DEPENDS.glut= glut-${MESA_VERSION} -DEPENDS+= glut-${MESA_VERSION}:../../graphics/glut +USE_BUILDLINK2= yes USE_X11BASE= yes NO_CHECKSUM= yes @@ -38,4 +28,8 @@ EXTRACT_ONLY= # empty do-install: # empty +.include "../../graphics/MesaLib/buildlink2.mk" +.include "../../graphics/glu/buildlink2.mk" +.include "../../graphics/glut/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index 6b9ba965677..de9f7f031e3 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1 +1,17 @@ +# $NetBSD: Makefile.common,v 1.3 2002/08/25 18:38:54 jlam Exp $ + MESA_VERSION= 3.4.2 +DISTNAME?= MesaLib-${MESA_VERSION} +CATEGORIES?= graphics +MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} +EXTRACT_SUFX?= .tar.bz2 + +MAINTAINER?= packages@netbsd.org +HOMEPAGE?= http://www.mesa3d.org/ + +USE_GMAKE= yes +USE_LIBTOOL= yes +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig + +GNU_CONFIGURE?= yes +CONFIGURE_ARGS+= --enable-static diff --git a/graphics/Mesa/buildlink.mk b/graphics/Mesa/buildlink.mk index bda4e218f46..4bc4375c6df 100644 --- a/graphics/Mesa/buildlink.mk +++ b/graphics/Mesa/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2002/06/26 05:36:29 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:38:55 jlam Exp $ # # This Makefile fragment is included by packages that use Mesa. # diff --git a/graphics/Mesa/buildlink2.mk b/graphics/Mesa/buildlink2.mk new file mode 100644 index 00000000000..516b28066b4 --- /dev/null +++ b/graphics/Mesa/buildlink2.mk @@ -0,0 +1,12 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:55 jlam Exp $ + +.if !defined(MESA_BUILDLINK2_MK) +MESA_BUILDLINK2_MK= # defined + +BUILDLINK_PREFIX.Mesa= ${BUILDLINK_PREFIX.MesaLib} + +.include "../../graphics/MesaLib/buildlink2.mk" +.include "../../graphics/glu/buildlink2.mk" +.include "../../graphics/glut/buildlink2.mk" + +.endif # MESA_BUILDLINK2_MK diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index d7a1e6c7def..485eb47fe36 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,31 +1,27 @@ -# $NetBSD: Makefile,v 1.9 2001/05/31 05:54:45 tron Exp $ -# +# $NetBSD: Makefile,v 1.10 2002/08/25 18:38:55 jlam Exp $ -.include "../Mesa/Makefile.common" - -DISTNAME= MesaLib-${MESA_VERSION} +PKGNAME= MesaLib-${MESA_VERSION} WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} -CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} -EXTRACT_SUFX= .tar.bz2 - MAINTAINER= rh@netbsd.org -HOMEPAGE= http://www.mesa3d.org/ COMMENT= Graphics library similar to SGI's OpenGL -CHECK_MESA= yes -USE_X11BASE= yes -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -USE_GMAKE= yes +.include "../Mesa/Makefile.common" -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-static --without-glut +USE_BUILDLINK2= yes +USE_X11BASE= yes +CONFIGURE_ARGS+= --without-glut .include "../../mk/bsd.prefs.mk" -.if ${HAVE_BUILTIN_MESA} != "NO" -IGNORE= "MesaLib/GLX has already been installed as part of XFree-4.x" +# Check if we got Mesa distributed with XFree86 4.x. +.if exists(${X11BASE}/include/GL/glx.h) +_IS_BUILTIN_MESA!= ${EGREP} -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_MESA= 0 +.endif + +.if ${_IS_BUILTIN_MESA} != "0" +IGNORE= "MesaLib/GLX has already been installed as part of XFree-4.x" .endif do-build: @@ -37,10 +33,12 @@ do-install: ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET} post-install: - ${INSTALL_DATA_DIR} ${X11PREFIX}/include/GL -.for hdr in gl.h gl_mangle.h glext.h glx.h glx_mangle.h osmesa.h \ - xmesa.h xmesa_x.h xmesa_xf86.h - ${INSTALL_DATA} ${WRKSRC}/include/GL/${hdr} ${X11PREFIX}/include/GL -.endfor + ${INSTALL_DATA_DIR} ${PREFIX}/include/GL + cd ${WRKSRC}/include/GL; for hdr in \ + gl.h gl_mangle.h glext.h glx.h glx_mangle.h osmesa.h \ + xmesa.h xmesa_x.h xmesa_xf86.h; \ + do \ + ${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST index cbe5017ea9a..2f6c10b1b00 100644 --- a/graphics/MesaLib/PLIST +++ b/graphics/MesaLib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:42 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:56 jlam Exp $ etc/mesa.conf include/GL/gl.h include/GL/gl_mangle.h @@ -14,4 +14,4 @@ lib/libGL.so.3 lib/libGL.so.3.4 lib/libGL.a lib/libGL.la -@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || true +@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE} diff --git a/graphics/MesaLib/buildlink.mk b/graphics/MesaLib/buildlink.mk index f7902acbcb9..f3a3498c17d 100644 --- a/graphics/MesaLib/buildlink.mk +++ b/graphics/MesaLib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2002/06/26 05:36:30 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2002/08/25 18:38:56 jlam Exp $ .if !defined(MESALIB_BUILDLINK_MK) MESALIB_BUILDLINK_MK= # defined diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk new file mode 100644 index 00000000000..9931e11acaf --- /dev/null +++ b/graphics/MesaLib/buildlink2.mk @@ -0,0 +1,49 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:56 jlam Exp $ + +.if !defined(MESALIB_BUILDLINK2_MK) +MESALIB_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.MesaLib?= MesaLib>=3.4.2 +BUILDLINK_PKGSRCDIR.MesaLib?= ../../graphics/MesaLib + +# Check if we got Mesa distributed with XFree86 4.x or if we need to +# depend on the Mesa package. +# +_REQUIRE_BUILTIN_MESALIB?= NO +.if exists(${X11BASE}/include/GL/glx.h) +_IS_BUILTIN_MESALIB!= ${EGREP} -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_MESALIB= 0 +.endif +.if (${_IS_BUILTIN_MESALIB} == "0") && (${_REQUIRE_BUILTIN_MESALIB} == "NO") +_NEED_MESALIB= YES +.else +_NEED_MESALIB= NO +.endif + +.if ${_NEED_MESALIB} == "YES" +BUILDLINK_PACKAGES+= MesaLib +EVAL_PREFIX+= BUILDLINK_PREFIX.MesaLib=MesaLib +BUILDLINK_PREFIX.MesaLib_DEFAULT= ${X11PREFIX} +.else +BUILDLINK_PREFIX.MesaLib= ${X11BASE} +.endif + +BUILDLINK_FILES.MesaLib+= include/GL/GL*.h +BUILDLINK_FILES.MesaLib+= include/GL/gl.h +BUILDLINK_FILES.MesaLib+= include/GL/glext.h +BUILDLINK_FILES.MesaLib+= include/GL/gl_mangle.h +BUILDLINK_FILES.MesaLib+= include/GL/glx*.h +BUILDLINK_FILES.MesaLib+= include/GL/osmesa.h +BUILDLINK_FILES.MesaLib+= include/GL/xmesa.h +BUILDLINK_FILES.MesaLib+= include/GL/xmesa_x.h +BUILDLINK_FILES.MesaLib+= include/GL/xmesa_xf86.h +BUILDLINK_FILES.MesaLib+= lib/libGL.* + +BUILDLINK_TARGETS+= MesaLib-buildlink + +MesaLib-buildlink: _BUILDLINK_USE + +.endif # MESALIB_BUILDLINK2_MK diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index d8da098cd84..042c25bc887 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/03/25 14:45:05 cjep Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 18:38:57 jlam Exp $ # DISTNAME= aalib-1.4rc4 @@ -14,8 +14,9 @@ COMMENT= ASCII Art library CONFLICTS+= aalib-x11-[0-9]* WRKSRC= ${WRKDIR}/aalib-1.4.0 -GNU_CONFIGURE= YES -USE_LIBTOOL= yes +USE_BUILDLINK2= YES +GNU_CONFIGURE= YES +USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --with-x11-driver=no diff --git a/graphics/aalib/buildlink2.mk b/graphics/aalib/buildlink2.mk new file mode 100644 index 00000000000..4660fd46d34 --- /dev/null +++ b/graphics/aalib/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:57 jlam Exp $ + +.if !defined(AALIB_BUILDLINK2_MK) +aalib_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= aalib +BUILDLINK_DEPENDS.aalib?= aalib>=1.4.0.4 +BUILDLINK_PKGSRCDIR.aalib?= ../../graphics/aalib + +EVAL_PREFIX+= BUILDLINK_PREFIX.aalib=aalib +BUILDLINK_PREFIX.aalib_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.aalib= include/aalib.h +BUILDLINK_FILES.aalib+= lib/libaa.* + +BUILDLINK_TARGETS+= aalib-buildlink + +aalib-buildlink: _BUILDLINK_USE + +.endif # aalib_BUILDLINK2_MK diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index 5761c024e58..32c7622f6e0 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:06 fredb Exp $ +# $NetBSD: Makefile,v 1.16 2002/08/25 18:38:58 jlam Exp $ DISTNAME= fnlib-0.5 PKGREVISION= 1 @@ -8,30 +8,16 @@ MASTER_SITES= ftp://ftp.enlightenment.org/pub/e/enlightenment/libs/ MAINTAINER= root@garbled.net COMMENT= color font rendering library for X11R6 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= # defined USE_X11BASE= # defined GNU_CONFIGURE= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -# Remove -I$(includedir) from the INCLUDES passed to the compiler as this -# defeats buildlink. -# -post-patch: - cd ${WRKSRC}; \ - files=`${FIND} . -name "Makefile.in" -print`; \ - for file in $${files}; do \ - ${MV} -f $${file} $${file}.fixme; \ - ${SED} -e "/^INCLUDES.*=.*/s|[ ]*-I\$$(includedir)||" \ - $${file}.fixme > $${file}; \ - ${RM} $${file}.fixme; \ - done - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fnlib ${INSTALL_DATA} ${WRKSRC}/doc/fontinfo.README ${PREFIX}/share/doc/fnlib -.include "../../graphics/imlib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/imlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/fnlib/buildlink2.mk b/graphics/fnlib/buildlink2.mk new file mode 100644 index 00000000000..ba9e8018f2c --- /dev/null +++ b/graphics/fnlib/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:58 jlam Exp $ + +.if !defined(FNLIB_BUILDLINK2_MK) +FNLIB_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= fnlib +BUILDLINK_DEPENDS.fnlib?= fnlib>=0.5nb1 +BUILDLINK_PKGSRCDIR.fnlib?= ../../graphics/fnlib + +EVAL_PREFIX+= BUILDLINK_PREFIX.fnlib=fnlib +BUILDLINK_PREFIX.fnlib_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.fnlib= include/Fnlib* +BUILDLINK_FILES.fnlib+= lib/libFnlib.* + +.include "../../graphics/imlib/buildlink2.mk" + +BUILDLINK_TARGETS+= fnlib-buildlink + +fnlib-buildlink: _BUILDLINK_USE + +.endif # FNLIB_BUILDLINK2_MK diff --git a/graphics/freetype-lib/Makefile b/graphics/freetype-lib/Makefile index ac5b67572a9..8423cd65168 100644 --- a/graphics/freetype-lib/Makefile +++ b/graphics/freetype-lib/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2001/09/09 04:06:08 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 18:38:59 jlam Exp $ PKGNAME= freetype-lib-${FT_VERS} COMMENT= TrueType font rendering engine and library API -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined CONFIGURE_ARGS+= --without-x .include "Makefile.common" diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index 86bbd81de38..34a53bc5f73 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2001/09/09 04:06:09 jlam Exp $ +# $NetBSD: Makefile.common,v 1.20 2002/08/25 18:38:59 jlam Exp $ DISTNAME= freetype-${FT_VERS} FT_VERS= 1.3.1 @@ -23,4 +23,4 @@ CONFIGURE_ARGS+= --with-locale-dir=${PREFIX}/${PKGLOCALEDIR}/locale DISTINFO_FILE= ${.CURDIR}/../freetype-lib/distinfo PATCHDIR= ${.CURDIR}/../freetype-lib/patches -.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" diff --git a/graphics/freetype-lib/buildlink2.mk b/graphics/freetype-lib/buildlink2.mk new file mode 100644 index 00000000000..3fb7d768e9e --- /dev/null +++ b/graphics/freetype-lib/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:59 jlam Exp $ + +.if !defined(FREETYPE_BUILDLINK2_MK) +FREETYPE_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= freetype +BUILDLINK_DEPENDS.freetype?= freetype-lib>=1.3.1 +BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib + +EVAL_PREFIX+= BUILDLINK_PREFIX.freetype=freetype-lib +BUILDLINK_PREFIX.freetype_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.freetype= include/freetype/* +BUILDLINK_FILES.freetype+= lib/libttf.* + +.include "../../devel/gettext-lib/buildlink2.mk" + +BUILDLINK_TARGETS+= freetype-buildlink + +freetype-buildlink: _BUILDLINK_USE + +.endif # FREETYPE_BUILDLINK2_MK diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 8576a87200c..7f4cbc10d2d 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/06/01 20:00:23 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 18:39:00 jlam Exp $ # DISTNAME= freetype-2.0.5 @@ -15,37 +15,29 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.freetype.org/ COMMENT= font rendering engine and library API -USE_BUILDLINK_ONLY= YES -CHECK_FREETYPE2= YES +USE_BUILDLINK2= YES USE_GMAKE= YES GNU_CONFIGURE= YES -USE_LIBTOOL= YES +CONFIGURE_DIRS= ${WRKSRC}/builds/unix +CONFIGURE_ARGS+= --includedir=${PREFIX}/include -LTCONFIG_OVERRIDE= ${WRKSRC}/builds/unix/ltconfig +USE_LIBTOOL= YES +LIBTOOL_OVERRIDE= ${WRKSRC}/builds/unix/libtool .include "../../mk/bsd.prefs.mk" -.if ${HAVE_BUILTIN_FREETYPE2} != "NO" +# Check if we got FreeType2 distributed with XFree86 4.x. +.if exists(${X11BASE}/include/freetype2/freetype/freetype.h) +_IS_BUILTIN_FREETYPE2!= ${EGREP} -c BuildFreetype2Library ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_FREETYPE2= 0 +.endif + +.if ${_IS_BUILTIN_FREETYPE2} != "0" IGNORE= "FreeType2 has already been installed as part of XFree86-4.x" .endif -post-patch: - ${RM} -f ${LTCONFIG_OVERRIDE} ; \ - ${ECHO} "${RM} -f libtool; ${LN} -s ${LIBTOOL} libtool" \ - > ${LTCONFIG_OVERRIDE} ; \ - ${CHMOD} +x ${LTCONFIG_OVERRIDE} ; \ - -do-configure: - cd ${WRKSRC}/builds/unix && ${SETENV} \ - CC="${CC}" CFLAGS="${CFLAGS}" \ - CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - INSTALL="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} \ - ${CONFIGURE_ARGS} \ - --includedir=${PREFIX}/include - cd ${WRKSRC} && ${LN} -s builds/unix/unix.mk config.mk +post-configure: + cd ${WRKSRC} && ${LN} -s builds/unix/unix.mk config.mk .include "../../mk/bsd.pkg.mk" diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk index 8b128f2cf57..533fd359c74 100644 --- a/graphics/freetype2/buildlink.mk +++ b/graphics/freetype2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.16 2002/08/06 06:48:10 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.17 2002/08/25 18:39:00 jlam Exp $ # # This Makefile fragment is included by packages that use freetype2. # diff --git a/graphics/freetype2/buildlink2-freetype-config.in b/graphics/freetype2/buildlink2-freetype-config.in new file mode 100644 index 00000000000..d7447dffee1 --- /dev/null +++ b/graphics/freetype2/buildlink2-freetype-config.in @@ -0,0 +1,37 @@ +#!/bin/sh +# +# $NetBSD: buildlink2-freetype-config.in,v 1.2 2002/08/25 18:39:01 jlam Exp $ +# +# If FreeType2 is distributed as part of XFree86, then it may be missing a +# freetype-config script that emits the preprocessor and linker flags +# necessary to find the FreeType2 headers and libraries. This script +# provides that functionality within the buildlink2 framework and is used +# by freetype2/buildlink2.mk. + +while [ $# -gt 0 ] +do + case "$1" in + -*=*) optarg=`echo "$1" | @SED@ 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*|--prefix|--exec-prefix=*|--exec-prefix) + echo @X11BASE@ + ;; + --version) + freetype_h=@X11BASE@/include/freetype2/freetype/freetype.h + major=`@AWK@ '/.*#define.*FREETYPE_MAJOR/ { print $3 }' ${freetype_h}` + minor=`@AWK@ '/.*#define.*FREETYPE_MINOR/ { print $3 }' ${freetype_h}` + echo ${major}.${minor} + exit 0 + ;; + --cflags) + echo -I@X11BASE@/include/freetype2 ${includes} + ;; + --libs) + echo -L@X11BASE@/lib -Wl,-R@X11BASE@/lib -lfreetype + ;; + esac + shift +done diff --git a/graphics/freetype2/buildlink2.mk b/graphics/freetype2/buildlink2.mk new file mode 100644 index 00000000000..fc6725757fd --- /dev/null +++ b/graphics/freetype2/buildlink2.mk @@ -0,0 +1,66 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:01 jlam Exp $ + +.if !defined(FREETYPE2_BUILDLINK2_MK) +FREETYPE2_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.freetype2?= freetype2>=2.0.1 +BUILDLINK_PKGSRCDIR.freetype2?= ../../graphics/freetype2 + +# Check if we got FreeType2 distributed with XFree86 4.x or if we need to +# depend on the freetype2 package. +# +_REQUIRE_BUILTIN_FREETYPE2?= NO +.if exists(${X11BASE}/include/freetype2/freetype/freetype.h) +_IS_BUILTIN_FREETYPE2!= ${EGREP} -c BuildFreetype2Library ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_FREETYPE2= 0 +.endif +.if (${_IS_BUILTIN_FREETYPE2} == "0") && (${_REQUIRE_BUILTIN_FREETYPE2} == "NO") +_NEED_FREETYPE2= YES +.else +_NEED_FREETYPE2= NO +.endif + +.if ${_NEED_FREETYPE2} == "YES" +BUILDLINK_PACKAGES+= freetype2 +EVAL_PREFIX+= BUILDLINK_PREFIX.freetype2=freetype2 +BUILDLINK_PREFIX.freetype2_DEFAULT= ${LOCALBASE} +.else +BUILDLINK_PREFIX.freetype2= ${X11BASE} +.endif + +BUILDLINK_FILES.freetype2= include/ft2build.h +BUILDLINK_FILES.freetype2+= include/freetype2/ft2build.h +BUILDLINK_FILES.freetype2+= include/freetype2/freetype/* +BUILDLINK_FILES.freetype2+= include/freetype2/freetype/cache/* +BUILDLINK_FILES.freetype2+= include/freetype2/freetype/config/* +BUILDLINK_FILES.freetype2+= include/freetype2/freetype/internal/* +BUILDLINK_FILES.freetype2+= lib/libfreetype.* + +BUILDLINK_TARGETS+= freetype2-buildlink +BUILDLINK_TARGETS+= freetype2-buildlink-config + +_FREETYPE2_CONFIG= \ + ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config +_FREETYPE2_BUILDLINK_CONFIG= \ + ${BUILDLINK_DIR}/bin/freetype-config + +freetype2-buildlink: _BUILDLINK_USE + +freetype2-buildlink-config: + ${_PKG_SILENT}${_PKG_DEBUG} \ + if [ ! -f ${_FREETYPE2_CONFIG} ] && \ + [ ! -f ${_FREETYPE2_BUILDLINK_CONFIG} ]; then \ + ${ECHO_BUILDLINK_MSG} "Creating config script ${_FREETYPE_BUILDLINK_CONFIG}."; \ + ${MKDIR} ${_FREETYPE2_BUILDLINK_CONFIG:H}; \ + ${SED} -e "s|@AWK@|${AWK}|g" \ + -e "s|@SED@|${SED}|g" \ + -e "s|@X11BASE@|${X11BASE}|g" \ + ${.CURDIR}/../../graphics/freetype2/buildlink-freetype-config.in \ + > ${_FREETYPE2_BUILDLINK_CONFIG}; \ + ${CHMOD} +x ${_FREETYPE2_BUILDLINK_CONFIG}; \ + fi + +.endif # FREETYPE2_BUILDLINK2_MK diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 5a2607cf6e0..760536fba2e 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:06 fredb Exp $ +# $NetBSD: Makefile,v 1.36 2002/08/25 18:39:02 jlam Exp $ # DISTNAME= gd-1.8.4 @@ -10,8 +10,9 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.boutell.com/gd/ COMMENT= graphics library for fast PNG creation -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_LIBTOOL= YES +USE_X11= YES REPLACE_PERL= bdftogd .include "../../mk/bsd.prefs.mk" @@ -20,8 +21,8 @@ REPLACE_PERL= bdftogd MAKE_ENV+= EXTRA_LIBS="-lsocket -lnsl" .endif -CPPFLAGS+= -I${BUILDLINK_DIR}/include/freetype # freetype.h -CPPFLAGS+= -I${BUILDLINK_DIR}/include/X11 # xpm.h +CPPFLAGS+= -I${BUILDLINK_PREFIX.freetype}/include/freetype # freetype.h +CPPFLAGS+= -I${BUILDLINK_PREFIX.xpm}/include/X11 # xpm.h # When the API changes and breaks binary-compatibility with the previous # version, increment the MAJOR by 1 and reset the MINOR to 0. Otherwise, @@ -31,10 +32,10 @@ GD_MAJOR= 1 GD_MINOR= 9 MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}" -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/freetype-lib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/freetype-lib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gd/buildlink2.mk b/graphics/gd/buildlink2.mk new file mode 100644 index 00000000000..7338ae1529d --- /dev/null +++ b/graphics/gd/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:02 jlam Exp $ + +.if !defined(GD_BUILDLINK2_MK) +GD_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= gd +BUILDLINK_DEPENDS.gd?= gd>=1.8.4nb1 +BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd + +EVAL_PREFIX+= BUILDLINK_PREFIX.gd=gd +BUILDLINK_PREFIX.gd_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.gd= include/gd*.h +BUILDLINK_FILES.gd+= lib/libgd.* + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/freetype-lib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + +BUILDLINK_TARGETS+= gd-buildlink + +gd-buildlink: _BUILDLINK_USE + +.endif # GD_BUILDLINK2_MK diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index afb31f1d830..efd32cfb7a6 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.21 2002/05/11 11:56:58 rh Exp $ +# $NetBSD: Makefile,v 1.22 2002/08/25 18:39:03 jlam Exp $ # PKGNAME= ${DISTNAME} COMMENT= the GNOME image loading library -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= # defined .include "Makefile.common" @@ -23,5 +23,4 @@ post-install: ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4 ${RM} ${PREFIX}/lib/gnomecanvaspixbufConf.sh -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index ee04911e5c1..90450caa633 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2002/05/12 21:39:20 rh Exp $ +# $NetBSD: Makefile.common,v 1.24 2002/08/25 18:39:03 jlam Exp $ # DISTNAME= gdk-pixbuf-0.17.0 @@ -32,7 +32,14 @@ pre-configure: ${LOCALBASE}/bin/automake -a --foreign -i; \ ${LOCALBASE}/bin/autoconf +.if defined(USE_BUILDLINK2) +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" +.else .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.endif diff --git a/graphics/gdk-pixbuf/PLIST b/graphics/gdk-pixbuf/PLIST index 1f1e90680c2..706ad6c717e 100644 --- a/graphics/gdk-pixbuf/PLIST +++ b/graphics/gdk-pixbuf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/05/11 11:56:58 rh Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:39:03 jlam Exp $ bin/gdk-pixbuf-config include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk index 11eb72d68e7..843a1f3fafd 100644 --- a/graphics/gdk-pixbuf/buildlink.mk +++ b/graphics/gdk-pixbuf/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.15 2002/05/14 18:43:52 veego Exp $ +# $NetBSD: buildlink.mk,v 1.16 2002/08/25 18:39:04 jlam Exp $ # # This Makefile fragment is included by packages that use gdk-pixbuf. # diff --git a/graphics/gdk-pixbuf/buildlink2.mk b/graphics/gdk-pixbuf/buildlink2.mk new file mode 100644 index 00000000000..e47841032ef --- /dev/null +++ b/graphics/gdk-pixbuf/buildlink2.mk @@ -0,0 +1,44 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:04 jlam Exp $ + +.if !defined(GDK_PIXBUF_BUILDLINK2_MK) +GDK_PIXBUF_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= gdk-pixbuf +BUILDLINK_DEPENDS.gdk-pixbuf?= gdk-pixbuf>=0.17.0 +BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf + +EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf +BUILDLINK_PREFIX.gdk-pixbuf_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.gdk-pixbuf= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h +BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h +BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h +BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlibrgb.h +BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-bmp.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-gif.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-ico.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-png.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-pnm.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-ras.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-tiff.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-xbm.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-xpm.* +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk_pixbufConf.sh +BUILDLINK_FILES.gdk-pixbuf+= lib/gdk_pixbuf_xlibConf.sh +BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf.* +BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf_xlib.* + +# The gdk-pixbuf headers should be found at the usual location. +BUILDLINK_TRANSFORM.gdk-pixbuf= -e "s|/include/gdk-pixbuf-1.0/|/include/|g" + +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + +BUILDLINK_TARGETS+= gdk-pixbuf-buildlink + +gdk-pixbuf-buildlink: _BUILDLINK_USE + +.endif # GDK_PIXBUF_BUILDLINK2_MK diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo index 51dfc1d78fc..3ea78c6f34f 100644 --- a/graphics/gdk-pixbuf/distinfo +++ b/graphics/gdk-pixbuf/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2002/07/19 04:33:29 fredb Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:39:05 jlam Exp $ SHA1 (gdk-pixbuf-0.17.0.tar.gz) = afff9706b5ff81bb1eaf631507ed331e0a5b7313 Size (gdk-pixbuf-0.17.0.tar.gz) = 547194 bytes SHA1 (patch-aa) = 7cdd7081875d670d24e97a1b77812703d129d73d -SHA1 (patch-ac) = efeb07a327c866bee7ddddbd94a7fae214e4c4d8 +SHA1 (patch-ac) = 16fc33898fc1cb10b3e11ee26e7ea046d1f68032 SHA1 (patch-ad) = 4a16e30eda46b55f51f87785e5f76ea33d3bd8ed -SHA1 (patch-ae) = 8c68907ba7566b1432d5593caeb6ab4f0551f27d +SHA1 (patch-ae) = 2edd8fdd72d5dfaecc92974c6930e5d175e3b69f diff --git a/graphics/gdk-pixbuf/patches/patch-aa b/graphics/gdk-pixbuf/patches/patch-aa index d7bc4c59da6..dbc8469f57d 100644 --- a/graphics/gdk-pixbuf/patches/patch-aa +++ b/graphics/gdk-pixbuf/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2002/07/19 04:33:29 fredb Exp $ +$NetBSD: patch-aa,v 1.4 2002/08/25 18:39:05 jlam Exp $ This is to work-around the following error, reported in PR pkg/17553: diff --git a/graphics/gdk-pixbuf/patches/patch-ac b/graphics/gdk-pixbuf/patches/patch-ac index 132e873088c..18425e05d97 100644 --- a/graphics/gdk-pixbuf/patches/patch-ac +++ b/graphics/gdk-pixbuf/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2000/10/18 00:00:00 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2002/08/25 18:39:05 jlam Exp $ ---- gdk-pixbuf-config.in.orig Mon Apr 10 21:56:56 2000 +--- gdk-pixbuf-config.in.orig Thu Oct 25 04:00:14 2001 +++ gdk-pixbuf-config.in -@@ -46,7 +46,7 @@ +@@ -44,7 +44,7 @@ ;; --libs) libdirs=-L@libdir@ diff --git a/graphics/gdk-pixbuf/patches/patch-ad b/graphics/gdk-pixbuf/patches/patch-ad index 4272b3d2c4c..ce8954572f2 100644 --- a/graphics/gdk-pixbuf/patches/patch-ad +++ b/graphics/gdk-pixbuf/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.3 2002/05/11 11:56:58 rh Exp $ +$NetBSD: patch-ad,v 1.4 2002/08/25 18:39:05 jlam Exp $ --- gdk-pixbuf/Makefile.am.orig Fri Jan 4 12:54:48 2002 +++ gdk-pixbuf/Makefile.am diff --git a/graphics/gdk-pixbuf/patches/patch-ae b/graphics/gdk-pixbuf/patches/patch-ae index 76bf057621a..c58d7425943 100644 --- a/graphics/gdk-pixbuf/patches/patch-ae +++ b/graphics/gdk-pixbuf/patches/patch-ae @@ -1,19 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2002/02/27 06:41:06 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2002/08/25 18:39:06 jlam Exp $ ---- configure.in.orig Thu Apr 26 15:46:16 2001 -+++ configure.in Wed Feb 27 01:35:59 2002 -@@ -130,8 +130,8 @@ - - if $dynworks; then - AC_DEFINE(USE_GMODULE) -- GMODULE_LIBS="`glib-config --libs gmodule`" -- GMODULE_FLAGS="`glib-config --cflags gmodule`" -+ GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`" -+ GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`" - AC_SUBST(GMODULE_LIBS) - AC_SUBST(GMODULE_FLAGS) - AC_MSG_RESULT(yes) -@@ -142,6 +142,7 @@ +--- configure.in.orig Thu Apr 18 18:48:40 2002 ++++ configure.in +@@ -128,6 +128,7 @@ dnl Check for location of rgb.txt file (works without, but better with) AC_MSG_CHECKING([for location of rgb.txt database]) @@ -21,7 +10,7 @@ $NetBSD: patch-ae,v 1.2 2002/02/27 06:41:06 jlam Exp $ dnl default to this.. path_rgb_txt=/usr/lib/X11/rgb.txt -@@ -154,6 +155,7 @@ +@@ -140,6 +141,7 @@ break fi done diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index d4cb8298efd..d03c8f88302 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,28 +1,30 @@ -# $NetBSD: Makefile,v 1.10 2001/09/27 23:18:11 jlam Exp $ -# +# $NetBSD: Makefile,v 1.11 2002/08/25 18:39:06 jlam Exp $ -.include "../Mesa/Makefile.common" - -DISTNAME= MesaLib-${MESA_VERSION} PKGNAME= ${DISTNAME:C/MesaLib/glu/} -CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} -EXTRACT_SUFX= .tar.bz2 - +WRKSRC= ${WRKDIR}/${DISTNAME:C/Lib//} MAINTAINER= rh@netbsd.org -HOMEPAGE= http://www.mesa3d.org/ COMMENT= GLU polygon tesselation facility for Mesa CONFLICTS+= Mesa-glx-[0-9]* CONFLICTS+= Mesa<3.2.1 -WRKSRC= ${WRKDIR}/${DISTNAME:C/Lib//} +.include "../Mesa/Makefile.common" + +USE_BUILDLINK2= yes USE_X11BASE= yes -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-static +.include "../../mk/bsd.prefs.mk" + +# Check if we got libGLU distributed with XFree86 4.x. +.if exists(${X11BASE}/include/GL/glu.h) +_IS_BUILTIN_GLU!= ${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_GLU= 0 +.endif + +.if ${_IS_BUILTIN_GLU} != "0" +IGNORE= "GLU has already been installed as part of XFree86-4.x" +.endif do-build: cd ${WRKSRC}/src-glu && ${SETENV} ${MAKE_ENV} \ @@ -33,9 +35,11 @@ do-install: ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET} post-install: - ${INSTALL_DATA_DIR} ${X11PREFIX}/include/GL -.for hdr in glu.h glu_mangle.h - ${INSTALL_DATA} ${WRKSRC}/include/GL/${hdr} ${X11PREFIX}/include/GL -.endfor + ${INSTALL_DATA_DIR} ${PREFIX}/include/GL + cd ${WRKSRC}/include/GL; for hdr in \ + glu.h glu_mangle.h; \ + do \ + ${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST index 768d5841f5e..1d4af1ecd25 100644 --- a/graphics/glu/PLIST +++ b/graphics/glu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:43 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:06 jlam Exp $ include/GL/glu.h include/GL/glu_mangle.h lib/libGLU.so @@ -6,4 +6,4 @@ lib/libGLU.so.3 lib/libGLU.so.3.4 lib/libGLU.a lib/libGLU.la -@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || true +@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE} diff --git a/graphics/glu/buildlink.mk b/graphics/glu/buildlink.mk index 6013ca40faf..70d35fcd730 100644 --- a/graphics/glu/buildlink.mk +++ b/graphics/glu/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2002/06/26 05:36:30 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2002/08/25 18:39:07 jlam Exp $ .if !defined(GLU_BUILDLINK_MK) GLU_BUILDLINK_MK= # defined diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk new file mode 100644 index 00000000000..6ce4d584bd0 --- /dev/null +++ b/graphics/glu/buildlink2.mk @@ -0,0 +1,42 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:07 jlam Exp $ + +.if !defined(GLU_BUILDLINK2_MK) +GLU_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.glu?= glu>=3.4.2 +BUILDLINK_PKGSRCDIR.glu?= ../../graphics/glu + +# Check if we got libGLU distributed with XFree86 4.x or if we need to +# depend on the glu package. +# +_REQUIRE_BUILTIN_GLU?= NO +.if exists(${X11BASE}/include/GL/glu.h) +_IS_BUILTIN_GLU!= ${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_GLU= 0 +.endif +.if (${_IS_BUILTIN_GLU} == "0") && (${_REQUIRE_BUILTIN_GLU} == "NO") +_NEED_GLU= YES +.else +_NEED_GLU= NO +.endif + +.if ${_NEED_GLU} == "YES" +BUILDLINK_PACKAGES+= glu +EVAL_PREFIX+= BUILDLINK_PREFIX.glu=glu +BUILDLINK_PREFIX.glu_DEFAULT= ${X11PREFIX} +.else +BUILDLINK_PREFIX.glu= ${X11BASE} +.endif + +BUILDLINK_FILES.glu= include/GL/glu.h +BUILDLINK_FILES.glu+= include/GL/glu_mangle.h +BUILDLINK_FILES.glu+= lib/libGLU.* + +BUILDLINK_TARGETS+= glu-buildlink + +glu-buildlink: _BUILDLINK_USE + +.endif # GLU_BUILDLINK2_MK diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index d1b236267b6..7781cb05024 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,41 +1,34 @@ -# $NetBSD: Makefile,v 1.11 2001/09/27 23:18:12 jlam Exp $ -# - -.include "../Mesa/Makefile.common" - -DISTNAME= Mesa-${MESA_VERSION} -PKGNAME= ${DISTNAME:S/Mesa/glut/} -CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} -EXTRACT_SUFX= .tar.bz2 -DISTFILES+= ${DISTNAME:S/Mesa/MesaLib/}${EXTRACT_SUFX} -DISTFILES+= ${DISTNAME:S/Mesa/MesaDemos/}${EXTRACT_SUFX} +# $NetBSD: Makefile,v 1.12 2002/08/25 18:39:08 jlam Exp $ +PKGNAME= ${DISTNAME:S/MesaLib/glut/} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES+= ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX} +WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} MAINTAINER= rh@netbsd.org -HOMEPAGE= http://www.mesa3d.org/ COMMENT= GLUT Graphics library similar to SGI's OpenGL CONFLICTS+= Mesa-glx-[0-9]* CONFLICTS+= Mesa<3.2.1 -USE_BUILDLINK_ONLY= yes +.include "../Mesa/Makefile.common" + +USE_BUILDLINK2= yes USE_X11BASE= yes -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CONFIGURE_ARGS+= --enable-static do-build: - cd ${WRKSRC}/src-glut && ${MAKE} + cd ${WRKSRC}/src-glut && ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET} do-install: - cd ${WRKSRC}/src-glut && ${MAKE} install + cd ${WRKSRC}/src-glut && ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/GL -.for inc in glut.h glutf90.h - ${INSTALL_DATA} ${WRKSRC}/include/GL/${inc} ${PREFIX}/include/GL -.endfor + cd ${WRKSRC}/include/GL; for hdr in \ + glut.h glutf90.h; \ + do \ + ${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \ + done -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST index 7082ee76ac8..2ffe804d4fd 100644 --- a/graphics/glut/PLIST +++ b/graphics/glut/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:43 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:08 jlam Exp $ include/GL/glut.h include/GL/glutf90.h lib/libglut.so @@ -6,4 +6,4 @@ lib/libglut.so.3 lib/libglut.so.3.7 lib/libglut.a lib/libglut.la -@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || true +@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE} diff --git a/graphics/glut/buildlink.mk b/graphics/glut/buildlink.mk index 4eb328e3e91..4adc17f6596 100644 --- a/graphics/glut/buildlink.mk +++ b/graphics/glut/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2002/06/26 05:36:30 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2002/08/25 18:39:08 jlam Exp $ .if !defined(GLUT_BUILDLINK_MK) GLUT_BUILDLINK_MK= # defined diff --git a/graphics/glut/buildlink2.mk b/graphics/glut/buildlink2.mk new file mode 100644 index 00000000000..6c63333988b --- /dev/null +++ b/graphics/glut/buildlink2.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:08 jlam Exp $ + +.if !defined(GLUT_BUILDLINK2_MK) +GLUT_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= glut +BUILDLINK_DEPENDS.glut?= glut>=3.4.2 +BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut + +EVAL_PREFIX+= BUILDLINK_PREFIX.glut=glut +BUILDLINK_PREFIX.glut_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.glut= include/GL/glut.h +BUILDLINK_FILES.glut+= include/GL/glutf90.h +BUILDLINK_FILES.glut+= lib/libglut.* + +BUILDLINK_TARGETS+= glut-buildlink + +glut-buildlink: _BUILDLINK_USE + +.endif # GLUT_BUILDLINK2_MK diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile index 33ef108ebc4..5b3fdddd543 100644 --- a/graphics/hermes/Makefile +++ b/graphics/hermes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/07/16 14:48:03 agc Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 18:39:09 jlam Exp $ DISTNAME= Hermes-1.3.2 PKGREVISION= 1 @@ -11,7 +11,7 @@ COMMENT= Library for conversion of pixel graphics WRKSRC= ${WRKDIR}/Hermes-1.3.2 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes diff --git a/graphics/hermes/buildlink2.mk b/graphics/hermes/buildlink2.mk new file mode 100644 index 00000000000..71a0206bd08 --- /dev/null +++ b/graphics/hermes/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:09 jlam Exp $ + +.if !defined(HERMES_BUILDLINK2_MK) +HERMES_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= hermes +BUILDLINK_DEPENDS.hermes?= Hermes>=1.3.2 +BUILDLINK_PKGSRCDIR.hermes?= ../../graphics/hermes + +EVAL_PREFIX+= BUILDLINK_PREFIX.hermes=Hermes +BUILDLINK_PREFIX.hermes_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.hermes= include/Hermes/* +BUILDLINK_FILES.hermes+= lib/libHermes.* + +BUILDLINK_TARGETS+= hermes-buildlink + +hermes-buildlink: _BUILDLINK_USE + +.endif # HERMES_BUILDLINK2_MK diff --git a/graphics/hermes/distinfo b/graphics/hermes/distinfo index de6123fd9bd..db1d92848ee 100644 --- a/graphics/hermes/distinfo +++ b/graphics/hermes/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/07/16 14:48:03 agc Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 18:39:10 jlam Exp $ SHA1 (Hermes-1.3.2.tar.gz) = d1a0edd8814ac3e9e699fd33843e60879d285083 Size (Hermes-1.3.2.tar.gz) = 258439 bytes diff --git a/graphics/hermes/patches/patch-ad b/graphics/hermes/patches/patch-ad index 75a1ac8f8b2..7792a3e3205 100644 --- a/graphics/hermes/patches/patch-ad +++ b/graphics/hermes/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2002/07/16 14:48:04 agc Exp $ +$NetBSD: patch-ad,v 1.2 2002/08/25 18:39:10 jlam Exp $ --- src/H_Pal.h 2002/07/16 14:39:53 1.1 +++ src/H_Pal.h 2002/07/16 14:40:15 diff --git a/graphics/hermes/patches/patch-ae b/graphics/hermes/patches/patch-ae index bce8e7496a6..5497625bb96 100644 --- a/graphics/hermes/patches/patch-ae +++ b/graphics/hermes/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1 2002/07/16 14:48:04 agc Exp $ +$NetBSD: patch-ae,v 1.2 2002/08/25 18:39:10 jlam Exp $ --- src/Palette.c 2002/07/16 14:40:39 1.1 +++ src/Palette.c 2002/07/16 14:41:06 diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 7c2c841a54e..68521ee9b70 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2002/07/18 02:19:38 rh Exp $ +# $NetBSD: Makefile,v 1.69 2002/08/25 18:39:11 jlam Exp $ # DISTNAME= imlib-1.9.14 @@ -18,7 +18,7 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} USE_GMAKE= yes UNLIMIT_RESOURCES= datasize -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes CPPFLAGS+= -DENABLE_NLS CONFIGURE_ENV+= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert" @@ -27,7 +27,7 @@ CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}" # The following ensures that `imlib-config --libs' includes the correct # linker flags for linking the X11 libs. # -X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib +X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imlib @@ -37,12 +37,12 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/imlib.m4 \ ${LOCALBASE}/share/aclocal/imlib.m4 -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/libungif/buildlink.mk" -.include "../../graphics/netpbm/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/libungif/buildlink2.mk" +.include "../../graphics/netpbm/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/imlib/buildlink2.mk b/graphics/imlib/buildlink2.mk new file mode 100644 index 00000000000..912c944c313 --- /dev/null +++ b/graphics/imlib/buildlink2.mk @@ -0,0 +1,32 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:11 jlam Exp $ + +.if !defined(IMLIB_BUILDLINK2_MK) +IMLIB_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= imlib +BUILDLINK_DEPENDS.imlib?= imlib>=1.9.11nb1 +BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib + +EVAL_PREFIX+= BUILDLINK_PREFIX.imlib=imlib +BUILDLINK_PREFIX.imlib_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.imlib= include/gdk_imlib.h +BUILDLINK_FILES.imlib+= include/gdk_imlib_private.h +BUILDLINK_FILES.imlib+= include/gdk_imlib_types.h +BUILDLINK_FILES.imlib+= include/Imlib.h +BUILDLINK_FILES.imlib+= include/Imlib_private.h +BUILDLINK_FILES.imlib+= include/Imlib_types.h +BUILDLINK_FILES.imlib+= lib/libImlib.* +BUILDLINK_FILES.imlib+= lib/libgdk_imlib.* + +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/libungif/buildlink2.mk" +.include "../../graphics/netpbm/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + +BUILDLINK_TARGETS+= imlib-buildlink + +imlib-buildlink: _BUILDLINK_USE + +.endif # IMLIB_BUILDLINK2_MK diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo index 7abf58cc60f..823b99e3176 100644 --- a/graphics/imlib/distinfo +++ b/graphics/imlib/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.10 2002/07/29 01:48:12 rh Exp $ +$NetBSD: distinfo,v 1.11 2002/08/25 18:39:11 jlam Exp $ SHA1 (imlib-1.9.14.tar.gz) = 3c8c8c3aaec3cc5a9fc924060a71223862a313f6 Size (imlib-1.9.14.tar.gz) = 748591 bytes SHA1 (patch-aa) = 185a5229af781d3dbc57978a3f4acd8308ca4c14 SHA1 (patch-ab) = df9f9f7c85f0794748a4ca6f58836f8dd230c805 SHA1 (patch-ac) = 94e90fa4e33ff2fdee013f8589f5531e717879c8 -SHA1 (patch-ad) = 0910b5574cca6c7cfbaec04c4c5396488d422ce7 -SHA1 (patch-ae) = 9701e0251592ae8df33b455457b6470f9833bbd7 -SHA1 (patch-ag) = 5e8452358e1f0625d1a1a5a990512bd51f51e6c9 +SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb +SHA1 (patch-ag) = 0ed464cb26492f3eebb8812efdb49ee83ef4ae6b diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac index 5255991550e..32bc68417a5 100644 --- a/graphics/imlib/patches/patch-ac +++ b/graphics/imlib/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.10 2002/07/18 02:19:38 rh Exp $ +$NetBSD: patch-ac,v 1.11 2002/08/25 18:39:12 jlam Exp $ --- imlib.pc.in.orig Sat Sep 30 12:09:41 2000 +++ imlib.pc.in diff --git a/graphics/imlib/patches/patch-ad b/graphics/imlib/patches/patch-ad deleted file mode 100644 index 879f45eb8cd..00000000000 --- a/graphics/imlib/patches/patch-ad +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2002/03/29 18:01:14 wiz Exp $ - ---- configure.in.orig Fri Mar 22 15:51:24 2002 -+++ configure.in -@@ -32,6 +32,8 @@ - fi - ]) - -+AC_PATH_PROG(GLIB_CONFIG, glib-config, no) -+ - dynworks=false - if test x$with_modules = xno; then - AC_MSG_RESULT(no) -@@ -41,8 +43,8 @@ - if test "x$GDK_IMLIB" != x; then - oLIBS="$LIBS" - oCFLAGS="$CFLAGS" -- LIBS="$LIBS `glib-config --libs gmodule`" -- CFLAGS="$CFLAGS `glib-config --cflags gmodule`" -+ LIBS="$LIBS `$GLIB_CONFIG --libs gmodule`" -+ CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gmodule`" - AC_TRY_RUN([ - #include <glib.h> - #include <gmodule.h> -@@ -74,8 +76,8 @@ - - if $dynworks; then - AC_DEFINE(USE_GMODULE) -- GMODULE_LIBS="`glib-config --libs gmodule`" -- GMODULE_FLAGS="`glib-config --cflags gmodule`" -+ GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`" -+ GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`" - AC_SUBST(GMODULE_LIBS) - AC_SUBST(GMODULE_FLAGS) - fi -@@ -139,7 +141,9 @@ - GX_LIBS="$GTK_LIBS" - fi - --CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include" -+if test -z "$X_LDFLAGS"; then -+ X_LDFLAGS= -+fi - - SUPPORT_LIBS="" - -@@ -309,6 +313,7 @@ - AC_SUBST(CPPFLAGS) - AC_SUBST(X_CFLAGS) - AC_SUBST(LDFLAGS) -+AC_SUBST(X_LDFLAGS) - AC_SUBST(X_PRE_LIBS) - AC_SUBST(X_LIBS) - AC_SUBST(X_EXTRA_LIBS) diff --git a/graphics/imlib/patches/patch-ae b/graphics/imlib/patches/patch-ae index 11ad2029a84..2fde8550d6e 100644 --- a/graphics/imlib/patches/patch-ae +++ b/graphics/imlib/patches/patch-ae @@ -1,25 +1,18 @@ -$NetBSD: patch-ae,v 1.4 2001/08/13 11:14:31 rh Exp $ +$NetBSD: patch-ae,v 1.5 2002/08/25 18:39:12 jlam Exp $ ---- imlib-config.in.orig Wed Mar 28 05:18:40 2001 +--- imlib-config.in.orig Tue Mar 27 22:18:40 2001 +++ imlib-config.in -@@ -55,15 +55,15 @@ - if test @includedir@ != /usr/include ; then - includes=-I@includedir@ - fi -- echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@ -+ echo `gtk-config --cflags` $includes @X_CFLAGS@ +@@ -58,11 +58,11 @@ + echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@ ;; --libs) - libdirs=-L@libdir@ -- echo $libdirs -lImlib @LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ + libdirs="-L@libdir@ -Wl,-R@libdir@" -+ echo $libdirs -lImlib @X_LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ + echo $libdirs -lImlib @LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ ;; --libs-gdk) - libdirs=-L@libdir@ -- echo $libdirs -lgdk_imlib$gdk_gx_libs `@GTK_CONFIG@ --libs` $gdk_libs + libdirs="-L@libdir@ -Wl,-R@libdir@" -+ echo $libdirs -lgdk_imlib$gdk_gx_libs `gtk-config --libs` $gdk_libs + echo $libdirs -lgdk_imlib$gdk_gx_libs `@GTK_CONFIG@ --libs` $gdk_libs ;; *) - echo "${usage}" 1>&2 diff --git a/graphics/imlib/patches/patch-ag b/graphics/imlib/patches/patch-ag index 93805c04255..1cdc3167638 100644 --- a/graphics/imlib/patches/patch-ag +++ b/graphics/imlib/patches/patch-ag @@ -1,116 +1,15 @@ -$NetBSD: patch-ag,v 1.3 2002/03/29 18:01:14 wiz Exp $ +$NetBSD: patch-ag,v 1.4 2002/08/25 18:39:13 jlam Exp $ ---- configure.orig Mon Mar 25 17:45:33 2002 +--- configure.orig Mon Mar 25 11:45:33 2002 +++ configure -@@ -5596,6 +5596,43 @@ - fi - - -+# Extract the first word of "glib-config", so it can be a program name with args. -+set dummy glib-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:5578: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$GLIB_CONFIG" in -+ /*) -+ ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no" -+ ;; -+esac -+fi -+GLIB_CONFIG="$ac_cv_path_GLIB_CONFIG" -+if test -n "$GLIB_CONFIG"; then -+ echo "$ac_t""$GLIB_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ - dynworks=false - if test x$with_modules = xno; then - echo "$ac_t""no" 1>&6 -@@ -5605,8 +5642,8 @@ - if test "x$GDK_IMLIB" != x; then - oLIBS="$LIBS" - oCFLAGS="$CFLAGS" -- LIBS="$LIBS `glib-config --libs gmodule`" -- CFLAGS="$CFLAGS `glib-config --cflags gmodule`" -+ LIBS="$LIBS `$GLIB_CONFIG --libs gmodule`" -+ CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gmodule`" - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else -@@ -5656,8 +5693,8 @@ - #define USE_GMODULE 1 - EOF - -- GMODULE_LIBS="`glib-config --libs gmodule`" -- GMODULE_FLAGS="`glib-config --cflags gmodule`" -+ GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`" -+ GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`" - - - fi -@@ -7365,7 +7402,9 @@ - GX_LIBS="$GTK_LIBS" - fi - --CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include" -+if test -z "$X_LDFLAGS"; then -+ X_LDFLAGS= -+fi - - SUPPORT_LIBS="" - -@@ -7670,8 +7709,8 @@ +@@ -7670,8 +7670,8 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - TIFFLIBS="-ltiff" - SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF + TIFFLIBS="-ltiff -ljpeg -lz" -+ SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; cat >> confdefs.h <<\EOF ++ SUPPORT_LIBS="$SUPPORT_LIBS $TIFFLIBS"; cat >> confdefs.h <<\EOF #define HAVE_LIBTIFF 1 EOF -@@ -8137,6 +8176,7 @@ - - - -+ - trap '' 1 2 15 - cat > confcache <<\EOF - # This file is a shell script that caches the results of configure -@@ -8317,6 +8357,7 @@ - s%@GTK_CONFIG@%$GTK_CONFIG%g - s%@GTK_CFLAGS@%$GTK_CFLAGS%g - s%@GTK_LIBS@%$GTK_LIBS%g -+s%@GLIB_CONFIG@%$GLIB_CONFIG%g - s%@GMODULE_LIBS@%$GMODULE_LIBS%g - s%@GMODULE_FLAGS@%$GMODULE_FLAGS%g - s%@TIFFLIBS@%$TIFFLIBS%g -@@ -8341,6 +8382,7 @@ - s%@HAVE_JPEG_FALSE@%$HAVE_JPEG_FALSE%g - s%@SUPPORT_LIBS@%$SUPPORT_LIBS%g - s%@GDK_SUPPORT_LIBS@%$GDK_SUPPORT_LIBS%g -+s%@X_LDFLAGS@%$X_LDFLAGS%g - - CEOF - EOF diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index e033184ab5e..c3345a0a9bd 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/06/19 04:02:57 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2002/08/25 18:39:13 jlam Exp $ # DISTNAME= jpegsrc.v6b @@ -14,7 +14,7 @@ COMMENT= IJG's jpeg compression utilities USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-static diff --git a/graphics/jpeg/buildlink2.mk b/graphics/jpeg/buildlink2.mk new file mode 100644 index 00000000000..b6924822524 --- /dev/null +++ b/graphics/jpeg/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:13 jlam Exp $ + +.if !defined(JPEG_BUILDLINK2_MK) +JPEG_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= jpeg +BUILDLINK_DEPENDS.jpeg?= jpeg-6b +BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg + +EVAL_PREFIX+= BUILDLINK_PREFIX.jpeg=jpeg +BUILDLINK_PREFIX.jpeg_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.jpeg= include/jconfig.h +BUILDLINK_FILES.jpeg+= include/jpeglib.h +BUILDLINK_FILES.jpeg+= include/jmorecfg.h +BUILDLINK_FILES.jpeg+= include/jerror.h +BUILDLINK_FILES.jpeg+= lib/libjpeg.* + +BUILDLINK_TARGETS+= jpeg-buildlink + +jpeg-buildlink: _BUILDLINK_USE + +.endif # JPEG_BUILDLINK2_MK diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile index 36dfba073db..076bb11e976 100644 --- a/graphics/lcms/Makefile +++ b/graphics/lcms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/01/14 14:43:35 skrll Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 18:39:14 jlam Exp $ # FreeBSD: ports/graphics/lcms/Makefile,v 1.2 2000/12/19 15:36:26 sobomax Exp DISTNAME= lcms-1.06 @@ -10,7 +10,7 @@ MAINTAINER= packages@NetBSD.org HOMEPAGE= http://www.littlecms.com/ COMMENT= Light Color Management System -- a color management library -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/lcms/buildlink2.mk b/graphics/lcms/buildlink2.mk new file mode 100644 index 00000000000..5f463a19ba0 --- /dev/null +++ b/graphics/lcms/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:14 jlam Exp $ + +.if !defined(LCMS_BUILDLINK2_MK) +LCMS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= lcms +BUILDLINK_DEPENDS.lcms?= lcms>=1.06 +BUILDLINK_PKGSRCDIR.lcms?= ../../graphics/lcms + +EVAL_PREFIX+= BUILDLINK_PREFIX.lcms=lcms +BUILDLINK_PREFIX.lcms_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.lcms= include/lcms/* +BUILDLINK_FILES.lcms+= lib/liblcms.* + +BUILDLINK_TARGETS+= lcms-buildlink + +lcms-buildlink: _BUILDLINK_USE + +.endif # LCMS_BUILDLINK2_MK diff --git a/graphics/lcms/distinfo b/graphics/lcms/distinfo index 3e5dac3f22e..d6fdd889890 100644 --- a/graphics/lcms/distinfo +++ b/graphics/lcms/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/05/14 22:06:56 skrll Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:39:15 jlam Exp $ SHA1 (lcms-1.06.tar.gz) = 3c9e99eb50598a0346c07fb1cacbf6cc4841001b Size (lcms-1.06.tar.gz) = 644116 bytes diff --git a/graphics/lcms/patches/patch-ab b/graphics/lcms/patches/patch-ab index 28bac39388f..27dead078a7 100644 --- a/graphics/lcms/patches/patch-ab +++ b/graphics/lcms/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.6 2002/05/20 17:47:23 cjep Exp $ +$NetBSD: patch-ab,v 1.7 2002/08/25 18:39:15 jlam Exp $ --- source/cmsmtrx.c.orig Thu May 18 23:08:13 2000 +++ source/cmsmtrx.c Tue May 14 22:38:58 2002 @@ -31,6 +31,7 @@ diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile index 8b4ffd8e623..2d74c954ff6 100644 --- a/graphics/libungif/Makefile +++ b/graphics/libungif/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.20 2002/03/14 18:18:19 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 18:39:15 jlam Exp $ # -DISTNAME= libungif-4.1.0b1 -PKGNAME= libungif-4.1.0.1 -CATEGORIES= graphics -MASTER_SITES= ftp://prtr-13.ucsc.edu/pub/libungif/ +DISTNAME= libungif-4.1.0b1 +PKGNAME= libungif-4.1.0.1 +CATEGORIES= graphics +MASTER_SITES= ftp://prtr-13.ucsc.edu/pub/libungif/ -MAINTAINER= packages@netbsd.org -HOMEPAGE= http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml -COMMENT= Tools and library routines for working with GIF images +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml +COMMENT= Tools and library routines for working with GIF images -CONFLICTS= giflib-[0-9]* +CONFLICTS= giflib-[0-9]* USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -18,17 +18,11 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= # defined CONFIGURE_ARGS= --without-x -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined DOCDIR= ${PREFIX}/share/doc/libungif HTMLDIR= ${PREFIX}/share/doc/html/libungif -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -MAKE_ENV+= CC="${CC} -I${LOCALBASE}/include" -.endif - post-patch: ${RM} ${WRKSRC}/doc/gif2x11.html diff --git a/graphics/libungif/buildlink2.mk b/graphics/libungif/buildlink2.mk new file mode 100644 index 00000000000..26c7331c43d --- /dev/null +++ b/graphics/libungif/buildlink2.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:16 jlam Exp $ + +.if !defined(LIBUNGIF_BUILDLINK2_MK) +LIBUNGIF_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libungif +BUILDLINK_DEPENDS.libungif?= libungif>=4.1.0 +BUILDLINK_PKGSRCDIR.libungif?= ../../graphics/libungif + +EVAL_PREFIX+= BUILDLINK_PREFIX.libungif=libungif +BUILDLINK_PREFIX.libungif_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libungif= include/gif_lib.h +BUILDLINK_FILES.libungif+= lib/libgif.* +BUILDLINK_FILES.libungif+= lib/libungif.* + +BUILDLINK_TARGETS+= libungif-buildlink + +libungif-buildlink: _BUILDLINK_USE + +.endif # LIBUNGIF_BUILDLINK2_MK diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile index 82368453aa6..c38ddcbc3bb 100644 --- a/graphics/mng/Makefile +++ b/graphics/mng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/01/09 12:28:37 agc Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 18:39:17 jlam Exp $ DISTNAME= libmng-1.0.3 PKGNAME= ${DISTNAME:S/lib//} @@ -11,15 +11,16 @@ MAINTAINER= packages@netbsd.com HOMEPAGE= http://www.libmng.com/ COMMENT= Multiple-image Network Graphics (MNG) reference library -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-lcms=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} +CONFIGURE_ARGS+= --with-lcms=${BUILDLINK_PREFIX.lcms} + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/lcms/buildlink2.mk" -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/lcms/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mng/buildlink2.mk b/graphics/mng/buildlink2.mk new file mode 100644 index 00000000000..5fcf19a49b4 --- /dev/null +++ b/graphics/mng/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:17 jlam Exp $ + +.if !defined(MNG_BUILDLINK2_MK) +MNG_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= mng +BUILDLINK_DEPENDS.mng?= mng>=1.0.0 +BUILDLINK_PKGSRCDIR.mng?= ../../graphics/mng + +EVAL_PREFIX+= BUILDLINK_PREFIX.mng=mng +BUILDLINK_PREFIX.mng_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.mng= include/libmng.h +BUILDLINK_FILES.mng+= include/libmng_conf.h +BUILDLINK_FILES.mng+= include/libmng_types.h +BUILDLINK_FILES.mng+= lib/libmng.* + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/lcms/buildlink2.mk" + +BUILDLINK_TARGETS+= mng-buildlink + +mng-buildlink: _BUILDLINK_USE + +.endif # MNG_BUILDLINK2_MK diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 845d326cf41..9fa4051ca86 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2002/07/30 22:30:05 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2002/08/25 18:39:18 jlam Exp $ DISTNAME= netpbm-9.25 CATEGORIES= graphics @@ -9,14 +9,14 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://netpbm.sourceforge.net/ COMMENT= toolkit for conversion of images between different formats -USE_BUILDLINK_ONLY= yes -USE_GMAKE= yes -USE_PERL5= yes +USE_BUILDLINK2= yes +USE_GMAKE= yes +USE_PERL5= yes -REPLACE_PERL= pnm/pnmquant ppm/ppmfade ppm/ppmrainbow ppm/ppmshadow +REPLACE_PERL= pnm/pnmquant ppm/ppmfade ppm/ppmrainbow ppm/ppmshadow INSTALL_TARGET= install-dev install -MAKE_ENV+= CC="${CC}" INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" +MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" MAKEFILE= GNUmakefile .include "../../mk/bsd.prefs.mk" @@ -38,6 +38,7 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/shhopt/shhopt.h ${PREFIX}/include -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/netpbm/buildlink2.mk b/graphics/netpbm/buildlink2.mk new file mode 100644 index 00000000000..9cc47d8f8de --- /dev/null +++ b/graphics/netpbm/buildlink2.mk @@ -0,0 +1,33 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:18 jlam Exp $ + +.if !defined(NETPBM_BUILDLINK2_MK) +NETPBM_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= netpbm +BUILDLINK_DEPENDS.netpbm?= netpbm>=9.24 +BUILDLINK_PKGSRCDIR.netpbm?= ../../graphics/netpbm + +EVAL_PREFIX+= BUILDLINK_PREFIX.netpbm=netpbm +BUILDLINK_PREFIX.netpbm_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.netpbm= include/bitio.h +BUILDLINK_FILES.netpbm+= include/pam.h +BUILDLINK_FILES.netpbm+= include/pammap.h +BUILDLINK_FILES.netpbm+= include/pbm.h +BUILDLINK_FILES.netpbm+= include/pgm.h +BUILDLINK_FILES.netpbm+= include/pm.h +BUILDLINK_FILES.netpbm+= include/pm_config.h +BUILDLINK_FILES.netpbm+= include/pnm.h +BUILDLINK_FILES.netpbm+= include/ppm.h +BUILDLINK_FILES.netpbm+= include/ppmcmap.h +BUILDLINK_FILES.netpbm+= include/ppmfloyd.h +BUILDLINK_FILES.netpbm+= include/shhopt.h +BUILDLINK_FILES.netpbm+= lib/libpbm.* +BUILDLINK_FILES.netpbm+= lib/libpgm.* +BUILDLINK_FILES.netpbm+= lib/libpnm.* +BUILDLINK_FILES.netpbm+= lib/libppm.* + +BUILDLINK_TARGETSS= netpbm-buildlink + +netpbm-buildlink: _BUILDLINK_USE + +.endif # NETPBM_BUILDLINK2_MK diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 69017aecb3b..354184a5525 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2002/07/02 01:47:52 kristerw Exp $ +$NetBSD: distinfo,v 1.11 2002/08/25 18:39:19 jlam Exp $ SHA1 (netpbm-9.25.tgz) = 9c7f6a98348a5f3d6e908b514f33498b2a9c359a Size (netpbm-9.25.tgz) = 2052922 bytes -SHA1 (patch-aa) = 1e3eb961f34dedb81ac1be823e25f0ae052905b6 +SHA1 (patch-aa) = 0d505e205eb200653735a6bbc13cabac88c87df2 SHA1 (patch-ab) = b6932fd52dff9a6acd01e42136ff7a70561c7434 SHA1 (patch-ac) = 42a6dbfe24447132c6dd654512607c0c9c4a5699 SHA1 (patch-ad) = 354059e1fe894b3776afe3d565fdaefb90941690 diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index b0dbb607dfb..b32096a4b50 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.19 2002/05/14 18:03:18 tron Exp $ +$NetBSD: patch-aa,v 1.20 2002/08/25 18:39:19 jlam Exp $ --- Makefile.config.in.orig Thu Mar 14 16:25:54 2002 +++ Makefile.config.in Tue May 14 19:52:32 2002 @@ -117,8 +117,8 @@ $NetBSD: patch-aa,v 1.19 2002/05/14 18:03:18 tron Exp $ # Netbsd: -#JPEGLIB_DIR = ${LOCALBASE}/lib -#JPEGHDR_DIR = ${LOCALBASE}/include -+JPEGLIB_DIR = ${BUILDLINK_DIR}/lib -+JPEGHDR_DIR = ${BUILDLINK_DIR}/include ++JPEGLIB_DIR = ${LOCALBASE}/lib ++JPEGHDR_DIR = ${LOCALBASE}/include # OSF, Tru64: #JPEGLIB_DIR = /usr/local1/DEC/lib #JPEGHDR_DIR = /usr/local1/DEC/include @@ -133,8 +133,8 @@ $NetBSD: patch-aa,v 1.19 2002/05/14 18:03:18 tron Exp $ # NetBSD: -#PNGLIB_DIR = $(LOCALBASE)/lib -#PNGHDR_DIR = $(LOCALBASE)/include -+PNGLIB_DIR = $(BUILDLINK_DIR)/lib -+PNGHDR_DIR = $(BUILDLINK_DIR)/include ++PNGLIB_DIR = $(LOCALBASE)/lib ++PNGHDR_DIR = $(LOCALBASE)/include # OSF/Tru64: #PNGLIB_DIR = /usr/local1/DEC/lib #PNGHDR_DIR = /usr/local1/DEC/include diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac index 98ef65c13c3..3f140d98452 100644 --- a/graphics/netpbm/patches/patch-ac +++ b/graphics/netpbm/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.11 2002/05/14 18:03:18 tron Exp $ +$NetBSD: patch-ac,v 1.12 2002/08/25 18:39:19 jlam Exp $ --- ppm/ppmtompeg/param.c-orig Fri Aug 31 16:49:01 2001 +++ ppm/ppmtompeg/param.c Sat Mar 23 19:20:02 2002 diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad index 06db159d07e..431d5fe946d 100644 --- a/graphics/netpbm/patches/patch-ad +++ b/graphics/netpbm/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.10 2002/07/02 01:47:53 kristerw Exp $ +$NetBSD: patch-ad,v 1.11 2002/08/25 18:39:20 jlam Exp $ --- Makefile.common.orig Tue Jul 2 02:28:12 2002 +++ Makefile.common Tue Jul 2 02:28:33 2002 @@ -199,7 +199,7 @@ diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 9b60d4c2602..255edc69a49 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2002/07/19 14:33:08 fredb Exp $ +# $NetBSD: Makefile,v 1.43 2002/08/25 18:39:20 jlam Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). @@ -16,8 +16,8 @@ MAINTAINER= fredb@netbsd.org HOMEPAGE= http://www.libpng.org/pub/png/ COMMENT= Library for manipulating PNG images -USE_BUILDLINK_ONLY= yes -USE_LIBTOOL= yes +USE_BUILDLINK2= yes +USE_LIBTOOL= yes LIBPNG_SO_MAJOR= 3 LIBPNG_SO_MINOR= 1 @@ -37,5 +37,5 @@ post-install: test: build @cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} test -.include "../../devel/zlib/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/png/PLIST b/graphics/png/PLIST index 1c149201a2c..2bf1c7c2f2c 100644 --- a/graphics/png/PLIST +++ b/graphics/png/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/07/19 14:33:08 fredb Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:39:20 jlam Exp $ include/png.h include/pngconf.h lib/libpng.a diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk index 5dc634dfb1f..2d65697e7b7 100644 --- a/graphics/png/buildlink.mk +++ b/graphics/png/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.11 2002/07/19 14:33:08 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.12 2002/08/25 18:39:21 jlam Exp $ # # This Makefile fragment is included by packages that use libpng. # diff --git a/graphics/png/buildlink2.mk b/graphics/png/buildlink2.mk new file mode 100644 index 00000000000..06bebd52e86 --- /dev/null +++ b/graphics/png/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:21 jlam Exp $ + +.if !defined(PNG_BUILDLINK2_MK) +PNG_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= png +BUILDLINK_DEPENDS.png?= png>=1.2.4 +BUILDLINK_PKGSRCDIR.png?= ../../graphics/png + +EVAL_PREFIX+= BUILDLINK_PREFIX.png=png +BUILDLINK_PREFIX.png_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.png= include/png.h +BUILDLINK_FILES.png+= include/pngconf.h +BUILDLINK_FILES.png+= lib/libpng.* + +.include "../../devel/zlib/buildlink2.mk" + +BUILDLINK_TARGETS+= png-buildlink + +png-buildlink: _BUILDLINK_USE + +.endif # PNG_BUILDLINK2_MK diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 3c65c54d8bb..639a740655b 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/07/19 14:33:08 fredb Exp $ +$NetBSD: distinfo,v 1.10 2002/08/25 18:39:22 jlam Exp $ SHA1 (libpng-1.2.4.tar.bz2) = c9aec320e4fdb178d6d918ba30258a0480cbe074 Size (libpng-1.2.4.tar.bz2) = 390161 bytes diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa index bcabffdfe05..17e68e412a5 100644 --- a/graphics/png/patches/patch-aa +++ b/graphics/png/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.19 2002/07/19 14:33:09 fredb Exp $ +$NetBSD: patch-aa,v 1.20 2002/08/25 18:39:22 jlam Exp $ --- scripts/makefile.std.orig Thu May 23 08:29:59 2002 +++ scripts/makefile.std diff --git a/graphics/png/patches/patch-ab b/graphics/png/patches/patch-ab index 4338679c8db..8a938890726 100644 --- a/graphics/png/patches/patch-ab +++ b/graphics/png/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/07/19 03:22:17 mycroft Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 18:39:22 jlam Exp $ --- pngtest.c.orig Wed Dec 12 23:37:22 2001 +++ pngtest.c Fri Jul 19 03:18:50 2002 diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 49f4bf427fe..fa336f4eb89 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2002/07/13 00:53:35 grant Exp $ +# $NetBSD: Makefile,v 1.41 2002/08/25 18:39:23 jlam Exp $ DISTNAME= tiff-v3.5.7 PKGNAME= tiff-3.5.7 @@ -17,9 +17,9 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --noninteractive --site=${FILESDIR} --prefix=${PREFIX} CONFIGURE_ENV+= CC="${CC}" -.include "../../mk/bsd.prefs.mk" +USE_BUILDLINK2= # defined -USE_BUILDLINK_ONLY= # defined +.include "../../mk/bsd.prefs.mk" .if defined(USE_GIF) LZW_VERSION= 1.3 @@ -33,9 +33,6 @@ post-patch: CPPFLAGS+= -Dunix CONFIGURE_ENV+= PREFIX="${PREFIX}" CONFIGURE_ENV+= ENVOPTS="${CFLAGS} ${CPPFLAGS}" -CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" - -.include "../../mk/bsd.prefs.mk" pre-patch: # reference correct relative man page when using .so @@ -66,6 +63,6 @@ pre-install: ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL .endif -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tiff/buildlink2.mk b/graphics/tiff/buildlink2.mk new file mode 100644 index 00000000000..4c025ad4f72 --- /dev/null +++ b/graphics/tiff/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:23 jlam Exp $ + +.if !defined(TIFF_BUILDLINK2_MK) +TIFF_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= tiff +BUILDLINK_DEPENDS.tiff?= tiff>=3.5.4 +BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff + +EVAL_PREFIX+= BUILDLINK_PREFIX.tiff=tiff +BUILDLINK_PREFIX.tiff_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.tiff= include/tiff.h +BUILDLINK_FILES.tiff+= include/tiffconf.h +BUILDLINK_FILES.tiff+= include/tiffio.h +BUILDLINK_FILES.tiff+= include/tiffvers.h +BUILDLINK_FILES.tiff+= lib/libtiff.* + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" + +BUILDLINK_TARGETS+= tiff-buildlink + +tiff-buildlink: _BUILDLINK_USE + +.endif # TIFF_BUILDLINK2_MK diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index 60daf90961a..d150f932df3 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/08/30 11:11:24 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2002/08/25 18:39:24 jlam Exp $ DISTNAME= xpm-3.4k CATEGORIES= graphics x11 @@ -9,12 +9,20 @@ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www.inria.fr/koala/lehors/xpm.html COMMENT= The X Pixmap library -USE_IMAKE= # defined -CHECK_XPM= # defined +USE_BUILDLINK2= # defined +USE_IMAKE= # defined .include "../../mk/bsd.prefs.mk" -.if ${HAVE_BUILTIN_XPM} != "NO" +# Check if we got Xpm distributed with XFree86 4.x. +.if exists(${X11BASE}/include/X11/xpm.h) && \ + exists(${X11BASE}/lib/X11/config/X11.tmpl) +_IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_XPM= 0 +.endif + +.if ${_IS_BUILTIN_XPM} != "0" IGNORE= "The Xpm library is included in your X11 distribution." .endif diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk index 0fbed366c5d..cb4d46a79c8 100644 --- a/graphics/xpm/buildlink.mk +++ b/graphics/xpm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.11 2002/06/26 05:40:34 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.12 2002/08/25 18:39:25 jlam Exp $ # # This Makefile fragment is included by packages that use xpm. # diff --git a/graphics/xpm/buildlink2.mk b/graphics/xpm/buildlink2.mk new file mode 100644 index 00000000000..ab420b75f74 --- /dev/null +++ b/graphics/xpm/buildlink2.mk @@ -0,0 +1,42 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:25 jlam Exp $ + +.if !defined(XPM_BUILDLINK2_MK) +XPM_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.xpm?= xpm-3.4k +BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm + +# Check if we got Xpm distributed with XFree86 4.x or if we need to +# depend on the Xpm package. +# +_REQUIRE_BUILTIN_XPM?= NO +.if exists(${X11BASE}/include/X11/xpm.h) && \ + exists(${X11BASE}/lib/X11/config/X11.tmpl) +_IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_XPM= 0 +.endif +.if (${_IS_BUILTIN_XPM} == "0") && (${_REQUIRE_BUILTIN_XPM} == "NO") +_NEED_XPM= YES +.else +_NEED_XPM= NO +.endif + +.if ${_NEED_XPM} == "YES" +BUILDLINK_PACKAGES+= xpm +EVAL_PREFIX+= BUILDLINK_PREFIX.xpm=xpm +BUILDLINK_PREFIX.xpm_DEFAULT= ${X11PREFIX} +.else +BUILDLINK_PREFIX.xpm= ${X11BASE} +.endif + +BUILDLINK_FILES.xpm+= include/X11/xpm.h +BUILDLINK_FILES.xpm+= lib/libXpm.* + +BUILDLINK_TARGETS+= xpm-buildlink + +xpm-buildlink: _BUILDLINK_USE + +.endif # XPM_BUILDLINK2_MK diff --git a/graphics/xpm/distinfo b/graphics/xpm/distinfo index 463de0cf89d..175e00e71b0 100644 --- a/graphics/xpm/distinfo +++ b/graphics/xpm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/05/24 14:57:31 agc Exp $ +$NetBSD: distinfo,v 1.9 2002/08/25 18:39:26 jlam Exp $ SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd Size (xpm-3.4k.tar.gz) = 148887 bytes diff --git a/graphics/xpm/patches/patch-ad b/graphics/xpm/patches/patch-ad index fdd9074af11..2e6bdd2ba23 100644 --- a/graphics/xpm/patches/patch-ad +++ b/graphics/xpm/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.3 2002/05/24 14:57:32 agc Exp $ +$NetBSD: patch-ad,v 1.4 2002/08/25 18:39:26 jlam Exp $ --- lib/XpmI.h.orig Thu Mar 19 20:51:00 1998 +++ lib/XpmI.h Mon May 13 00:33:23 2002 |