diff options
author | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
commit | e2afa97f51a1f72e6618533019aaaae07b7d3cf2 (patch) | |
tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b | |
parent | e97ad43756dc8382d2c6cb8a7ae09be0eb540f67 (diff) | |
download | pkgsrc-e2afa97f51a1f72e6618533019aaaae07b7d3cf2.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.
416 files changed, 3732 insertions, 1276 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile index d3dd3c4ad2e..1761633b406 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2002/07/18 02:19:27 rh Exp $ +# $NetBSD: Makefile,v 1.33 2002/08/25 18:38:05 jlam Exp $ DISTNAME= esound-0.2.26 PKGREVISION= 1 @@ -9,7 +9,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html COMMENT= the Enlightened sound daemon -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -19,6 +19,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} EGDIR= ${PREFIX}/share/examples/esound CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf -.include "../../audio/libaudiofile/buildlink.mk" +.include "../../audio/libaudiofile/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/esound/buildlink2.mk b/audio/esound/buildlink2.mk new file mode 100644 index 00000000000..ec37357b4e5 --- /dev/null +++ b/audio/esound/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:05 jlam Exp $ + +.if !defined(ESOUND_BUILDLINK2_MK) +ESOUND_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= esound +BUILDLINK_DEPENDS.esound?= esound>=0.2.18 +BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound + +EVAL_PREFIX+= BUILDLINK_PREFIX.esound=esound +BUILDLINK_PREFIX.esound_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.esound= include/esd.h +BUILDLINK_FILES.esound+= lib/libesd.* + +.include "../../audio/libaudiofile/buildlink2.mk" + +BUILDLINK_TARGETS+= esound-buildlink + +esound-buildlink: _BUILDLINK_USE + +.endif # ESOUND_BUILDLINK2_MK diff --git a/audio/esound/distinfo b/audio/esound/distinfo index 46049d9d213..3d6acb8a756 100644 --- a/audio/esound/distinfo +++ b/audio/esound/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/07/18 02:19:27 rh Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:38:06 jlam Exp $ SHA1 (esound-0.2.26.tar.gz) = dffa3424120b896b879a2ea95f2c495a49dadc45 Size (esound-0.2.26.tar.gz) = 349513 bytes diff --git a/audio/esound/patches/patch-ad b/audio/esound/patches/patch-ad index 0452ce3481c..9b82d999cb7 100644 --- a/audio/esound/patches/patch-ad +++ b/audio/esound/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2002/07/18 02:19:28 rh Exp $ +$NetBSD: patch-ad,v 1.2 2002/08/25 18:38:07 jlam Exp $ --- esound.pc.in.orig Tue Apr 23 18:28:28 2002 +++ esound.pc.in diff --git a/audio/libao/Makefile b/audio/libao/Makefile index 73a5e4efe94..989fcf856f9 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/08/05 13:08:38 lukem Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/25 18:38:09 jlam Exp $ DISTNAME= libao-0.8.3 CATEGORIES= devel @@ -9,7 +9,7 @@ COMMENT= cross-platform audio library PLIST_SUBST+= VERSION="${DISTNAME}" -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-alsa CONFIGURE_ARGS+= --disable-arts @@ -19,5 +19,5 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -.include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/ossaudio.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libao/PLIST b/audio/libao/PLIST index b576ec42880..e818657f04f 100644 --- a/audio/libao/PLIST +++ b/audio/libao/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:08:39 lukem Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:10 jlam Exp $ include/ao/ao.h include/ao/os_types.h include/ao/plugin.h diff --git a/audio/libao/buildlink.mk b/audio/libao/buildlink.mk index 6d3c276b805..13960596ecd 100644 --- a/audio/libao/buildlink.mk +++ b/audio/libao/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2002/08/05 13:08:39 lukem Exp $ +# $NetBSD: buildlink.mk,v 1.6 2002/08/25 18:38:10 jlam Exp $ # # This Makefile fragment is included by packages that use libao. # diff --git a/audio/libao/buildlink2.mk b/audio/libao/buildlink2.mk new file mode 100644 index 00000000000..3de907e7a76 --- /dev/null +++ b/audio/libao/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:10 jlam Exp $ + +.if !defined(LIBAO_BUILDLINK2_MK) +LIBAO_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libao +BUILDLINK_DEPENDS.libao?= libao>=0.8.3 +BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao + +EVAL_PREFIX+= BUILDLINK_PREFIX.libao=libao +BUILDLINK_PREFIX.libao= ${LOCALBASE} +BUILDLINK_FILES.libao= include/ao/ao.h +BUILDLINK_FILES.libao+= include/ao/os_types.h +BUILDLINK_FILES.libao+= lib/libao.* +BUILDLINK_FILES.libao+= lib/ao/* + +BUILDLINK_TARGETS+= libao-buildlink + +libao-buildlink: _BUILDLINK_USE + +.endif # LIBAO_BUILDLINK2_MK diff --git a/audio/libao/distinfo b/audio/libao/distinfo index 649f01d4e26..4d40c7c2cbb 100644 --- a/audio/libao/distinfo +++ b/audio/libao/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/08/05 13:08:39 lukem Exp $ +$NetBSD: distinfo,v 1.10 2002/08/25 18:38:10 jlam Exp $ SHA1 (libao-0.8.3.tar.gz) = bf918997df2d99e60927cb5bc43b5d1e547811c0 Size (libao-0.8.3.tar.gz) = 210690 bytes diff --git a/audio/libao/patches/patch-ac b/audio/libao/patches/patch-ac index 4b05bfe0118..7cec0fa9fc8 100644 --- a/audio/libao/patches/patch-ac +++ b/audio/libao/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2002/08/05 13:08:39 lukem Exp $ +$NetBSD: patch-ac,v 1.4 2002/08/25 18:38:11 jlam Exp $ --- src/Makefile.in.orig Sat Jul 20 00:17:44 2002 +++ src/Makefile.in diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile index d1d65fda1a3..d012c442a77 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2002/07/18 02:19:27 rh Exp $ +# $NetBSD: Makefile,v 1.24 2002/08/25 18:38:11 jlam Exp $ DISTNAME= audiofile-0.2.3 PKGNAME= lib${DISTNAME} @@ -11,8 +11,8 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://andromeda.68k.org/~michael/audiofile/ COMMENT= Sound library for SGI audio file +USE_BUILDLINK2= YES GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/audio/libaudiofile/buildlink2.mk b/audio/libaudiofile/buildlink2.mk new file mode 100644 index 00000000000..266840237fa --- /dev/null +++ b/audio/libaudiofile/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:12 jlam Exp $ + +.if !defined(AUDIOFILE_BUILDLINK2_MK) +AUDIOFILE_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= audiofile +BUILDLINK_DEPENDS.audiofile?= libaudiofile>=0.2.1 +BUILDLINK_PKGSRCDIR.audiofile?= ../../audio/libaudiofile + +EVAL_PREFIX+= BUILDLINK_PREFIX.audiofile=audiofile +BUILDLINK_PREFIX.audiofile_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.audiofile= include/af_vfs.h +BUILDLINK_FILES.audiofile+= include/audiofile.h +BUILDLINK_FILES.audiofile+= include/aupvlist.h +BUILDLINK_FILES.audiofile+= lib/libaudiofile.* + +BUILDLINK_TARGETS+= audiofile-buildlink + +audiofile-buildlink: _BUILDLINK_USE + +.endif # AUDIOFILE_BUILDLINK2_MK diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo index 5f88f1ec69e..75e9f4689cb 100644 --- a/audio/libaudiofile/distinfo +++ b/audio/libaudiofile/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/07/18 02:19:27 rh Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 18:38:13 jlam Exp $ SHA1 (audiofile-0.2.3.tar.gz) = 12bb67ba45985e258e5c077c33e5613f340e3e34 Size (audiofile-0.2.3.tar.gz) = 332223 bytes diff --git a/audio/libaudiofile/patches/patch-aa b/audio/libaudiofile/patches/patch-aa index ce6ea251c07..5fe3122f854 100644 --- a/audio/libaudiofile/patches/patch-aa +++ b/audio/libaudiofile/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2002/07/18 02:19:27 rh Exp $ +$NetBSD: patch-aa,v 1.8 2002/08/25 18:38:13 jlam Exp $ --- audiofile.pc.in.orig Fri Oct 26 14:11:38 2001 +++ audiofile.pc.in diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index b200956f25a..b772feefe6c 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/08/05 13:10:14 lukem Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 18:38:13 jlam Exp $ DISTNAME= libogg-1.0 PKGNAME= libogg-1.0.0.8 @@ -9,7 +9,7 @@ MAINTAINER= lukem@netbsd.org HOMEPAGE= http://www.xiph.org/ogg/ COMMENT= Ogg project codecs library -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/audio/libogg/PLIST b/audio/libogg/PLIST index a9a625efcbe..72948a44997 100644 --- a/audio/libogg/PLIST +++ b/audio/libogg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:10:14 lukem Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:14 jlam Exp $ include/ogg/config_types.h include/ogg/ogg.h include/ogg/os_types.h diff --git a/audio/libogg/buildlink.mk b/audio/libogg/buildlink.mk index 9745b92c56c..af2e1b48c5f 100644 --- a/audio/libogg/buildlink.mk +++ b/audio/libogg/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2002/08/05 13:10:14 lukem Exp $ +# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:38:14 jlam Exp $ # # This Makefile fragment is included by packages that use libogg. # diff --git a/audio/libogg/buildlink2.mk b/audio/libogg/buildlink2.mk new file mode 100644 index 00000000000..1fcecd4af72 --- /dev/null +++ b/audio/libogg/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:14 jlam Exp $ + +.if !defined(LIBOGG_BUILDLINK2_MK) +LIBOGG_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libogg +BUILDLINK_DEPENDS.libogg?= libogg>=1.0.0.8 +BUILDLINK_PKGSRCDIR.libogg?= ../../audio/libogg + +EVAL_PREFIX+= BUILDLINK_PREFIX.libogg=libogg +BUILDLINK_PREFIX.libogg_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libogg= include/ogg/config_types.h +BUILDLINK_FILES.libogg+= include/ogg/ogg.h +BUILDLINK_FILES.libogg+= include/ogg/os_types.h +BUILDLINK_FILES.libogg+= lib/libogg.* + +BUILDLINK_TARGETS+= libogg-buildlink + +libogg-buildlink: _BUILDLINK_USE + +.endif # LIBOGG_BUILDLINK2_MK diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo index 897a76970c7..8c8b9f12a0c 100644 --- a/audio/libogg/distinfo +++ b/audio/libogg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/08/05 13:10:14 lukem Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:38:15 jlam Exp $ SHA1 (libogg-1.0.tar.gz) = 2929e8867e566e9f7029cfacf0b4ccbe2f1f6cec Size (libogg-1.0.tar.gz) = 222625 bytes diff --git a/audio/libogg/patches/patch-ab b/audio/libogg/patches/patch-ab index c24db1dff14..89482e71c96 100644 --- a/audio/libogg/patches/patch-ab +++ b/audio/libogg/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/05 13:10:14 lukem Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 18:38:15 jlam Exp $ --- doc/ogg/Makefile.in.orig Sat Jul 20 00:13:22 2002 +++ doc/ogg/Makefile.in diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index b90d51aec9e..43c73a97090 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/08/05 13:11:22 lukem Exp $ +# $NetBSD: Makefile,v 1.19 2002/08/25 18:38:16 jlam Exp $ DISTNAME= libvorbis-1.0 PKGNAME= libvorbis-1.0.0.8 @@ -11,10 +11,8 @@ COMMENT= Library for the Ogg Vorbis audio encoding format #BUILD_DEPENDS+= automake>=1.4:../../devel/automake -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_DIR} - USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -26,5 +24,5 @@ GCC_VERSION!=gcc --version .include "../../lang/gcc/Makefile.gcc" .endif -.include "../../audio/libogg/buildlink.mk" +.include "../../audio/libogg/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST index 59722451714..69fa3f4342e 100644 --- a/audio/libvorbis/PLIST +++ b/audio/libvorbis/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:11:22 lukem Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:16 jlam Exp $ include/vorbis/codec.h include/vorbis/vorbisenc.h include/vorbis/vorbisfile.h diff --git a/audio/libvorbis/buildlink.mk b/audio/libvorbis/buildlink.mk index abca44beb6c..ced6444feb9 100644 --- a/audio/libvorbis/buildlink.mk +++ b/audio/libvorbis/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2002/08/05 13:11:22 lukem Exp $ +# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:38:16 jlam Exp $ # # This Makefile fragment is included by packages that use libvorbis. # diff --git a/audio/libvorbis/buildlink2.mk b/audio/libvorbis/buildlink2.mk new file mode 100644 index 00000000000..66da4cfcfa7 --- /dev/null +++ b/audio/libvorbis/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:17 jlam Exp $ + +.if !defined(LIBVORBIS_BUILDLINK2_MK) +LIBVORBIS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libvorbis +BUILDLINK_DEPENDS.libvorbis?= libvorbis>=1.0.0.8 +BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis + +EVAL_PREFIX+= BUILDLINK_PREFIX.libvorbis=libvorbis +BUILDLINK_PREFIX.libvorbis_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libvorbis= include/vorbis/* +BUILDLINK_FILES.libvorbis+= lib/libvorbis.* +BUILDLINK_FILES.libvorbis+= lib/libvorbisenc.* +BUILDLINK_FILES.libvorbis+= lib/libvorbisfile.* + +.include "../../audio/libogg/buildlink2.mk" + +BUILDLINK_TARGETS+= libvorbis-buildlink + +libvorbis-buildlink: _BUILDLINK_USE + +.endif # LIBVORBIS_BUILDLINK2_MK diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo index be8d2d3d752..73fe88e99af 100644 --- a/audio/libvorbis/distinfo +++ b/audio/libvorbis/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/08/05 13:11:22 lukem Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:38:17 jlam Exp $ SHA1 (libvorbis-1.0.tar.gz) = 2b414cb4cf7d022d39b7be7049f2c84a287a4fc7 Size (libvorbis-1.0.tar.gz) = 749064 bytes diff --git a/audio/libvorbis/patches/patch-ae b/audio/libvorbis/patches/patch-ae index 33298f82349..7942707baa5 100644 --- a/audio/libvorbis/patches/patch-ae +++ b/audio/libvorbis/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.2 2002/08/05 13:11:23 lukem Exp $ +$NetBSD: patch-ae,v 1.3 2002/08/25 18:38:17 jlam Exp $ --- doc/Makefile.in.orig Sat Jul 20 00:12:33 2002 +++ doc/Makefile.in diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 00fc91226b5..14de8804d60 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/20 11:52:10 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 18:38:18 jlam Exp $ # DISTNAME= libiconv-1.8 @@ -9,7 +9,7 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnu.org/software/libiconv/ COMMENT= character set conversion library -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES USE_LIBTOOL= YES diff --git a/converters/libiconv/PLIST b/converters/libiconv/PLIST index 3b490d1a5ad..b8696161ae0 100644 --- a/converters/libiconv/PLIST +++ b/converters/libiconv/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/20 11:52:11 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:18 jlam Exp $ bin/iconv include/iconv.h include/libcharset.h diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk index 2d2c1fc0201..65ad089b980 100644 --- a/converters/libiconv/buildlink.mk +++ b/converters/libiconv/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.12 2002/08/07 06:10:33 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.13 2002/08/25 18:38:18 jlam Exp $ # # This Makefile fragment is included by packages that use libiconv. # diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk new file mode 100644 index 00000000000..5cf0950a77f --- /dev/null +++ b/converters/libiconv/buildlink2.mk @@ -0,0 +1,45 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:18 jlam Exp $ + +.if !defined(ICONV_BUILDLINK2_MK) +ICONV_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.iconv?= libiconv>=1.7nb2 +BUILDLINK_PKGSRCDIR.iconv?= ../../converters/libiconv + +.if defined(USE_GNU_ICONV) +_NEED_ICONV= YES +.else +. if exists(/usr/include/iconv.h) +_NEED_ICONV= NO +. else +_NEED_ICONV= YES +. endif +_INCOMPAT_ICONV?= # should be set from defs.${OPSYS}.mk +INCOMPAT_ICONV?= # empty +. for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +_NEED_ICONV= YES +. endif +. endfor +.endif + +.if ${_NEED_ICONV} == "YES" +BUILDLINK_PACKAGES+= iconv +EVAL_PREFIX+= BUILDLINK_PREFIX.iconv=libiconv +BUILDLINK_PREFIX.iconv_DEFAULT= ${LOCALBASE} +.else +BUILDLINK_PREFIX.iconv= /usr +.endif + +BUILDLINK_FILES.iconv= include/iconv.h +BUILDLINK_FILES.iconv+= include/libcharset.h +BUILDLINK_FILES.iconv+= lib/libcharset.* +BUILDLINK_FILES.iconv+= lib/libiconv.* + +BUILDLINK_TARGETS+= iconv-buildlink + +iconv-buildlink: _BUILDLINK_USE + +.endif # ICONV_BUILDLINK2_MK diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index de08a8a8c8b..18801d54b7d 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.7 2002/08/20 11:52:11 wiz Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:38:19 jlam Exp $ SHA1 (libiconv-1.8.tar.gz) = 8894488118c31d3d1f1c6d2f81f61d7e052e9799 Size (libiconv-1.8.tar.gz) = 3514117 bytes SHA1 (patch-ab) = a206c213e41555e37a8cac9a93f17dd0664295e7 SHA1 (patch-ac) = 6896d58b242f4c08887061ddf3217bd9b291c895 +SHA1 (patch-ad) = 384cafd6f4c11443d0a539409121543b9201efdd diff --git a/converters/libiconv/patches/patch-ab b/converters/libiconv/patches/patch-ab index 30843ebefc1..deabcf16482 100644 --- a/converters/libiconv/patches/patch-ab +++ b/converters/libiconv/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/20 11:52:14 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 18:38:19 jlam Exp $ --- Makefile.in.orig Tue Aug 20 13:38:33 2002 +++ Makefile.in diff --git a/converters/libiconv/patches/patch-ad b/converters/libiconv/patches/patch-ad new file mode 100644 index 00000000000..86619fd539d --- /dev/null +++ b/converters/libiconv/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.2 2002/08/25 18:38:19 jlam Exp $ + +--- src/Makefile.in.orig Thu Aug 22 15:14:31 2002 ++++ src/Makefile.in Thu Aug 22 15:20:07 2002 +@@ -78,7 +78,7 @@ + if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi + case "@host_os@" in \ + hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ +- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ ++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \ + esac + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv + diff --git a/databases/db/Makefile b/databases/db/Makefile index f5ef5ea3832..56c2d58364b 100644 --- a/databases/db/Makefile +++ b/databases/db/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/07/19 06:26:23 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 18:38:20 jlam Exp $ DISTNAME= db-2.7.7 CATEGORIES= databases @@ -10,17 +10,20 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.sleepycat.com/ COMMENT= Sleepycat Software's Berkeley DB version 2 -USE_BUILDLINK_ONLY= yes +WRKSRC= ${WRKDIR}/${PKGNAME}/build_unix + +USE_BUILDLINK2= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../dist/configure -WRKSRC= ${WRKDIR}/${PKGNAME}/build_unix +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --enable-compat185 +.endif post-install: ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/html/db .include "../../mk/bsd.pkg.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --enable-compat185 -.endif diff --git a/databases/db/PLIST b/databases/db/PLIST index 1246cad9b4d..8e97237763b 100644 --- a/databases/db/PLIST +++ b/databases/db/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:29:36 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:20 jlam Exp $ bin/db_load bin/db_dump bin/db_deadlock diff --git a/databases/db/buildlink2.mk b/databases/db/buildlink2.mk new file mode 100644 index 00000000000..6bda1b892ae --- /dev/null +++ b/databases/db/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:20 jlam Exp $ + +.if !defined(DB_BUILDLINK2_MK) +DB_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= db +BUILDLINK_DEPENDS.db?= db>=2.7.3 +BUILDLINK_PKGSRCDIR.db?= ../../databases/db + +EVAL_PREFIX+= BUILDLINK_PREFIX.db=db +BUILDLINK_PREFIX.db_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.db= include/db2/* +BUILDLINK_FILES.db+= lib/libdb2.* + +BUILDLINK_TARGETS+= db-buildlink + +db-buildlink: _BUILDLINK_USE + +.endif # DB_BUILDLINK2_MK diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 0ed8bf857c3..4362652dec8 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2002/02/18 15:14:05 seb Exp $ +# $NetBSD: Makefile,v 1.25 2002/08/25 18:38:21 jlam Exp $ # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp # @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/gdbm/gdbm.html COMMENT= The GNU database manager -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/databases/gdbm/buildlink2.mk b/databases/gdbm/buildlink2.mk new file mode 100644 index 00000000000..4657a69c18f --- /dev/null +++ b/databases/gdbm/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:21 jlam Exp $ + +.if !defined(GDBM_BUILDLINK2_MK) +GDBM_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= gdbm +BUILDLINK_DEPENDS.gdbm?= gdbm>=1.7.3 +BUILDLINK_PKGSRCDIR.gdbm?= ../../databases/gdbm + +EVAL_PREFIX+= BUILDLINK_PREFIX.gdbm=gdbm +BUILDLINK_PREFIX.gdbm_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.gdbm= include/gdbm.h +BUILDLINK_FILES.gdbm+= lib/libgdbm.* + +BUILDLINK_TARGETS+= gdbm-buildlink + +gdbm-buildlink: _BUILDLINK_USE + +.endif # GDBM_BUILDLINK2_MK diff --git a/databases/gdbm/patches/patch-ab b/databases/gdbm/patches/patch-ab index 4955f87b1f2..57e0233bf3c 100644 --- a/databases/gdbm/patches/patch-ab +++ b/databases/gdbm/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.8 2002/05/20 22:16:54 cjep Exp $ +$NetBSD: patch-ab,v 1.9 2002/08/25 18:38:21 jlam Exp $ --- Makefile.in.orig Tue May 18 20:16:06 1999 +++ Makefile.in Thu Aug 16 14:27:07 2001 @@ -27,11 +27,11 @@ diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index 9ea09304057..c12034addf1 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.18 2002/06/16 21:45:45 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2002/08/25 18:38:22 jlam Exp $ # -.include "Makefile.common" - PKGNAME= ${DISTNAME:S/-/-client-/} PKGREVISION= 1 SVR4_PKGNAME= mysqc COMMENT= MySQL, a free SQL database (client) -USE_BUILDLINK_ONLY= YES -REPLACE_BUILDLINK+= scripts/mysql_config -REPLACE_BUILDLINK+= scripts/mysqlbug +USE_BUILDLINK2= YES + +.include "Makefile.common" CONFIGURE_ARGS+= --without-server @@ -20,6 +18,6 @@ post-install: cd ${PREFIX}/man/man1; ${RM} -f mysqld.1 safe_mysqld.1 ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info -.include "../../devel/readline/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index e12e91aa0b7..9b60c17d12b 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2002/06/16 21:45:45 wiz Exp $ +# $NetBSD: Makefile.common,v 1.10 2002/08/25 18:38:22 jlam Exp $ DISTNAME= mysql-3.23.49 CATEGORIES= databases @@ -53,4 +53,4 @@ post-extract: ${RM} $${file}.orig; \ done -.include "../../devel/zlib/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" diff --git a/databases/mysql-client/buildlink2.mk b/databases/mysql-client/buildlink2.mk new file mode 100644 index 00000000000..726d97b623c --- /dev/null +++ b/databases/mysql-client/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:22 jlam Exp $ + +.if !defined(MYSQL_CLIENT_BUILDLINK2_MK) +MYSQL_CLIENT_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= mysql-client +BUILDLINK_DEPENDS.mysql-client?= mysql-client>=3.22 +BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql-client + +EVAL_PREFIX+= BUILDLINK_PREFIX.mysql-client=mysql-client +BUILDLINK_PREFIX.mysql-client_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.mysql-client= include/mysql/*.h +BUILDLINK_FILES.mysql-client+= lib/mysql/libmysqlclient.* + +.include "../../devel/zlib/buildlink2.mk" + +BUILDLINK_TARGETS+= mysql-client-buildlink + +mysql-client-buildlink: _BUILDLINK_USE + +.endif # MYSQL_CLIENT_BUILDLINK2_MK diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 942a57d8f9b..0eba60899c4 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2002/08/19 19:29:18 mycroft Exp $ +# $NetBSD: Makefile,v 1.46 2002/08/25 18:38:23 jlam Exp $ DISTNAME= openldap-2.0.25 SVR4_PKGNAME= oldap @@ -12,9 +12,7 @@ COMMENT= Lightweight directory access protocol server and client package CONFLICTS+= ldapsdk-[0-9]* -USE_BUILDLINK_ONLY= YES -REPLACE_BUILDLINK_SED+= -e "s|-L${WRKSRC}/libraries||g" - +USE_BUILDLINK2= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/build/ltconfig @@ -35,13 +33,13 @@ CONFIGURE_ARGS+= --localstatedir=/var/openldap .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -.include "../../databases/db/buildlink.mk" -CPPFLAGS+= -I${BUILDLINK_DIR}/include/db2 +.include "../../databases/db/buildlink2.mk" +CPPFLAGS+= -I${BUILDLINK_PREFIX.db}/include/db2 LIBS= -ldb2 -lpthread -lrt .endif .if defined(USE_SASL) && (${USE_SASL} == "YES") -.include "../../security/cyrus-sasl/buildlink.mk" +.include "../../security/cyrus-sasl/buildlink2.mk" CONFIGURE_ARGS+= --with-cyrus-sasl CONFIGURE_ARGS+= --enable-spasswd .endif @@ -109,9 +107,9 @@ test: -@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test -.include "../../security/openssl/buildlink.mk" -.include "../../security/tcp_wrappers/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../security/tcp_wrappers/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none") CONFIGURE_ARGS+= --with-threads diff --git a/databases/openldap/PLIST b/databases/openldap/PLIST index 570cf3c16d7..465590f6b9a 100644 --- a/databases/openldap/PLIST +++ b/databases/openldap/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2002/08/19 19:29:18 mycroft Exp $ +@comment $NetBSD: PLIST,v 1.7 2002/08/25 18:38:23 jlam Exp $ bin/ldapadd bin/ldapdelete bin/ldapmodify diff --git a/databases/openldap/buildlink.mk b/databases/openldap/buildlink.mk index 9c90a905aee..8a0633103f7 100644 --- a/databases/openldap/buildlink.mk +++ b/databases/openldap/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2002/08/01 05:53:28 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2002/08/25 18:38:23 jlam Exp $ # # This Makefile fragment is included by packages that use openldap. # diff --git a/databases/openldap/buildlink2.mk b/databases/openldap/buildlink2.mk new file mode 100644 index 00000000000..4fc9d3f797b --- /dev/null +++ b/databases/openldap/buildlink2.mk @@ -0,0 +1,41 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:24 jlam Exp $ + +.if !defined(OPENLDAP_BUILDLINK2_MK) +OPENLDAP_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= openldap +BUILDLINK_DEPENDS.openldap?= openldap-2.0.* +BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap + +EVAL_PREFIX+= BUILDLINK_PREFIX.openldap=openldap +BUILDLINK_PREFIX.openldap_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.openldap= include/disptmpl.h +BUILDLINK_FILES.openldap+= include/lber.h +BUILDLINK_FILES.openldap+= include/lber_types.h +BUILDLINK_FILES.openldap+= include/ldap.h +BUILDLINK_FILES.openldap+= include/ldap_cdefs.h +BUILDLINK_FILES.openldap+= include/ldap_features.h +BUILDLINK_FILES.openldap+= include/ldap_schema.h +BUILDLINK_FILES.openldap+= include/srchpref.h +BUILDLINK_FILES.openldap+= lib/liblber.* +BUILDLINK_FILES.openldap+= lib/libldap.* + +USE_PTHREAD= native + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == SunOS +. include "../../databases/db/buildlink2.mk" +.endif + +.include "../../mk/pthread.buildlink2.mk" + +.if defined(USE_SASL) && (${USE_SASL} == "YES") +. include "../../security/cyrus-sasl/buildlink2.mk" +.endif + +BUILDLINK_TARGETS+= openldap-buildlink + +openldap-buildlink: _BUILDLINK_USE + +.endif # OPENLDAP_BUILDLINK2_MK diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index e32ffc86fbc..c67e4b3f486 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/08/19 19:29:19 mycroft Exp $ +$NetBSD: distinfo,v 1.13 2002/08/25 18:38:24 jlam Exp $ SHA1 (openldap-2.0.25.tgz) = fc62147b4de1057bbd3797471a7773406a212e61 Size (openldap-2.0.25.tgz) = 1304098 bytes diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile index 5b86fdef8cc..25b239c3ff2 100644 --- a/databases/postgresql-lib/Makefile +++ b/databases/postgresql-lib/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.5 2002/04/04 07:41:02 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 18:38:24 jlam Exp $ PKGNAME= postgresql-lib-${BASE_VERS} COMMENT= PostgreSQL database headers and libraries -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../databases/postgresql/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} DIRS_TO_BUILD= src/include src/interfaces src/pl .include "../../mk/bsd.prefs.mk" @@ -37,5 +37,5 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|^#.*||" ${FILESDIR}/man.lib` -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-lib/buildlink2.mk b/databases/postgresql-lib/buildlink2.mk new file mode 100644 index 00000000000..6134cbf6e07 --- /dev/null +++ b/databases/postgresql-lib/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:25 jlam Exp $ + +.if !defined(POSTGRESQL_LIB_BUILDLINK2_MK) +POSTGRESQL_LIB_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= postgresql-lib +BUILDLINK_DEPENDS.postgresql-lib?= postgresql-{6.5.3*,7.0*,lib-*} +BUILDLINK_PKGSRCDIR.postgresql-lib?= ../../databases/postgresql-lib + +EVAL_PREFIX+= BUILDLINK_PREFIX.postgresql-lib=postgresql-lib +BUILDLINK_PREFIX.postgresql-lib_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.postgresql-lib= include/pgsql/*/*/*.h +BUILDLINK_FILES.postgresql-lib+= include/pgsql/*/*.h +BUILDLINK_FILES.postgresql-lib+= include/pgsql/*.h +BUILDLINK_FILES.postgresql-lib+= lib/libecpg.* +BUILDLINK_FILES.postgresql-lib+= lib/libpgeasy.* +BUILDLINK_FILES.postgresql-lib+= lib/libpq++.* +BUILDLINK_FILES.postgresql-lib+= lib/libpq.* + +.include "../../security/openssl/buildlink2.mk" + +BUILDLINK_TARGETS+= postgresql-lib-buildlink + +postgresql-lib-buildlink: _BUILDLINK_USE + +.endif # POSTGRESQL_LIB_BUILDLINK2_MK diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile index 010f89d0f9c..61e47acb548 100644 --- a/devel/boehm-gc/Makefile +++ b/devel/boehm-gc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/11/19 20:11:00 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2002/08/25 18:38:25 jlam Exp $ # FreeBSD Id: Makefile,v 1.1 1996/11/16 01:51:25 jdp Exp # @@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.hpl.hp.com/personal/Hans_Boehm/gc/ COMMENT= Garbage collection and memory leak detection for C and C++ -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_GMAKE= YES MAKE_ENV+= COPTS="${CFLAGS}" diff --git a/devel/boehm-gc/buildlink2.mk b/devel/boehm-gc/buildlink2.mk new file mode 100644 index 00000000000..7f13759bae2 --- /dev/null +++ b/devel/boehm-gc/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:26 jlam Exp $ + +.if !defined(BOEHM_GC_BUILDLINK2_MK) +BOEHM_GC_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= boehm-gc +BUILDLINK_DEPENDS.boehm-gc?= boehm-gc>=5.3 +BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc +BUILDLINK_DEPMETHOD.boehm-gc?= build + +EVAL_PREFIX+= BUILDLINK_PREFIX.boehm-gc=boehm-gc +BUILDLINK_PREFIX.boehm-gc_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.boehm-gc= include/gc.h +BUILDLINK_FILES.boehm-gc+= include/gc_cpp.h +BUILDLINK_FILES.boehm-gc+= lib/libgc.a +BUILDLINK_FILES.boehm-gc+= lib/libleak.a + +BUILDLINK_TARGETS+= boehm-gc-buildlink + +boehm-gc-buildlink: _BUILDLINK_USE + +.endif # BOEHM_GC_BUILDLINK2_MK diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo index 5991cbc67b2..2139e237b83 100644 --- a/devel/boehm-gc/distinfo +++ b/devel/boehm-gc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/07/31 14:28:32 wiz Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:38:26 jlam Exp $ SHA1 (gc6.0.tar.gz) = 9698826b33472b314d7b2eb640c1669ce05f5277 Size (gc6.0.tar.gz) = 562188 bytes diff --git a/devel/boehm-gc/patches/patch-ab b/devel/boehm-gc/patches/patch-ab index 201838d35d8..8b6dcb2b0a4 100644 --- a/devel/boehm-gc/patches/patch-ab +++ b/devel/boehm-gc/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 2002/07/31 14:28:32 wiz Exp $ +$NetBSD: patch-ab,v 1.8 2002/08/25 18:38:27 jlam Exp $ --- dyn_load.c.orig Tue Jun 26 04:37:38 2001 +++ dyn_load.c Wed Jul 31 15:57:28 2002 diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 8fb5801fc3c..dbe4ac35539 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2002/08/08 16:17:07 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2002/08/25 18:38:27 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -16,7 +16,7 @@ COMMENT= Some useful routines for C programming CONFLICTS= gtk+-1.0.* -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -77,6 +77,6 @@ test: build cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \ tee ${WRKDIR}/check.log -.include "../../mk/pthread.buildlink.mk" +.include "../../mk/pthread.buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk index a07322c99f5..eaa09d11d0f 100644 --- a/devel/glib/buildlink.mk +++ b/devel/glib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.17 2002/08/01 05:48:08 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.18 2002/08/25 18:38:27 jlam Exp $ # # This Makefile fragment is included by packages that use glib. # diff --git a/devel/glib/buildlink2.mk b/devel/glib/buildlink2.mk new file mode 100644 index 00000000000..7de4241d369 --- /dev/null +++ b/devel/glib/buildlink2.mk @@ -0,0 +1,42 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:28 jlam Exp $ + +.if !defined(GLIB_BUILDLINK2_MK) +GLIB_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= glib +BUILDLINK_DEPENDS.glib?= glib>=1.2.8 +BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib + +EVAL_PREFIX+= BUILDLINK_PREFIX.glib=glib +BUILDLINK_PREFIX.glib_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.glib= include/glib/glib-1.2/* +BUILDLINK_FILES.glib+= include/glib/* +BUILDLINK_FILES.glib+= lib/glib/*/* +BUILDLINK_FILES.glib+= lib/libglib.* +BUILDLINK_FILES.glib+= lib/libgmodule.* +BUILDLINK_FILES.glib+= lib/libgthread.* + +USE_PTHREAD= native pth + +.include "../../mk/pthread.buildlink2.mk" + +BUILDLINK_TARGETS+= glib-buildlink +BUILDLINK_TARGETS+= glib-fix-glib-h + +glib-buildlink: _BUILDLINK_USE + +glib-fix-glib-h: +.if exists(/usr/include/sys/null.h) + @cd ${BUILDLINK_DIR}/include/glib/glib-1.2; \ + if ${GREP} "^\#define.NULL" glib.h > /dev/null; then \ + ${ECHO} WARNING\!; \ + ${ECHO} The installed glib package is broken, please rebuild it from source.;\ + ${ECHO} For more information, see PR 14150.; \ + ${SED} -e "s|^#define.NULL.*|#include <sys/null.h>|" \ + glib.h > glib.h.fixed; \ + ${RM} glib.h; \ + ${MV} glib.h.fixed glib.h; \ + fi +.endif + +.endif # GLIB_BUILDLINK2_MK diff --git a/devel/glib/distinfo b/devel/glib/distinfo index 7a6dccd83e1..3a15affc933 100644 --- a/devel/glib/distinfo +++ b/devel/glib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/07/19 03:48:14 mycroft Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:38:28 jlam Exp $ SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa Size (glib-1.2.10.tar.gz) = 421480 bytes diff --git a/devel/glib/patches/patch-af b/devel/glib/patches/patch-af index 3da906c31eb..d6405a0d938 100644 --- a/devel/glib/patches/patch-af +++ b/devel/glib/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1 2002/07/18 02:19:30 rh Exp $ +$NetBSD: patch-af,v 1.2 2002/08/25 18:38:29 jlam Exp $ --- glib.pc.in.orig Thu Nov 30 11:15:33 2000 +++ glib.pc.in diff --git a/devel/glib/patches/patch-ag b/devel/glib/patches/patch-ag index 95aa5e73613..60d1e9168cf 100644 --- a/devel/glib/patches/patch-ag +++ b/devel/glib/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2002/07/18 02:19:30 rh Exp $ +$NetBSD: patch-ag,v 1.2 2002/08/25 18:38:29 jlam Exp $ --- gmodule.pc.in.orig Thu Nov 30 11:15:33 2000 +++ gmodule.pc.in diff --git a/devel/glib/patches/patch-ah b/devel/glib/patches/patch-ah index a6015873083..c58f0b7da08 100644 --- a/devel/glib/patches/patch-ah +++ b/devel/glib/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2002/07/18 02:19:31 rh Exp $ +$NetBSD: patch-ah,v 1.2 2002/08/25 18:38:29 jlam Exp $ --- gthread.pc.in.orig Thu Nov 30 11:15:33 2000 +++ gthread.pc.in diff --git a/devel/glib/patches/patch-ai b/devel/glib/patches/patch-ai index 1f4e66ae51e..dfbd421cc8d 100644 --- a/devel/glib/patches/patch-ai +++ b/devel/glib/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.2 2002/07/19 03:48:14 mycroft Exp $ +$NetBSD: patch-ai,v 1.3 2002/08/25 18:38:30 jlam Exp $ --- gthread/testgthread.c.orig Fri Jul 19 03:43:50 2002 +++ gthread/testgthread.c Fri Jul 19 03:42:15 2002 diff --git a/devel/libmm/Makefile b/devel/libmm/Makefile index aed5963e96a..0147468e598 100644 --- a/devel/libmm/Makefile +++ b/devel/libmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/08/01 00:28:16 mycroft Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 18:38:30 jlam Exp $ # DISTNAME= mm-1.2.1 @@ -10,10 +10,10 @@ MAINTAINER= cjones@netbsd.org HOMEPAGE= http://www.ossp.org/pkg/lib/mm/ COMMENT= Portable abstraction layer for shared memory -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/libmm/PLIST b/devel/libmm/PLIST index b39a837ea3a..58e1f088a13 100644 --- a/devel/libmm/PLIST +++ b/devel/libmm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/01 00:28:16 mycroft Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:30 jlam Exp $ bin/mm-config include/mm.h lib/libmm.a diff --git a/devel/libmm/buildlink.mk b/devel/libmm/buildlink.mk index bc6b366e487..b610ebfcf2f 100644 --- a/devel/libmm/buildlink.mk +++ b/devel/libmm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2002/08/01 00:53:20 mycroft Exp $ +# $NetBSD: buildlink.mk,v 1.3 2002/08/25 18:38:30 jlam Exp $ # # This Makefile fragment is included by packages that use libmm. # diff --git a/devel/libmm/buildlink2.mk b/devel/libmm/buildlink2.mk new file mode 100644 index 00000000000..e21f6587085 --- /dev/null +++ b/devel/libmm/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:31 jlam Exp $ + +.if !defined(LIBMM_BUILDLINK2_MK) +LIBMM_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libmm +BUILDLINK_DEPENDS.libmm?= libmm>=1.2.1 +BUILDLINK_PKGSRCDIR.libmm?= ../../devel/libmm + +EVAL_PREFIX+= BUILDLINK_PREFIX.libmm=libmm +BUILDLINK_PREFIX.libmm_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libmm= include/mm.h +BUILDLINK_FILES.libmm+= lib/libmm.* + +BUILDLINK_TARGETS+= libmm-buildlink + +libmm-buildlink: _BUILDLINK_USE + +.endif # LIBMM_BUILDLINK2_MK diff --git a/devel/libmm/distinfo b/devel/libmm/distinfo index 16ff54d7ac6..1bb8e9c5907 100644 --- a/devel/libmm/distinfo +++ b/devel/libmm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/08/01 00:28:16 mycroft Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 18:38:31 jlam Exp $ SHA1 (mm-1.2.1.tar.gz) = c2915c82adbf9be7b43375a5ced3dc08700b1810 Size (mm-1.2.1.tar.gz) = 217078 bytes diff --git a/devel/libnet/Makefile b/devel/libnet/Makefile index 7f76426aff6..dc7750bdf0a 100644 --- a/devel/libnet/Makefile +++ b/devel/libnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/03 22:36:38 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 18:38:31 jlam Exp $ # DISTNAME= libnet-1.0.1b @@ -9,10 +9,10 @@ MAINTAINER= sakamoto@netbsd.org HOMEPAGE= http://www.packetfactory.net/libnet/ COMMENT= C library for portable packet creation and injection -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined -USE_LIBTOOL= #defined -GNU_CONFIGURE= #defined +USE_LIBTOOL= # defined +GNU_CONFIGURE= # defined CONFIGURE_ENV+= LIBNET_CONFIG_CFLAGS="-I${PREFIX}/include" \ LIBNET_CONFIG_LIBS="${LDFLAGS}" @@ -29,7 +29,7 @@ post-install: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} @(cd ${PREFIX}; \ ${FIND} ${DOCDIR} -type f >> ${PLIST_SRC}; \ - ${FIND} ${DOCDIR} -type d| ${SED} -e 's|^|@dirrm |' | sort -r \ + ${FIND} ${DOCDIR} -type d| ${SED} -e 's|^|@dirrm |' | ${SORT} -r \ >> ${PLIST_SRC}) .include "../../mk/bsd.pkg.mk" diff --git a/devel/libnet/buildlink2.mk b/devel/libnet/buildlink2.mk new file mode 100644 index 00000000000..ee39e4ffdf3 --- /dev/null +++ b/devel/libnet/buildlink2.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:32 jlam Exp $ + +.if !defined(LIBNET_BUILDLINK2_MK) +LIBNET_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libnet +BUILDLINK_DEPENDS.libnet?= libnet-[0-9]* +BUILDLINK_PKGSRCDIR.libnet?= ../../devel/libnet + +EVAL_PREFIX+= BUILDLINK_PREFIX.libnet=libnet +BUILDLINK_PREFIX.libnet_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libnet= include/libnet.h +BUILDLINK_FILES.libnet+= include/libnet/* +BUILDLINK_FILES.libnet+= lib/libnet.* + +BUILDLINK_TARGETS+= libnet-buildlink + +libnet-buildlink: _BUILDLINK_USE + +.endif # LIBNET_BUILDLINK2_MK diff --git a/devel/libproplist/Makefile b/devel/libproplist/Makefile index 35d257209db..e6018117cd8 100644 --- a/devel/libproplist/Makefile +++ b/devel/libproplist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/10/02 08:49:51 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 18:38:32 jlam Exp $ DISTNAME= libPropList-0.10.1 PKGNAME= libproplist-0.10.1 @@ -9,7 +9,7 @@ MAINTAINER= jlam@netbsd.org COMMENT= GNUstep/OPENSTEP property lists compatibility library GNU_CONFIGURE= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/devel/libproplist/buildlink2.mk b/devel/libproplist/buildlink2.mk new file mode 100644 index 00000000000..bd6c8dda42d --- /dev/null +++ b/devel/libproplist/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:33 jlam Exp $ + +.if !defined(LIBPROPLIST_BUILDLINK2_MK) +LIBPROPLIST_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libproplist +BUILDLINK_DEPENDS.libproplist?= libproplist>=0.10.1 +BUILDLINK_PKGSRCDIR.libproplist?= ../../devel/libproplist + +EVAL_PREFIX+= BUILDLINK_PREFIX.libproplist=libproplist +BUILDLINK_PREFIX.libproplist_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libproplist= include/proplist.h +BUILDLINK_FILES.libproplist+= lib/libPropList.* + +BUILDLINK_TARGETS+= libproplist-buildlink + +libproplist-buildlink: _BUILDLINK_USE + +.endif # LIBPROPLIST_BUILDLINK2_MK diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index aa14507ccfb..1b8965edae6 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/05/21 14:03:38 schmonz Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 18:38:36 jlam Exp $ # .include "../libtool/Makefile.common" @@ -10,6 +10,8 @@ COMMENT= Generic shared library support script (the script itself) CONFLICTS+= libtool<=1.3.5nb11 +USE_BUILDLINK2= # defined + test: build cd ${WRKSRC} && ${MAKE} check diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index c4c814d5d5b..8b610db2bba 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2002/05/23 20:07:00 schmonz Exp $ +# $NetBSD: Makefile,v 1.37 2002/08/25 18:38:33 jlam Exp $ # DISTFILES= # empty diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index 364b0a5a992..267868daff2 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2002/05/21 14:03:36 schmonz Exp $ +# $NetBSD: Makefile.common,v 1.23 2002/08/25 18:38:34 jlam Exp $ # DISTNAME= libtool-ml-20010614 diff --git a/devel/libtool/buildlink2.mk b/devel/libtool/buildlink2.mk new file mode 100644 index 00000000000..a516bb0ab23 --- /dev/null +++ b/devel/libtool/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:34 jlam Exp $ + +.if !defined(LTDL_BUILDLINK2_MK) +LTDL_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= ltdl +BUILDLINK_DEPENDS.ltdl?= libtool-base>=${LIBTOOL_REQD} +BUILDLINK_PKGSRCDIR.ltdl?= ../../devel/libtool-base + +EVAL_PREFIX+= BUILDLINK_PREFIX.ltdl=libtool-base +BUILDLINK_PREFIX.ltdl_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.ltdl= include/ltdl.h +BUILDLINK_FILES.ltdl+= lib/libltdl.* + +BUILDLINK_TARGETS+= ltdl-buildlink + +ltdl-buildlink: _BUILDLINK_USE + +.endif # LTDL_BUILDLINK2_MK diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index d82739cd2ca..d0541ed33ea 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2002/05/21 14:03:37 schmonz Exp $ +$NetBSD: distinfo,v 1.18 2002/08/25 18:38:35 jlam Exp $ SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac Size (libtool-ml-20010614.tar.gz) = 784246 bytes diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa index 5eb7a9232c9..cf1aa987289 100644 --- a/devel/libtool/patches/patch-aa +++ b/devel/libtool/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.27 2002/05/21 14:03:37 schmonz Exp $ +$NetBSD: patch-aa,v 1.28 2002/08/25 18:38:35 jlam Exp $ --- ltconfig.in.orig Mon May 21 05:05:06 2001 +++ ltconfig.in diff --git a/devel/libtool/patches/patch-ag b/devel/libtool/patches/patch-ag index 3dee189d0a4..c18d9213da0 100644 --- a/devel/libtool/patches/patch-ag +++ b/devel/libtool/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.6 2002/05/21 14:03:37 schmonz Exp $ +$NetBSD: patch-ag,v 1.7 2002/08/25 18:38:35 jlam Exp $ --- ltcf-cxx.sh.orig Wed May 23 05:05:06 2001 +++ ltcf-cxx.sh diff --git a/devel/libtool/patches/patch-am b/devel/libtool/patches/patch-am index 68c23fc8422..30f2f5c49b5 100644 --- a/devel/libtool/patches/patch-am +++ b/devel/libtool/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.3 2002/05/21 14:03:37 schmonz Exp $ +$NetBSD: patch-am,v 1.4 2002/08/25 18:38:36 jlam Exp $ --- ltcf-c.sh.orig Wed Apr 25 00:05:02 2001 +++ ltcf-c.sh diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile index 3619b43a183..99c455fddaf 100644 --- a/devel/lwp/Makefile +++ b/devel/lwp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/06/20 19:27:54 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 18:38:36 jlam Exp $ # DISTNAME= lwp-1.9 @@ -12,12 +12,13 @@ COMMENT= Light Weight Process style threads # ${WRKSRC}/src/process.ss needs pmap handling assembly for # each arch. Mips has it, but it evidently needs more work. +# ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc* \ NetBSD-*-arm32 +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_BUILDLINK_ONLY= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/lwp/PLIST b/devel/lwp/PLIST index 80f30b61214..fd65b38d6d5 100644 --- a/devel/lwp/PLIST +++ b/devel/lwp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/20 19:27:54 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:36 jlam Exp $ include/lwp/lock.h include/lwp/lwp.h include/lwp/timer.h diff --git a/devel/lwp/buildlink2.mk b/devel/lwp/buildlink2.mk new file mode 100644 index 00000000000..8fcf9cd987a --- /dev/null +++ b/devel/lwp/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:37 jlam Exp $ + +.if !defined(LWP_BUILDLINK2_MK) +LWP_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= lwp +BUILDLINK_DEPENDS.lwp?= lwp>=1.6 +BUILDLINK_PKGSRCDIR.lwp?= ../../devel/lwp + +EVAL_PREFIX+= BUILDLINK_PREFIX.lwp=lwp +BUILDLINK_PREFIX.lwp_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.lwp= include/lwp/* +BUILDLINK_FILES.lwp+= lib/liblwp.* + +BUILDLINK_TARGETS+= lwp-buildlink + +lwp-buildlink: _BUILDLINK_USE + +.endif # LWP_BUILDLINK2_MK diff --git a/devel/lwp/distinfo b/devel/lwp/distinfo index 4407770a073..20154abb188 100644 --- a/devel/lwp/distinfo +++ b/devel/lwp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/06/20 19:27:55 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 18:38:37 jlam Exp $ SHA1 (lwp-1.9.tar.gz) = e5f40cf36ac705ef5d9b0600cb1bab5bf00d817b Size (lwp-1.9.tar.gz) = 246491 bytes diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index d769d2a5077..f33391e122b 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2001/06/19 05:06:27 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2002/08/25 18:38:38 jlam Exp $ DISTNAME= ncurses-${NC_VERS} NC_VERS= 5.2 @@ -12,7 +12,7 @@ HOMEPAGE= http://dickey.his.com/ncurses/ncurses.html COMMENT= CRT screen handling and optimization package USE_LIBTOOL= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-libtool diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk index 29d33cf7b7d..2c1cba3221f 100644 --- a/devel/ncurses/buildlink.mk +++ b/devel/ncurses/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.20 2002/08/07 19:29:30 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.21 2002/08/25 18:38:38 jlam Exp $ # # This Makefile fragment is included by packages that use ncurses. # diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk new file mode 100644 index 00000000000..adeec58d5b4 --- /dev/null +++ b/devel/ncurses/buildlink2.mk @@ -0,0 +1,105 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:38 jlam Exp $ +# +# Optionally define: +# +# USE_NCURSES force use of ncurses +# INCOMPAT_CURSES specify MACHINE_PLATFORM versions that are missing +# some needed functions. + +.if !defined(NCURSES_BUILDLINK2_MK) +NCURSES_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.ncurses?= ncurses>=5.0 +BUILDLINK_PKGSRCDIR.ncurses?= ../../devel/ncurses + +.if defined(USE_NCURSES) +_NEED_NCURSES= YES +.else +_NEED_NCURSES= NO +# +# These versions of NetBSD didn't have a curses library that was capable of +# replacing ncurses. +# +_INCOMPAT_CURSES= NetBSD-0.*-* NetBSD-1.[0123]*-* +_INCOMPAT_CURSES+= NetBSD-1.4.*-* NetBSD-1.4[A-X]-* +# +# This catch-all for SunOS is probably too broad, but better to err on +# the safe side. We can narrow down the match when we have better +# information. +# +_INCOMPAT_CURSES+= SunOS-*-* +INCOMPAT_CURSES?= # empty +. for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +_NEED_NCURSES= YES +. endif +. endfor +.endif + +.if ${_NEED_NCURSES} == "YES" +BUILDLINK_PACKAGES+= ncurses +EVAL_PREFIX+= BUILDLINK_PREFIX.ncurses=ncurses +BUILDLINK_PREFIX.ncurses_DEFAULT= ${LOCALBASE} +.else +BUILDLINK_PREFIX.ncurses= /usr +.endif + +BUILDLINK_FILES.ncurses+= include/curses.h +BUILDLINK_FILES.ncurses+= include/cursesapp.h +BUILDLINK_FILES.ncurses+= include/cursesf.h +BUILDLINK_FILES.ncurses+= include/cursesm.h +BUILDLINK_FILES.ncurses+= include/cursesp.h +BUILDLINK_FILES.ncurses+= include/cursesw.h +BUILDLINK_FILES.ncurses+= include/cursslk.h +BUILDLINK_FILES.ncurses+= include/eti.h +BUILDLINK_FILES.ncurses+= include/etip.h +BUILDLINK_FILES.ncurses+= include/form.h +BUILDLINK_FILES.ncurses+= include/menu.h +BUILDLINK_FILES.ncurses+= include/ncurses.h +BUILDLINK_FILES.ncurses+= include/panel.h +BUILDLINK_FILES.ncurses+= include/term.h +BUILDLINK_FILES.ncurses+= include/termcap.h +BUILDLINK_FILES.ncurses+= include/unctrl.h +BUILDLINK_FILES.ncurses+= lib/libform.* +BUILDLINK_FILES.ncurses+= lib/libmenu.* +BUILDLINK_FILES.ncurses+= lib/libncurses++.* +BUILDLINK_FILES.ncurses+= lib/libncurses.* +BUILDLINK_FILES.ncurses+= lib/libpanel.* + +.if ${_NEED_NCURSES} == "NO" +_BLNK_LIBNCURSES_LIST!= ${ECHO} /usr/lib/libncurses.* +. if ${_BLNK_LIBNCURSES_LIST} == "/usr/lib/libncurses.*" +BUILDLINK_FILES.ncurses+= lib/libcurses.* +BUILDLINK_TRANSFORM.ncurses+= -e "s|/curses.h|/ncurses.h|g" +BUILDLINK_TRANSFORM+= l:ncurses:curses +. endif +.endif + +BUILDLINK_TARGETS+= ncurses-buildlink +BUILDLINK_TARGETS+= ncurses-curses-h +BUILDLINK_TARGETS+= ncurses-extra-includes-buildlink + +ncurses-buildlink: _BUILDLINK_USE + +ncurses-extra-includes-buildlink: + ${_PKG_SILENT}${_PKG_DEBUG} \ + extra_includes=" \ + include/term.h \ + "; \ + for file in $${extra_includes}; do \ + if [ ! -f ${BUILDLINK_DIR}/$${file} ]; then \ + ${ECHO_BUILDLINK_MSG} "Touching extra ncurses header ($${file}) in ${BUILDLINK_DIR}."; \ + ${TOUCH} ${TOUCH_FLAGS} ${BUILDLINK_DIR}/$${file}; \ + fi; \ + done + +ncurses-curses-h: + ${_PKG_SILENT}${_PKG_DEBUG} \ + if [ ! -f ${BUILDLINK_DIR}/include/curses.h ]; then \ + ${ECHO_BUILDLINK_MSG} "Linking curses.h to ncurses.h in ${BUILDLINK_DIR}."; \ + ${LN} -s ${BUILDLINK_PREFIX.ncurses}/include/ncurses.h ${BUILDLINK_DIR}/include/curses.h; \ + fi + +.endif # NCURSES_BUILDLINK2_MK diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo index 90dff8ba4f7..8c84a4f2e2b 100644 --- a/devel/ncurses/distinfo +++ b/devel/ncurses/distinfo @@ -1,12 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/06/19 05:35:38 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 18:38:39 jlam Exp $ SHA1 (ncurses-5.2.tar.gz) = 47e13874118568c48bdb6034d716dcf424f3bf12 Size (ncurses-5.2.tar.gz) = 1743818 bytes SHA1 (patch-aa) = 235774ae5a52a31b833ff3a8a48d4b3e8ead9d3b SHA1 (patch-ab) = c523e86cf4faf08930c95f0aee59be85c962a147 -SHA1 (patch-ac) = 905fb542adc987817b5ad8c1b760e9f0109ed8a4 -SHA1 (patch-ad) = ae507553363a7c0514a18848b47bcd3de18d35c4 -SHA1 (patch-ae) = 5a2d1f13c0b202ddec6f966576498b9c6c693bf0 -SHA1 (patch-af) = aba9d358b7f79a432a8981eeb01e39bba74cb171 -SHA1 (patch-ag) = 5210e65902a912bb560dce856ddc93171fc1123a -SHA1 (patch-ah) = 18565f7fdfbb3dbdf6e4e8a938ebb679ed8e1a36 diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac deleted file mode 100644 index 5789c2adab0..00000000000 --- a/devel/ncurses/patches/patch-ac +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-ac,v 1.9 2001/06/19 05:35:39 jlam Exp $ - ---- configure.orig Fri Oct 20 18:58:49 2000 -+++ configure -@@ -6999,17 +6999,6 @@ - if test "$srcdir" != "."; then - CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../include" - fi --if test "$GCC" != yes; then -- CPPFLAGS="$CPPFLAGS -I\$(includedir)" --elif test "$includedir" != "/usr/include"; then -- if test "$includedir" = '${prefix}/include' ; then -- if test $prefix != /usr ; then -- CPPFLAGS="$CPPFLAGS -I\$(includedir)" -- fi -- else -- CPPFLAGS="$CPPFLAGS -I\$(includedir)" -- fi --fi - - - -@@ -7017,17 +7006,6 @@ - if test "$srcdir" != "."; then - ACPPFLAGS="$ACPPFLAGS -I\$(srcdir)/../../include" - fi --if test "$GCC" != yes; then -- ACPPFLAGS="$ACPPFLAGS -I\$(includedir)" --elif test "$includedir" != "/usr/include"; then -- if test "$includedir" = '${prefix}/include' ; then -- if test $prefix != /usr ; then -- ACPPFLAGS="$ACPPFLAGS -I\$(includedir)" -- fi -- else -- ACPPFLAGS="$ACPPFLAGS -I\$(includedir)" -- fi --fi - - - -@@ -7191,11 +7169,11 @@ - fi - done - echo "$ac_t""$cf_cv_src_modules" 1>&6 --TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS" -+TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" - - - --PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS" -+PROG_ARGS="-L${LIB_DIR} $PROG_ARGS" - - - SRC_SUBDIRS="man include" diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad deleted file mode 100644 index b490171f073..00000000000 --- a/devel/ncurses/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2001/06/19 05:35:39 jlam Exp $ - ---- c++/Makefile.in.orig Sat Oct 14 20:43:38 2000 -+++ c++/Makefile.in -@@ -87,9 +87,9 @@ - LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a - LIBNAME = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@ - --LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) -l$(LIBROOT) -+LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT) - --LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) ../lib/$(LIBNAME) -+LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME) - LINK_NORMAL = $(LINK_FLAGS) - LINK_DEBUG = $(LINK_FLAGS) - LINK_PROFILE = $(LINK_FLAGS) diff --git a/devel/ncurses/patches/patch-ae b/devel/ncurses/patches/patch-ae deleted file mode 100644 index 228aa4bcfa0..00000000000 --- a/devel/ncurses/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2001/06/19 05:35:39 jlam Exp $ - ---- form/Makefile.in.orig Sat Oct 14 13:57:02 2000 -+++ form/Makefile.in -@@ -85,7 +85,7 @@ - LINK = $(LIBTOOL) $(CC) - LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ - --SHLIB_DIRS = -L../lib -L$(libdir) -+SHLIB_DIRS = -L../lib - SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ - - MK_SHARED_LIB = @MK_SHARED_LIB@ diff --git a/devel/ncurses/patches/patch-af b/devel/ncurses/patches/patch-af deleted file mode 100644 index 82ae744520b..00000000000 --- a/devel/ncurses/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.6 2001/06/19 05:35:39 jlam Exp $ - ---- menu/Makefile.in.orig Sat Oct 14 13:57:02 2000 -+++ menu/Makefile.in -@@ -85,7 +85,7 @@ - LINK = $(LIBTOOL) $(CC) - LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ - --SHLIB_DIRS = -L../lib -L$(libdir) -+SHLIB_DIRS = -L../lib - SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ - - MK_SHARED_LIB = @MK_SHARED_LIB@ diff --git a/devel/ncurses/patches/patch-ag b/devel/ncurses/patches/patch-ag deleted file mode 100644 index 6b0c9c1fff7..00000000000 --- a/devel/ncurses/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2001/06/19 05:35:39 jlam Exp $ - ---- ncurses/Makefile.in.orig Sat Oct 14 18:55:35 2000 -+++ ncurses/Makefile.in -@@ -99,7 +99,7 @@ - LINK = $(LIBTOOL) $(CC) - LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ - --SHLIB_DIRS = -L../lib -L$(libdir) -+SHLIB_DIRS = -L../lib - SHLIB_LIST = $(SHLIB_DIRS) @SHLIB_LIST@ - TINFO_LIST = $(SHLIB_DIRS) @TINFO_LIST@ - diff --git a/devel/ncurses/patches/patch-ah b/devel/ncurses/patches/patch-ah deleted file mode 100644 index 4c96720bc74..00000000000 --- a/devel/ncurses/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.5 2001/06/19 05:35:39 jlam Exp $ - ---- panel/Makefile.in.orig Sat Oct 14 13:57:02 2000 -+++ panel/Makefile.in -@@ -86,7 +86,7 @@ - LINK = $(LIBTOOL) $(CC) - LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ - --SHLIB_DIRS = -L../lib -L$(libdir) -+SHLIB_DIRS = -L../lib - SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ - - MK_SHARED_LIB = @MK_SHARED_LIB@ diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 6d35a097270..068223b2fff 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/11/30 10:20:01 martti Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 18:38:42 jlam Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/07/12 22:59:19 steve Exp $ DISTNAME= pcre-3.7 @@ -12,10 +12,10 @@ MAINTAINER= proff@netbsd.org HOMEPAGE= http://www.pcre.org/ COMMENT= Perl Compatible Regular Expressions library -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/pcre/buildlink2.mk b/devel/pcre/buildlink2.mk new file mode 100644 index 00000000000..57d6d056fb1 --- /dev/null +++ b/devel/pcre/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:43 jlam Exp $ + +.if !defined(PCRE_BUILDLINK2_MK) +PCRE_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= pcre +BUILDLINK_DEPENDS.pcre?= pcre>=3.4 +BUILDLINK_PKGSRCDIR.pcre?= ../../devel/pcre + +EVAL_PREFIX+= BUILDLINK_PREFIX.pcre=pcre +BUILDLINK_PREFIX.pcre_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.pcre= include/pcre.h +BUILDLINK_FILES.pcre+= include/pcreposix.h +BUILDLINK_FILES.pcre+= lib/libpcre.* +BUILDLINK_FILES.pcre+= lib/libpcreposix.* + +BUILDLINK_TARGETS+= pcre-buildlink + +pcre-buildlink: _BUILDLINK_USE + +.endif # PCRE_BUILDLINK2_MK diff --git a/devel/pth/Makefile b/devel/pth/Makefile index 91bb4c581d5..66a5926e3c0 100644 --- a/devel/pth/Makefile +++ b/devel/pth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2002/08/01 13:36:08 skrll Exp $ +# $NetBSD: Makefile,v 1.47 2002/08/25 18:38:43 jlam Exp $ # DISTNAME= pth-1.4.1 @@ -12,7 +12,7 @@ COMMENT= GNU Portable Thread library CONFLICTS= pth-current-[0-9]* pth-syscall<1.4.1nb1 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= YES @@ -37,3 +37,7 @@ post-install: ${PREFIX}/share/doc/pth/ .include "../../mk/bsd.pkg.mk" + +.if (${MACHINE_ARCH} == "i386" && ${CFLAGS:M-O2} == "-O2") +CFLAGS:= ${CFLAGS:S/-O2/-O0/} +.endif diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk index f64b2d9eee5..9a34fa03420 100644 --- a/devel/pth/buildlink.mk +++ b/devel/pth/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.10 2002/05/31 06:24:53 grant Exp $ +# $NetBSD: buildlink.mk,v 1.11 2002/08/25 18:38:44 jlam Exp $ # # This Makefile fragment is included by packages that use pth. # diff --git a/devel/pth/buildlink2.mk b/devel/pth/buildlink2.mk new file mode 100644 index 00000000000..11aa8d142a7 --- /dev/null +++ b/devel/pth/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:44 jlam Exp $ + +.if !defined(PTH_BUILDLINK2_MK) +PTH_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= pth +BUILDLINK_DEPENDS.pth?= pth>=1.4.0 +BUILDLINK_PKGSRCDIR.pth?= ../../devel/pth + +EVAL_PREFIX+= BUILDLINK_PREFIX.pth=pth +BUILDLINK_PREFIX.pth_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.pth= include/pth.h +BUILDLINK_FILES.pth+= include/pthread.h +BUILDLINK_FILES.pth+= lib/libpth.* +BUILDLINK_FILES.pth+= lib/libpthread.* + +BUILDLINK_TARGETS+= pth-buildlink + +pth-buildlink: _BUILDLINK_USE + +.endif # PTH_BUILDLINK2_MK diff --git a/devel/pth/distinfo b/devel/pth/distinfo index 2cb0a4314c2..a29b5180a5f 100644 --- a/devel/pth/distinfo +++ b/devel/pth/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/08/01 13:36:08 skrll Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:38:44 jlam Exp $ SHA1 (pth-1.4.1.tar.gz) = bc5b0847d57d2b78945a6c8d4ebab57e46213972 Size (pth-1.4.1.tar.gz) = 446287 bytes diff --git a/devel/pth/patches/patch-ag b/devel/pth/patches/patch-ag index acce8bca0c7..fb4d421e080 100644 --- a/devel/pth/patches/patch-ag +++ b/devel/pth/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2002/08/01 13:36:09 skrll Exp $ +$NetBSD: patch-ag,v 1.2 2002/08/25 18:38:45 jlam Exp $ --- pth_lib.c.orig Sun Jan 27 11:03:40 2002 +++ pth_lib.c diff --git a/devel/readline/Makefile b/devel/readline/Makefile index 891b723b9ae..7690b9f2667 100644 --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/02/18 15:14:15 seb Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 18:38:45 jlam Exp $ # DISTNAME= readline-4.2 @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/readline/ COMMENT= GNU library that can recall and edit previous input -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined USE_LIBTOOL= # defined @@ -18,18 +18,5 @@ INSTALL_TARGET= install-la INFO_FILES= readline.info history.info -# Remove -I$(includedir) from the INCLUDES passed to the compiler as this -# defeats buildlink. -# -post-patch: - cd ${WRKSRC}; \ - files="Makefile.in"; \ - for file in $${files}; do \ - ${MV} -f $${file} $${file}.fixme; \ - ${SED} -e "s|[ ]*-I\$$(includedir)||" \ - $${file}.fixme > $${file}; \ - ${RM} $${file}.fixme; \ - done - .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk index 6424de84007..eacedb24ede 100644 --- a/devel/readline/buildlink.mk +++ b/devel/readline/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.19 2002/08/07 19:29:30 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.20 2002/08/25 18:38:46 jlam Exp $ # # This Makefile fragment is included by packages that use readline(). # diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk new file mode 100644 index 00000000000..e8dce31bd34 --- /dev/null +++ b/devel/readline/buildlink2.mk @@ -0,0 +1,74 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:46 jlam Exp $ +# +# Optionally define USE_GNU_READLINE to force use of GNU readline. +# +# NOTE: You may need to do some more work to get libedit recognized over +# libreadline, especially by GNU configure scripts. + +.if !defined(READLINE_BUILDLINK2_MK) +READLINE_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.readline?= readline>=2.2 +BUILDLINK_PKGSRCDIR.readline?= ../../devel/readline + +.if defined(USE_GNU_READLINE) +_NEED_GNU_READLINE= YES +.else +. if exists(/usr/include/readline.h) || \ + exists(/usr/include/readline/readline.h) +_NEED_GNU_READLINE= NO +. else +_NEED_GNU_READLINE= YES +. endif +# +# This catch-all for SunOS is probably too broad, but better to err on +# the safe side. We can narrow down the match when we have better +# information. +# +_INCOMPAT_READLINE= SunOS-*-* +INCOMPAT_READLINE?= # empty +. for _pattern_ in ${_INCOMPAT_READLINE} ${INCOMPAT_READLINE} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +_NEED_GNU_READLINE= YES +. endif +. endfor +.endif + +.if ${_NEED_GNU_READLINE} == "YES" +BUILDLINK_PACKAGES+= readline +EVAL_PREFIX+= BUILDLINK_PREFIX.readline=readline +BUILDLINK_PREFIX.readline_DEFAULT= ${LOCALBASE} +.else +BUILDLINK_PREFIX.readline= /usr +.endif +BUILDLINK_PREFIX.history= ${BUILDLINK_PREFIX.readline} + +BUILDLINK_FILES.readline= include/readline.h +BUILDLINK_FILES.readline+= include/readline/* +BUILDLINK_FILES.readline+= lib/libreadline.* + +BUILDLINK_FILES.history= include/history.h +BUILDLINK_FILES.history+= lib/libhistory.* + +.if ${_NEED_GNU_READLINE} == "NO" +_BLNK_LIBEDIT_LIST!= ${ECHO} /usr/lib/libedit.* +. if ${_BLNK_LIBEDIT_LIST} != "/usr/lib/libedit.*" +BUILDLINK_FILES.readline+= lib/libedit.* +BUILDLINK_TRANSFORM.readline= -e "s|/readline.h|/readline/readline.h|g" +BUILDLINK_TRANSFORM+= l:readline:edit + +BUILDLINK_FILES.history+= lib/libedit.* +BUILDLINK_TRANSFORM.history= -e "s|/history.h|/readline/history.h|g" +BUILDLINK_TRANSFORM+= l:history:edit +. endif +.endif + +BUILDLINK_TARGETS+= readline-buildlink +BUILDLINK_TARGETS+= history-buildlink + +readline-buildlink: _BUILDLINK_USE +history-buildlink: _BUILDLINK_USE + +.endif # READLINE_BUILDLINK2_MK diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile index 8b81cf548c4..0554710c361 100644 --- a/devel/rpc2/Makefile +++ b/devel/rpc2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/07/24 19:45:23 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 18:38:47 jlam Exp $ # DISTNAME= rpc2-1.13 @@ -10,15 +10,17 @@ MAINTAINER= phil@cs.wwu.edu HOMEPAGE= http://www.coda.cs.cmu.edu/ COMMENT= CMU (Coda) remote procedure call package +USE_BUILDLINK2= YES +USE_GMAKE= YES + GNU_CONFIGURE= YES +CONFIGURE_ENV+= PERL=${PERL5} + USE_PERL5= build USE_LIBTOOL= YES -USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES - LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -CONFIGURE_ENV+= PERL=${PERL5} -.include "../../devel/lwp/buildlink.mk" -.include "../../devel/readline/buildlink.mk" +.include "../../devel/lwp/buildlink2.mk" +.include "../../devel/readline/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/devel/rpc2/PLIST b/devel/rpc2/PLIST index 979c06809fb..1b9998f77ae 100644 --- a/devel/rpc2/PLIST +++ b/devel/rpc2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/20 19:28:01 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:47 jlam Exp $ bin/filcon bin/rp2gen include/rpc2/errors.h diff --git a/devel/rpc2/buildlink2.mk b/devel/rpc2/buildlink2.mk new file mode 100644 index 00000000000..130807e07f6 --- /dev/null +++ b/devel/rpc2/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:48 jlam Exp $ + +.if !defined(RPC2_BUILDLINK2_MK) +RPC2_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= rpc2 +BUILDLINK_DEPENDS.rpc2?= rpc2>=1.10 +BUILDLINK_PKGSRCDIR.rpc2?= ../../devel/rpc2 + +EVAL_PREFIX+= BUILDLINK_PREFIX.rpc2=rpc2 +BUILDLINK_PREFIX.rpc2_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.rpc2= include/rpc2/* +BUILDLINK_FILES.rpc2+= lib/libfail.* +BUILDLINK_FILES.rpc2+= lib/librpc2.* +BUILDLINK_FILES.rpc2+= lib/libse.* + +.include "../../devel/lwp/buildlink2.mk" + +BUILDLINK_TARGETS+= rpc2-buildlink + +rpc2-buildlink: _BUILDLINK_USE + +.endif # RPC2_BUILDLINK2_MK diff --git a/devel/rpc2/distinfo b/devel/rpc2/distinfo index 778164eac79..6416af60f52 100644 --- a/devel/rpc2/distinfo +++ b/devel/rpc2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/06/20 19:28:01 jlam Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 18:38:48 jlam Exp $ SHA1 (rpc2-1.13.tar.gz) = b4f13fe3f878c632b66a6a1ac19883c735eeef4d Size (rpc2-1.13.tar.gz) = 447572 bytes diff --git a/devel/rpc2/patches/patch-aa b/devel/rpc2/patches/patch-aa index 1be9f5607b3..d43b390354d 100644 --- a/devel/rpc2/patches/patch-aa +++ b/devel/rpc2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2002/06/20 19:28:01 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2002/08/25 18:38:49 jlam Exp $ --- fail/parser.c.orig Tue May 22 12:31:45 2001 +++ fail/parser.c diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile index a8c93dfd970..da43af32ebc 100644 --- a/devel/rvm/Makefile +++ b/devel/rvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/07/03 10:59:47 jdolecek Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 18:38:49 jlam Exp $ # DISTNAME= rvm-1.6 @@ -11,12 +11,13 @@ MAINTAINER= phil@cs.wwu.edu HOMEPAGE= http://www.coda.cs.cmu.edu/ COMMENT= Recoverable Virtual Memory -GNU_CONFIGURE= YES -USE_LIBTOOL= YES +USE_BUILDLINK2= YES USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES -CONFIGURE_ARGS+= --with-lwp-includes=${BUILDLINK_DIR}/include +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --with-lwp-includes=${BUILDLINK_PREFIX.lwp}/include + +USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool pre-build: @@ -25,5 +26,5 @@ pre-build: ${LN} -sf $${file} `${BASENAME} $${file} .c`_lwp.c; \ done -.include "../../devel/lwp/buildlink.mk" +.include "../../devel/lwp/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/rvm/PLIST b/devel/rvm/PLIST index 8f458615416..575ae88ab61 100644 --- a/devel/rvm/PLIST +++ b/devel/rvm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/20 19:28:14 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:49 jlam Exp $ include/rvm/rds.h include/rvm/rvm.h include/rvm/rvm_segment.h diff --git a/devel/rvm/buildlink2.mk b/devel/rvm/buildlink2.mk new file mode 100644 index 00000000000..a01204585ff --- /dev/null +++ b/devel/rvm/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:49 jlam Exp $ + +.if !defined(RVM_BUILDLINK2_MK) +RVM_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= rvm +BUILDLINK_DEPENDS.rvm?= rvm>=1.3 +BUILDLINK_PKGSRCDIR.rvm?= ../../devel/rvm + +EVAL_PREFIX+= BUILDLINK_PREFIX.rvm=rvm +BUILDLINK_PREFIX.rvm_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.rvm= include/rvm/* +BUILDLINK_FILES.rvm+= lib/librds.* +BUILDLINK_FILES.rvm+= lib/librdslwp.* +BUILDLINK_FILES.rvm+= lib/librvm.* +BUILDLINK_FILES.rvm+= lib/librvmlwp.* +BUILDLINK_FILES.rvm+= lib/libseg.* + +.include "../../devel/lwp/buildlink2.mk" + +BUILDLINK_TARGETS+= rvm-buildlink + +rvm-buildlink: _BUILDLINK_USE + +.endif # RVM_BUILDLINK2_MK diff --git a/devel/rvm/distinfo b/devel/rvm/distinfo index dbb0e196ebb..13a7e868a61 100644 --- a/devel/rvm/distinfo +++ b/devel/rvm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/07/03 10:59:47 jdolecek Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 18:38:50 jlam Exp $ SHA1 (rvm-1.6.tar.gz) = d6b27b37601d5d1666f3956feb6582c3cb6b1d99 Size (rvm-1.6.tar.gz) = 374944 bytes diff --git a/devel/rvm/patches/patch-aa b/devel/rvm/patches/patch-aa index a87b914109d..9ffbd1ad29e 100644 --- a/devel/rvm/patches/patch-aa +++ b/devel/rvm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2002/06/20 19:28:15 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/25 18:38:50 jlam Exp $ --- rvm/Makefile.in.orig Tue Jun 12 12:24:35 2001 +++ rvm/Makefile.in diff --git a/devel/rvm/patches/patch-ab b/devel/rvm/patches/patch-ab index c23c3cc46db..a37084a2fe1 100644 --- a/devel/rvm/patches/patch-ab +++ b/devel/rvm/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2002/07/03 10:59:48 jdolecek Exp $ +$NetBSD: patch-ab,v 1.2 2002/08/25 18:38:51 jlam Exp $ --- rvm/rvm_utils.c.orig Wed Jul 3 12:39:26 2002 +++ rvm/rvm_utils.c Wed Jul 3 12:40:30 2002 diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile index 36f003ab084..74a15eb8e65 100644 --- a/devel/zlib/Makefile +++ b/devel/zlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/08/07 13:25:36 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 18:38:51 jlam Exp $ DISTNAME= zlib-1.1.4 CATEGORIES= devel @@ -13,13 +13,15 @@ COMMENT= General purpose data compression library BUILD_DEPENDS+= libtool-base>=${LIBTOOL_VERSION}:../../devel/libtool-base +USE_BUILDLINK2= # defined NOT_FOR_PLATFORM= NetBSD-1.[4-9]*-* # in base NetBSD system # To avoid circular dependences we must not use "USE_LIBTOOL" but # depend on the "libtool-base" package manually. +# LIBTOOL= ${LOCALBASE}/bin/libtool -CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" -MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" +CONFIGURE_ENV+= LIBTOOL="${BUILDLINK_LIBTOOL} ${LIBTOOL_FLAGS}" +MAKE_ENV+= LIBTOOL="${BUILDLINK_LIBTOOL} ${LIBTOOL_FLAGS}" MAKEFILE= lt.mk post-extract: diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk index 3c8a1a08588..11fb9328b50 100644 --- a/devel/zlib/buildlink.mk +++ b/devel/zlib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2002/08/07 13:25:37 wiz Exp $ +# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:38:51 jlam Exp $ # # This Makefile fragment is included by packages that use zlib. # diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk new file mode 100644 index 00000000000..1f952241cbe --- /dev/null +++ b/devel/zlib/buildlink2.mk @@ -0,0 +1,59 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:52 jlam Exp $ + +.if !defined(ZLIB_BUILDLINK2_MK) +ZLIB_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.zlib?= zlib>=1.1.3 +BUILDLINK_PKGSRCDIR.zlib?= ../../devel/zlib + +.if defined(USE_ZLIB) +_NEED_ZLIB= YES +.else +. if exists(/usr/include/zlib.h) +_NEED_ZLIB= NO +. else +_NEED_ZLIB= YES +. endif +# +# Solaris has a broken (for the purposes of pkgsrc) version of zlib. +# +_INCOMPAT_ZLIB= SunOS-*-* + +# +# Some NetBSD versions shipped with versions lower than 1.1.3. +# +_INCOMPAT_ZLIB+= NetBSD-0.*-* NetBSD-1.[012]*-* +_INCOMPAT_ZLIB+= NetBSD-1.3-* NetBSD-1.3.*-* NetBSD-1.3[A-H]-* + +INCOMPAT_ZLIB?= # empty +. for _pattern_ in ${_INCOMPAT_ZLIB} ${INCOMPAT_ZLIB} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +_NEED_ZLIB= YES +. endif +. endfor +.endif + +.if ${_NEED_ZLIB} == "YES" +BUILDLINK_PACKAGES+= zlib +EVAL_PREFIX+= BUILDLINK_PREFIX.zlib=zlib +BUILDLINK_PREFIX.zlib_DEFAULT= ${LOCALBASE} +.else +BUILDLINK_PREFIX.zlib= /usr +.endif + +BUILDLINK_FILES.zlib= include/zconf.h +BUILDLINK_FILES.zlib+= include/zlib.h +BUILDLINK_FILES.zlib+= lib/libz.* + +BUILDLINK_TARGETS+= zlib-buildlink + +.if ${_NEED_ZLIB} == "NO" +LIBTOOL_ARCHIVE_UNTRANSFORM_SED+= \ + -e "s|${LOCALBASE}/lib/libz.la|-L${BUILDLINK_PREFIX.zlib}/lib -lz|g" +.endif + +zlib-buildlink: _BUILDLINK_USE + +.endif # ZLIB_BUILDLINK2_MK diff --git a/editors/sam/Makefile b/editors/sam/Makefile index 86714f168ce..2e485d5c542 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/11/29 01:12:32 hubertf Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 18:38:52 jlam Exp $ # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp # @@ -18,6 +18,7 @@ WRKSRC= ${WRKDIR} EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} MANCOMPRESSED= yes +USE_BUILDLINK2= yes USE_X11BASE= yes MAKE_ENV+= X11PREFIX=${X11PREFIX} @@ -31,7 +32,7 @@ OTHER_X_LIBS= -lSM -lICE do-build: for d in libXg libframe sam samterm; do \ - (cd ${WRKSRC}/$$d; make -f Make.solaris \ + (cd ${WRKSRC}/$$d; ${MAKE_PROGRAM} -f Make.solaris \ OTHER_X_LIBS="${OTHER_X_LIBS}"); \ done .endif # SunOS diff --git a/editors/sam/buildlink2.mk b/editors/sam/buildlink2.mk new file mode 100644 index 00000000000..bc4f7ffb9d4 --- /dev/null +++ b/editors/sam/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:53 jlam Exp $ + +.if !defined(SAM_BUILDLINK2_MK) +SAM_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= sam +BUILDLINK_DEPENDS.sam?= sam>=4.3nb1 +BUILDLINK_PKGSRCDIR.sam?= ../../editors/sam + +# This adds a build-dependency as sam only has static libraries. +BUILDLINK_DEPMETHOD.sam?= build + +EVAL_PREFIX+= BUILDLINK_PREFIX.sam=sam +BUILDLINK_PREFIX.sam_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.sam= include/sam/* +BUILDLINK_FILES.sam+= lib/libXg.a +BUILDLINK_FILES.sam+= lib/libframe.a + +BUILDLINK_TARGETS+= sam-buildlink + +sam-buildlink: _BUILDLINK_USE + +.endif # SAM_BUILDLINK2_MK diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile index b0feedb5c44..7a0474d8fe1 100644 --- a/fonts/Xg/Makefile +++ b/fonts/Xg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/11/18 19:17:05 dillo Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 18:38:54 jlam Exp $ # FreeBSD Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp # @@ -11,6 +11,7 @@ MAINTAINER= packages@netbsd.org COMMENT= These are the UNICODE fonts for use with 9term and sam WRKSRC= ${WRKDIR} +USE_BUILDLINK2= yes USE_X11BASE= yes .include "../../mk/bsd.pkg.mk" 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 diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index de4720800f4..8fb2b63eeb7 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2002/01/30 22:34:15 jlam Exp $ +# $NetBSD: Makefile,v 1.56 2002/08/25 18:39:26 jlam Exp $ .include "../../lang/perl5/Makefile.common" @@ -15,6 +15,7 @@ CONFLICTS= perl-5.00* perl-base-[0-9]* \ p5-Devel-DProf-[0-9]* p5-Devel-Peek-[0-9]* \ perl-mk-[0-9]* +USE_BUILDLINK2= # defined HAS_CONFIGURE= # defined CONFIGURE_SCRIPT= ./Configure CONFIGURE_ARGS+= -sde @@ -22,7 +23,7 @@ CONFIGURE_ARGS+= -Dprefix="${PREFIX}" CONFIGURE_ARGS+= -Dscriptdir="${PREFIX}/bin" CONFIGURE_ARGS+= -Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}" CONFIGURE_ARGS+= -Doptimize="${CFLAGS}" -CONFIGURE_ARGS+= -Dcc="${CC}" +CONFIGURE_ARGS+= -Dcc="${CC:T}" CONFIGURE_ARGS+= -Uusemymalloc CONFIGURE_ARGS+= -Uinstallusrbinperl diff --git a/lang/perl5/buildlink.mk b/lang/perl5/buildlink.mk index 208ace74167..54f2cc3f22d 100644 --- a/lang/perl5/buildlink.mk +++ b/lang/perl5/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.11 2002/07/24 19:43:10 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.12 2002/08/25 18:39:27 jlam Exp $ # # This Makefile fragment is included by packages that use perl. # diff --git a/lang/perl5/buildlink2.mk b/lang/perl5/buildlink2.mk new file mode 100644 index 00000000000..61768d56a39 --- /dev/null +++ b/lang/perl5/buildlink2.mk @@ -0,0 +1,27 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:27 jlam Exp $ + +.if !defined(PERL5_BUILDLINK2_MK) +PERL5_BUILDLINK2_MK= # defined + +USE_PERL5= # defined + +.include "../../mk/bsd.prefs.mk" + +PERL5_REQD?= 5.0 +BUILDLINK_PACKAGES+= perl +BUILDLINK_DEPENDS.perl?= perl>=${PERL5_REQD} +BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5 + +EVAL_PREFIX+= BUILDLINK_PREFIX.perl=perl +BUILDLINK_PREFIX.perl_DEFAULT= ${LOCALBASE} +PERL5?= ${BUILDLINK_PREFIX.perl}/bin/perl + +BUILDLINK_FILES.perl= \ + ${PERL5_ARCHLIB:S/^${BUILDLINK_PREFIX.perl}\///}/CORE/* \ + ${PERL5_ARCHLIB:S/^${BUILDLINK_PREFIX.perl}\///}/auto/DynaLoader/DynaLoader.a + +BUILDLINK_TARGETS+= perl-buildlink + +perl-buildlink: _BUILDLINK_USE + +.endif # PERL5_BUILDLINK2_MK diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 24c55fd9bfc..ad43e09db87 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/03/20 18:04:04 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2002/08/25 18:39:28 jlam Exp $ # DISTNAME= tcl8.3.4 @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes MAKE_ENV+= TOUCH="${TOUCH}" -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_LIBTOOL= yes INSTALL_TARGET= install diff --git a/lang/tcl/buildlink2.mk b/lang/tcl/buildlink2.mk new file mode 100644 index 00000000000..47b3c3591d2 --- /dev/null +++ b/lang/tcl/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:28 jlam Exp $ + +.if !defined(TCL_BUILDLINK2_MK) +TCL_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= tcl +BUILDLINK_DEPENDS.tcl?= tcl>=8.3.4 +BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl + +EVAL_PREFIX+= BUILDLINK_PREFIX.tcl=tcl +BUILDLINK_PREFIX.tcl_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.tcl= include/tcl.h +BUILDLINK_FILES.tcl+= include/tclDecls.h +BUILDLINK_FILES.tcl+= include/tclPlatDecls.h +BUILDLINK_FILES.tcl+= include/tcl/*/*.h +BUILDLINK_FILES.tcl+= lib/libtcl83.* +BUILDLINK_FILES.tcl+= lib/libtclstub83.* + +BUILDLINK_TARGETS+= tcl-buildlink + +tcl-buildlink: _BUILDLINK_USE + +.endif # TCL_BUILDLINK2_MK diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 73735b4ccf4..668e45e1aba 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/04/04 19:56:37 jdolecek Exp $ +# $NetBSD: Makefile,v 1.34 2002/08/25 18:39:29 jlam Exp $ # DISTNAME= rpm-2.5.4 @@ -16,7 +16,7 @@ CONFLICTS+= rpm2cpio<1.0nb1 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL @@ -26,7 +26,7 @@ FILES_SUBST+= MKDIR=${MKDIR:Q} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} post-configure: - cd ${WRKSRC}/po && ( mv cz.mo cs.mo; mv cz.po cs.po ) + cd ${WRKSRC}/po && ( ${MV} cz.mo cs.mo; ${MV} cz.po cs.po ) pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/rpm @@ -36,6 +36,6 @@ pre-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/rpm/buildlink2.mk b/misc/rpm/buildlink2.mk new file mode 100644 index 00000000000..4bf6cf66d3c --- /dev/null +++ b/misc/rpm/buildlink2.mk @@ -0,0 +1,24 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:29 jlam Exp $ + +.if !defined(RPM_BUILDLINK2_MK) +RPM_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= rpm +BUILDLINK_DEPENDS.rpm?= rpm>=2.4.3 +BUILDLINK_PKGSRCDIR.rpm?= ../../misc/rpm + +# This adds a build-dependency as rpm only has a static library. +BUILDLINK_DEPMETHOD.rpm?= build + +EVAL_PREFIX+= BUILDLINK_PREFIX.rpm=rpm +BUILDLINK_PREFIX.rpm_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.rpm= include/rpm/* +BUILDLINK_FILES.rpm+= lib/librpm.a + +.include "../../devel/gettext-lib/buildlink2.mk" + +BUILDLINK_TARGETS+= rpm-buildlink + +rpm-buildlink: _BUILDLINK_USE + +.endif # RPM_BUILDLINK2_MK diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 804ca8c2992..dfc48b9f672 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2002/07/18 02:19:24 rh Exp $ +# $NetBSD: Makefile,v 1.78 2002/08/25 18:39:30 jlam Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} @@ -11,7 +11,6 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= high-performance CORBA ORB with support for the C language DEPENDS+= gindent-[0-9]*:../../devel/gindent - BUILD_DEPENDS+= automake>=1.4:../../devel/automake USE_GMAKE= YES @@ -21,7 +20,7 @@ LIBTOOL_OVERRIDE+= ${WRKSRC}/popt/libtool LIBTOOL_OVERRIDE+= ${WRKSRC}/libIDL/libtool GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 @@ -34,8 +33,9 @@ INFO_FILES= libIDL.info AUTOMAKE_OVERRIDE= NO # Otherwise breaks 1.5 arm32 -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/glib/buildlink.mk" -.include "../../security/tcp_wrappers/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib/buildlink2.mk" +.include "../../security/tcp_wrappers/buildlink2.mk" + .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ORBit/buildlink2.mk b/net/ORBit/buildlink2.mk new file mode 100644 index 00000000000..efa78030933 --- /dev/null +++ b/net/ORBit/buildlink2.mk @@ -0,0 +1,38 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:30 jlam Exp $ + +.if !defined(ORBIT_BUILDLINK2_MK) +ORBIT_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= ORBit +BUILDLINK_DEPENDS.ORBit?= ORBit>=0.5.12 +BUILDLINK_PKGSRCDIR.ORBit?= ../../net/ORBit + +EVAL_PREFIX+= BUILDLINK_PREFIX.ORBit=ORBit +BUILDLINK_PREFIX.ORBit_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.ORBit+= include/libIDL-1.0/libIDL/* +BUILDLINK_FILES.ORBit+= include/orbit-1.0/IIOP/* +BUILDLINK_FILES.ORBit+= include/orbit-1.0/ORBitservices/* +BUILDLINK_FILES.ORBit+= include/orbit-1.0/ORBitutil/* +BUILDLINK_FILES.ORBit+= include/orbit-1.0/orb/* +BUILDLINK_FILES.ORBit+= include/orbit-1.0/orbit-idl2.h +BUILDLINK_FILES.ORBit+= lib/libIDLConf.sh +BUILDLINK_FILES.ORBit+= lib/libIDL.* +BUILDLINK_FILES.ORBit+= lib/libIIOP.* +BUILDLINK_FILES.ORBit+= lib/libORBit.* +BUILDLINK_FILES.ORBit+= lib/libORBitCosNaming.* +BUILDLINK_FILES.ORBit+= lib/libORBitutil.* +BUILDLINK_FILES.ORBit+= lib/libname-server.* +BUILDLINK_FILES.ORBit+= lib/liborbit-c-backend.* + +# The ORBit headers should be found at the same location as for libxml. +#BUILDLINK_TRANSFORM.ORBit= -e "s|/include/orbit-1.0/|/include/|g" + +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib/buildlink2.mk" +.include "../../security/tcp_wrappers/buildlink2.mk" + +BUILDLINK_TARGETS+= ORBit-buildlink + +ORBit-buildlink: _BUILDLINK_USE + +.endif # ORBIT_BUILDLINK2_MK diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo index 8b293f28a50..7343fb73e27 100644 --- a/net/ORBit/distinfo +++ b/net/ORBit/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.11 2002/07/18 02:19:24 rh Exp $ +$NetBSD: distinfo,v 1.12 2002/08/25 18:39:31 jlam Exp $ SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038 Size (ORBit-0.5.15.tar.gz) = 1335272 bytes SHA1 (patch-aa) = ef745d3d279d57dbdf6380053b6b4a7e63322671 SHA1 (patch-ab) = c2b7cc5f83230035c214600bff59d4dfefd92422 -SHA1 (patch-ac) = cd1f6d8848ad11927717574dada0b164713aab23 +SHA1 (patch-ac) = cc073ac41f69671fe10be3975cb0753e163a10dd SHA1 (patch-ad) = 688920ba423aa2994d9e2e6540f8738305cb7fd9 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb SHA1 (patch-af) = b88b26b8fe7d42f267c6761edc3e3b8250bd14fb diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac index ef46f983672..cce201f4f1f 100644 --- a/net/ORBit/patches/patch-ac +++ b/net/ORBit/patches/patch-ac @@ -1,19 +1,7 @@ -$NetBSD: patch-ac,v 1.10 2002/04/25 12:17:05 agc Exp $ +$NetBSD: patch-ac,v 1.11 2002/08/25 18:39:31 jlam Exp $ --- configure.orig Wed Mar 20 14:45:48 2002 +++ configure Thu Apr 25 12:42:56 2002 -@@ -7189,9 +7189,9 @@ - - rm -f conf.glibtest - --GMODULE_CFLAGS=`glib-config --cflags gmodule` -+GMODULE_CFLAGS=`$GLIB_CONFIG --cflags gmodule` - --GMODULE_LIBS=`glib-config --libs gmodule` -+GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule` - - for ac_prog in 'bison -y' byacc - do @@ -8636,6 +8636,10 @@ THEFILE="`echo $I | sed -e 's,^-L,,'`" echo "From $I, checking in dir $THEFILE for libwrap.so" 1>&5 diff --git a/net/ORBit/patches/patch-ah b/net/ORBit/patches/patch-ah index 052cb071845..790a964b9d9 100644 --- a/net/ORBit/patches/patch-ah +++ b/net/ORBit/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.6 2002/07/18 02:19:25 rh Exp $ +$NetBSD: patch-ah,v 1.7 2002/08/25 18:39:32 jlam Exp $ --- ORBit.pc.in.orig Sat Sep 30 12:09:43 2000 +++ ORBit.pc.in diff --git a/net/ORBit/patches/patch-aj b/net/ORBit/patches/patch-aj index a95f81fdab0..b6d1608c4e8 100644 --- a/net/ORBit/patches/patch-aj +++ b/net/ORBit/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.8 2002/07/18 02:19:25 rh Exp $ +$NetBSD: patch-aj,v 1.9 2002/08/25 18:39:32 jlam Exp $ --- libIDL/libIDL.pc.in.orig Sat Sep 30 12:09:43 2000 +++ libIDL/libIDL.pc.in diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile index 18a057d9c36..5806b1f664f 100644 --- a/net/hesiod/Makefile +++ b/net/hesiod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/11/29 13:34:35 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 18:39:32 jlam Exp $ DISTNAME= hesiod-3.0.2 CATEGORIES= net @@ -7,14 +7,13 @@ MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/ MAINTAINER= kpneal@pobox.org COMMENT= Hesiod network database client and library -USE_BUILDLINK_ONLY= YES - .include "../../mk/bsd.prefs.mk" .if exists(/usr/include/hesiod.h) && !defined(USE_HESIOD) IGNORE= "${PKGNAME} is part of your ${OPSYS} distribution" .endif +USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/net/hesiod/buildlink2.mk b/net/hesiod/buildlink2.mk new file mode 100644 index 00000000000..15dff9b311a --- /dev/null +++ b/net/hesiod/buildlink2.mk @@ -0,0 +1,37 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:32 jlam Exp $ + +.if !defined(HESIOD_BUILDLINK2_MK) +HESIOD_BUILDLINK2_MK= # defined + +BUILDLINK_DEPENDS.hesiod?= hesiod>=3.0.2 +BUILDLINK_PKGSRCDIR.hesiod?= ../../net/hesiod + +.if defined(USE_HESIOD) +_NEED_HESIOD= YES +.else +. if exists(/usr/include/hesiod.h) +_NEED_HESIOD= NO +. else +_NEED_HESIOD= YES +. endif +.endif + +.if ${_NEED_HESIOD} == "YES" +BUILDLINK_PACKAGES+= hesiod +EVAL_PREFIX+= BUILDLINK_PREFIX.hesiod=hesiod +BUILDLINK_PREFIX.hesiod_DEFAULT= ${LOCALBASE} +.else +BUILDLINK_PREFIX.hesiod= /usr +.endif + +BUILDLINK_FILES.hesiod= include/hesiod.h +# +# if lib/libhesiod.* does not exists assume hesiod service is included in libc +# +BUILDLINK_FILES.hesiod+= lib/libhesiod.* + +BUILDLINK_TARGETS+= hesiod-buildlink + +hesiod-buildlink: _BUILDLINK_USE + +.endif # HESIOD_BUILDLINK2_MK diff --git a/net/net-snmp-current/Makefile b/net/net-snmp-current/Makefile index 16eb07ba2b7..c619ce637ad 100644 --- a/net/net-snmp-current/Makefile +++ b/net/net-snmp-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/17 10:37:45 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 18:39:33 jlam Exp $ DISTNAME= net-snmp-5.0.pre2 PKGNAME= net-snmp-5.0.0.2 @@ -18,55 +18,68 @@ BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= +USE_BUILDLINK2= yes .include "../../mk/bsd.prefs.mk" -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -#CPPFLAGS+= -I${BUILDLINK_DIR}/include -#LDFLAGS+= -L${BUILDLINK_DIR}/lib - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-defaults --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} --with-logfile="/var/log/snmpd" +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-defaults +CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} +CONFIGURE_ARGS+= --with-logfile="/var/log/snmpd" +# # smux/host do not compile -#CONFIGURE_ARGS+=--with-mib-modules="smux host" +# +#CONFIGURE_ARGS+= --with-mib-modules="smux host" +# # NOTE: if you do not allow dummy values some tools such as # scotty/tkined may ignore results when they shouldn't. -CONFIGURE_ARGS+=--with-dummy-values +# +CONFIGURE_ARGS+= --with-dummy-values +# # NOTE: without this the default is USER@DOMAINNAME of the package builder -CONFIGURE_ARGS+=--with-sys-contact="default_user@contact.domain" -CONFIGURE_ARGS+=--with-sys-location="defaultlocation" -CONFIGURE_ARGS+=--enable-shared +# +CONFIGURE_ARGS+= --with-sys-contact="default_user@contact.domain" +CONFIGURE_ARGS+= --with-sys-location="defaultlocation" +CONFIGURE_ARGS+= --enable-shared .if defined(USE_INET6) && ${USE_INET6} == "YES" -CONFIGURE_ARGS+=--enable-ipv6 +CONFIGURE_ARGS+= --enable-ipv6 .else -CONFIGURE_ARGS+=--disable-ipv6 +CONFIGURE_ARGS+= --disable-ipv6 +.endif + +.if (${OPSYS} == "NetBSD") +CFLAGS+= -Dnetbsd1 .endif # this might make it easier to use scotty's mibs, and local ones too -CONFIGURE_ARGS+=--with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs" +CONFIGURE_ARGS+= --with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs" # deal with libwrap bogosity by providing these variables to programs which # do not supply them: post-extract: - @${ECHO} 'int allow_severity, deny_severity;' >${WRKSRC}/snmplib/libwrap.c + @${ECHO} 'int allow_severity, deny_severity;' \ + > ${WRKSRC}/snmplib/libwrap.c pre-configure: -.if (${OPSYS} == NetBSD && \ - ${LOWER_ARCH} == i386 && \ - ${OS_VERSION:M1.5.[123]*} != "") +.if (${OPSYS} == NetBSD) +. if (${LOWER_ARCH} == i386 && ${OS_VERSION:M1.5.[123]*} != "") ${MKDIR} ${BUILDLINK_DIR}/include/sys ${LN} -s ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys +. endif .endif - (cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf) -.if ${OPSYS} == SunOS + cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf +# # Adapt for the fact that the default I've seen of ac_max_sed_cmds=90 -#will not work w/ built-in sed on Solaris. - (cd ${WRKSRC} && ${SED} \ - 's/ac_max_sed_cmds=[0-9][0-9]*/ac_max_sed_cmds=10/' \ - configure > tmp && cp tmp configure && rm tmp) +# will not work w/ built-in sed on Solaris. +# +.if ${OPSYS} == SunOS + cd ${WRKSRC}; \ + ${SED} 's/ac_max_sed_cmds=[0-9][0-9]*/ac_max_sed_cmds=10/' \ + ${CONFIGURE_SCRIPT} > ${CONFIGURE_SCRIPTS}.fixed; \ + ${MV} ${CONFIGURE_SCRIPT}.fixed ${CONFIGURE_SCRIPTS} .endif post-build: @@ -74,8 +87,8 @@ post-build: ${SED} 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/snmptrapd.sh > ${WRKDIR}/snmptrapd pre-install: - (cd ${WRKSRC}/apps/.libs; ln -sf snmptrap snmpinform) - ${MKDIR} ${PREFIX}/share/snmp + cd ${WRKSRC}/apps/.libs; ${LN} -sf snmptrap snmpinform + ${INSTALL_DATA_DIR} ${PREFIX}/share/snmp post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ucd-snmp @@ -84,11 +97,7 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/snmpd ${PREFIX}/etc/rc.d ${INSTALL_SCRIPT} ${WRKDIR}/snmptrapd ${PREFIX}/etc/rc.d -.if (${OPSYS} == "NetBSD") -CFLAGS+= -Dnetbsd1 -.endif - -.include "../../security/openssl/buildlink.mk" -.include "../../security/tcp_wrappers/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../security/tcp_wrappers/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/net-snmp-current/PLIST b/net/net-snmp-current/PLIST index b95513acb71..22f5433c2c2 100644 --- a/net/net-snmp-current/PLIST +++ b/net/net-snmp-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/26 10:29:52 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:33 jlam Exp $ bin/encode_keychange bin/fixproc bin/ipf-mod.pl diff --git a/net/net-snmp-current/buildlink2.mk b/net/net-snmp-current/buildlink2.mk new file mode 100644 index 00000000000..fd027ca2d28 --- /dev/null +++ b/net/net-snmp-current/buildlink2.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:34 jlam Exp $ + +.if !defined(NET_SNMP_BUILDLINK2_MK) +NET_SNMP_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= net-snmp +BUILDLINK_DEPENDS.net-snmp?= net-snmp>=5.0.0.2 +BUILDLINK_PKGSRCDIR.net-snmp?= ../../net/net-snmp + +EVAL_PREFIX+= BUILDLINK_PREFIX.net-snmp=net-snmp +BUILDLINK_PREFIX.net-snmp_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.net-snmp= include/net-snmp/* +BUILDLINK_FILES.net-snmp+= include/ucd-snmp/* +BUILDLINK_FILES.net-snmp+= lib/libnetsnmp* + +BUILDLINK_TARGETS+= net-snmp-buildlink + +net-snmp-buildlink: _BUILDLINK_USE + +.endif # NET_SNMP_BUILDLINK2_MK diff --git a/net/openslp/Makefile b/net/openslp/Makefile index f42e4989788..4c10278cf3a 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/03/15 04:12:19 markd Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 18:39:35 jlam Exp $ DISTNAME= openslp-1.0.7 CATEGORIES= net @@ -8,7 +8,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.openslp.org/ COMMENT= Open-source implementation of the Service Location Protocol -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --localstatedir=/var diff --git a/net/openslp/buildlink2.mk b/net/openslp/buildlink2.mk new file mode 100644 index 00000000000..faf3cdee399 --- /dev/null +++ b/net/openslp/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:35 jlam Exp $ + +.if !defined(OPENSLP_BUILDLINK2_MK) +OPENSLP_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= openslp +BUILDLINK_DEPENDS.openslp?= openslp>=1.0.1 +BUILDLINK_PKGSRCDIR.openslp?= ../../net/openslp + +EVAL_PREFIX+= BUILDLINK_PREFIX.openslp=openslp +BUILDLINK_PREFIX.openslp_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.openslp= include/slp.h +BUILDLINK_FILES.openslp+= lib/libslp.* + +BUILDLINK_TARGETS+= openslp-buildlink + +openslp-buildlink: _BUILDLINK_USE + +.endif # OPENSLP_BUILDLINK2_MK diff --git a/net/socks4/Makefile b/net/socks4/Makefile index 3cef4e01a98..09542be5892 100644 --- a/net/socks4/Makefile +++ b/net/socks4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:32 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 18:39:35 jlam Exp $ # DISTNAME= export.socks.cstc.4.2.2 @@ -17,7 +17,7 @@ RESTRICTED= "no commercial use" NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined MAKE_ENV+= OPTIMIZE="${CFLAGS}" post-patch: diff --git a/net/socks4/buildlink.mk b/net/socks4/buildlink.mk index 1addf6ffb30..001ff9da884 100644 --- a/net/socks4/buildlink.mk +++ b/net/socks4/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.10 2002/05/25 20:01:19 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.11 2002/08/25 18:39:35 jlam Exp $ # # This Makefile fragment is included by packages that use socks4. # diff --git a/net/socks4/buildlink2.mk b/net/socks4/buildlink2.mk new file mode 100644 index 00000000000..2763376878f --- /dev/null +++ b/net/socks4/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:36 jlam Exp $ + +.if !defined(SOCKS4_BUILDLINK2_MK) +SOCKS4_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= socks4 +BUILDLINK_DEPENDS.socks4?= socks4>=2.2 +BUILDLINK_PKGSRCDIR.socks4?= ../../net/socks4 + +EVAL_PREFIX+= BUILDLINK_PREFIX.socks4=socks4 +BUILDLINK_PREFIX.socks4_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.socks4= lib/libsocks4.* +BUILDLINK_TRANSFORM+= l:socks:socks4 + +BUILDLINK_TARGETS+= socks4-buildlink + +socks4-buildlink: _BUILDLINK_USE + +.endif # SOCKS4_BUILDLINK2_MK diff --git a/net/socks5/Makefile b/net/socks5/Makefile index 2de725ebd10..e2735bb1c31 100644 --- a/net/socks5/Makefile +++ b/net/socks5/Makefile @@ -1,4 +1,5 @@ -# $NetBSD: Makefile,v 1.23 2002/07/02 14:36:43 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2002/08/25 18:39:37 jlam Exp $ +# FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp # DISTNAME= socks5-v1_0r2 @@ -26,7 +27,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} # --with-syslog-facility=LOG_AUTH \ # --with-passwd -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libconffile=${PREFIX}/etc/libsocks5.conf \ --with-srvconffile=${PREFIX}/etc/socks5.conf \ diff --git a/net/socks5/buildlink.mk b/net/socks5/buildlink.mk index 232e8c23535..91e821b6ef4 100644 --- a/net/socks5/buildlink.mk +++ b/net/socks5/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2002/05/25 20:01:19 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.6 2002/08/25 18:39:37 jlam Exp $ # # This Makefile fragment is included by packages that use socks5. # diff --git a/net/socks5/buildlink2.mk b/net/socks5/buildlink2.mk new file mode 100644 index 00000000000..7977ae64f9a --- /dev/null +++ b/net/socks5/buildlink2.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:38 jlam Exp $ + +.if !defined(SOCKS5_BUILDLINK2_MK) +SOCKS5_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= socks5 +BUILDLINK_DEPENDS.socks5?= socks5>=1.0.2 +BUILDLINK_PKGSRCDIR.socks5?= ../../net/socks5 + +EVAL_PREFIX+= BUILDLINK_PREFIX.socks5=socks5 +BUILDLINK_PREFIX.socks5_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.socks5= include/socks.h +BUILDLINK_FILES.socks5+= lib/libsocks5.a +BUILDLINK_FILES.socks5+= lib/libsocks5_sh.* + +BUILDLINK_TARGETS+= socks5-buildlink + +socks5-buildlink: _BUILDLINK_USE + +.endif # SOCKS5_BUILDLINK2_MK diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile index 17303f10867..a3856aa50ba 100644 --- a/net/ucd-snmp/Makefile +++ b/net/ucd-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2002/06/17 10:34:38 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2002/08/25 18:39:39 jlam Exp $ DISTNAME= ucd-snmp-4.2.4 CATEGORIES= net @@ -17,61 +17,72 @@ BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= +USE_BUILDLINK2= # defined .include "../../mk/bsd.prefs.mk" -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -#CPPFLAGS+= -I${BUILDLINK_DIR}/include -#LDFLAGS+= -L${BUILDLINK_DIR}/lib - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-defaults --with-logfile="/var/log/snmpd" -CONFIGURE_ARGS+=--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} -CONFIGURE_ARGS+=--with-mib-modules="smux host" +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-defaults +CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} +CONFIGURE_ARGS+= --with-logfile="/var/log/snmpd" +CONFIGURE_ARGS+= --with-mib-modules="smux host" +# # NOTE: if you do not allow dummy values some tools such as # scotty/tkined may ignore results when they shouldn't. -CONFIGURE_ARGS+=--with-dummy-values +# +CONFIGURE_ARGS+= --with-dummy-values +# # NOTE: without this the default is USER@DOMAINNAME of the package builder -CONFIGURE_ARGS+=--with-sys-contact="default_user@contact.domain" -CONFIGURE_ARGS+=--with-sys-location="defaultlocation" -CONFIGURE_ARGS+=--enable-shared +# +CONFIGURE_ARGS+= --with-sys-contact="default_user@contact.domain" +CONFIGURE_ARGS+= --with-sys-location="defaultlocation" +CONFIGURE_ARGS+= --enable-shared .if defined(USE_INET6) && ${USE_INET6} == "YES" CONFIGURE_ARGS+=--enable-ipv6 .else CONFIGURE_ARGS+=--disable-ipv6 .endif -# this might make it easier to use scotty's mibs, and local ones too -CONFIGURE_ARGS+=--with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs" +# This might make it easier to use scotty's MIBs and local MIBs. +CONFIGURE_ARGS+= --with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs" + +.if (${OPSYS} == "NetBSD") +CFLAGS+= -Dnetbsd1 +.endif -# deal with libwrap bogosity by providing these variables to programs which -# do not supply them: +# Deal with libwrap bogosity by providing these variables to programs which +# do not supply them. +# post-extract: - @${ECHO} 'int allow_severity, deny_severity;' >${WRKSRC}/snmplib/libwrap.c + @${ECHO} 'int allow_severity, deny_severity;' \ + > ${WRKSRC}/snmplib/libwrap.c @${LN} ${WRKSRC}/s/netbsd.h ${WRKSRC}/s/netbsdelf.h pre-configure: .if (${OPSYS} == NetBSD) - if [ -f /usr/include/uvm/uvm_param.h ]; then \ - cd ${BUILDLINK_DIR}/include; \ - ${MKDIR} vm; \ - ${LN} -s /usr/include/uvm/uvm_param.h vm/vm_param.h; \ + if [ -f /usr/include/uvm/uvm_param.h ]; then \ + cd ${BUILDLINK_DIR}/include; \ + ${MKDIR} vm; \ + ${LN} -s /usr/include/uvm/uvm_param.h vm/vm_param.h; \ fi -.if (${LOWER_ARCH} == i386 && ${OS_VERSION:M1.5.[123]*} != "") +. if (${LOWER_ARCH} == i386 && ${OS_VERSION:M1.5.[123]*} != "") ${MKDIR} ${BUILDLINK_DIR}/include/sys ${LN} -s ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys +. endif .endif -.endif - (cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf) -.if ${OPSYS} == SunOS + cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf +# # Adapt for the fact that the default I've seen of ac_max_sed_cmds=90 -#will not work w/ built-in sed on Solaris. - (cd ${WRKSRC} && ${SED} \ - 's/ac_max_sed_cmds=[0-9][0-9]*/ac_max_sed_cmds=10/' \ - configure > tmp && cp tmp configure && rm tmp) +# will not work w/ built-in sed on Solaris. +# +.if ${OPSYS} == SunOS + cd ${WRKSRC}; \ + ${SED} 's/ac_max_sed_cmds=[0-9][0-9]*/ac_max_sed_cmds=10/' \ + ${CONFIGURE_SCRIPT} > ${CONFIGURE_SCRIPT}.fixed; \ + ${MV} -f ${CONFIGURE_SCRIPT}.orig ${CONFIGURE_SCRIPT} .endif post-build: @@ -85,11 +96,7 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/snmpd ${PREFIX}/etc/rc.d ${INSTALL_SCRIPT} ${WRKDIR}/snmptrapd ${PREFIX}/etc/rc.d -.if (${OPSYS} == "NetBSD") -CFLAGS+= -Dnetbsd1 -.endif - -.include "../../security/openssl/buildlink.mk" -.include "../../security/tcp_wrappers/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../security/tcp_wrappers/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ucd-snmp/PLIST b/net/ucd-snmp/PLIST index 4d56a844cf7..29578681f27 100644 --- a/net/ucd-snmp/PLIST +++ b/net/ucd-snmp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/06/26 10:29:52 seb Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/08/25 18:39:39 jlam Exp $ bin/encode_keychange bin/mib2c bin/snmpbulkget diff --git a/net/ucd-snmp/buildlink2.mk b/net/ucd-snmp/buildlink2.mk new file mode 100644 index 00000000000..cd84642e2c4 --- /dev/null +++ b/net/ucd-snmp/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:40 jlam Exp $ + +.if !defined(UCD_SNMP_BUILDLINK2_MK) +UCD_SNMP_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= ucd-snmp +BUILDLINK_DEPENDS.ucd-snmp?= ucd-snmp-4.2.4* +BUILDLINK_PKGSRCDIR.ucd-snmp?= ../../net/ucd-snmp + +EVAL_PREFIX+= BUILDLINK_PREFIX.ucd-snmp=ucd-snmp +BUILDLINK_PREFIX.ucd-snmp_DEFAULT= ${LOCALBASE} + +BUILDLINK_FILES.ucd-snmp= include/ucd-snmp/* +BUILDLINK_FILES.ucd-snmp+= lib/libsnmp* +BUILDLINK_FILES.ucd-snmp+= lib/libucdagent* +BUILDLINK_FILES.ucd-snmp+= lib/libucdmibs* + +BUILDLINK_TARGETS+= ucd-snmp-buildlink + +ucd-snmp-buildlink: _BUILDLINK_USE + +.endif # UCD_SNMP_BUILDLINK2_MK diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo index fa83d5f5f61..389f5d5e7dc 100644 --- a/net/ucd-snmp/distinfo +++ b/net/ucd-snmp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/05/25 08:04:51 tron Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:39:40 jlam Exp $ SHA1 (ucd-snmp-4.2.4.tar.gz) = b1dbf7c5f6971f1f4419d50630a4b34b82ddc57b Size (ucd-snmp-4.2.4.tar.gz) = 1706471 bytes diff --git a/net/ucd-snmp/patches/patch-ac b/net/ucd-snmp/patches/patch-ac index 8720fead9ee..3423b089ddb 100644 --- a/net/ucd-snmp/patches/patch-ac +++ b/net/ucd-snmp/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.7 2002/05/25 08:04:52 tron Exp $ +$NetBSD: patch-ac,v 1.8 2002/08/25 18:39:41 jlam Exp $ --- agent/mibgroup/ucd_snmp.h.orig Thu Feb 7 16:39:26 2002 +++ agent/mibgroup/ucd_snmp.h Sat May 25 08:36:34 2002 diff --git a/print/cups/Makefile b/print/cups/Makefile index 068f908bd06..66f2964b73f 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2002/07/16 13:14:04 fredb Exp $ +# $NetBSD: Makefile,v 1.50 2002/08/25 18:39:41 jlam Exp $ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} @@ -22,7 +22,7 @@ COMMENT= Common UNIX Printing System CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_GMAKE= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/cups CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} -CONFIGURE_ARGS+= --enable-libtool-unsupported="${LIBTOOL}" +CONFIGURE_ARGS+= --enable-libtool-unsupported="${PKGLIBTOOL}" CONFIGURE_ARGS+= --enable-slp CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}" @@ -40,7 +40,7 @@ CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}" .include "../../mk/bsd.prefs.mk" .if defined(USE_PAM) -.include "../../security/PAM/buildlink.mk" +.include "../../security/PAM/buildlink2.mk" BUILD_DEFS+= USE_PAM CONFIGURE_ARGS+= --enable-pam PLIST_SRC= ${PKGDIR}/PLIST.pam @@ -103,11 +103,12 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/cups.pam ${EGDIR} .endif -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../net/openslp/buildlink.mk" -.include "../../security/openssl/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../net/openslp/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/buildlink2.mk b/print/cups/buildlink2.mk new file mode 100644 index 00000000000..bec7024b546 --- /dev/null +++ b/print/cups/buildlink2.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:42 jlam Exp $ + +.if !defined(CUPS_BUILDLINK2_MK) +CUPS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= cups +BUILDLINK_DEPENDS.cups?= cups>=1.1.14nb1 +BUILDLINK_PKGSRCDIR.cups?= ../../print/cups + +EVAL_PREFIX+= BUILDLINK_PREFIX.cups=cups +BUILDLINK_PREFIX.cups_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.cups= include/cups/* +BUILDLINK_FILES.cups+= lib/libcups.* +BUILDLINK_FILES.cups+= lib/libcupsimage.* + +BUILDLINK_TARGETS+= cups-buildlink + +cups-buildlink: _BUILDLINK_USE + +.endif # CUPS_BUILDLINK2_MK diff --git a/print/cups/distinfo b/print/cups/distinfo index dcc32e8bb93..f279fed1741 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2002/06/09 20:59:34 jlam Exp $ +$NetBSD: distinfo,v 1.15 2002/08/25 18:39:42 jlam Exp $ SHA1 (cups-1.1.14-source.tar.bz2) = b1a940af5f27cebb8bef340aa6a3552c887ad67d Size (cups-1.1.14-source.tar.bz2) = 5408714 bytes diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa index 51d6dc7a737..c2b5f9871dc 100644 --- a/print/cups/patches/patch-aa +++ b/print/cups/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.12 2002/06/09 20:59:35 jlam Exp $ +$NetBSD: patch-aa,v 1.13 2002/08/25 18:39:42 jlam Exp $ --- scheduler/main.c.orig Wed Feb 13 12:21:36 2002 +++ scheduler/main.c diff --git a/print/ja-vflib-lib/Makefile b/print/ja-vflib-lib/Makefile index 73779a8fd79..673920b946c 100644 --- a/print/ja-vflib-lib/Makefile +++ b/print/ja-vflib-lib/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 18:39:43 jlam Exp $ PKGNAME= ja-vflib-lib-${VFLIB_VERSION} COMMENT= Japanese Vector font library -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined .include "Makefile.common" diff --git a/print/ja-vflib-lib/Makefile.common b/print/ja-vflib-lib/Makefile.common index b0c08795a4f..72ce739dfae 100644 --- a/print/ja-vflib-lib/Makefile.common +++ b/print/ja-vflib-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +# $NetBSD: Makefile.common,v 1.2 2002/08/25 18:39:43 jlam Exp $ # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $ DISTNAME= VFlib2-${VFLIB_VERSION} @@ -19,8 +19,8 @@ USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig FT_LIB= ttf -lintl -FT_INCLUDEDIR= ${BUILDLINK_DIR}/include/freetype -FT_LIBDIR= ${BUILDLINK_DIR}/lib +FT_INCLUDEDIR= ${BUILDLINK_PREFIX.freetype}/include/freetype +FT_LIBDIR= ${BUILDLINK_PREFIX.freetype}/lib GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-freetype="${FT_LIB}" @@ -33,4 +33,4 @@ PATCHDIR= ${.CURDIR}/../../print/ja-vflib-lib/patches EXTRACT_ONLY= ${VFLIB_SRC} -.include "../../graphics/freetype-lib/buildlink.mk" +.include "../../graphics/freetype-lib/buildlink2.mk" diff --git a/print/ja-vflib-lib/PLIST b/print/ja-vflib-lib/PLIST index a38b80ae673..a8ce760a024 100644 --- a/print/ja-vflib-lib/PLIST +++ b/print/ja-vflib-lib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/25 18:39:43 jlam Exp $ bin/bdfindex bin/fwindex bin/ttindex diff --git a/print/ja-vflib-lib/buildlink.mk b/print/ja-vflib-lib/buildlink.mk index f4ccdd6e4ec..b731ab733c5 100644 --- a/print/ja-vflib-lib/buildlink.mk +++ b/print/ja-vflib-lib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +# $NetBSD: buildlink.mk,v 1.2 2002/08/25 18:39:44 jlam Exp $ # # This Makefile fragment is included by packages that use VFlib. # diff --git a/print/ja-vflib-lib/buildlink2.mk b/print/ja-vflib-lib/buildlink2.mk new file mode 100644 index 00000000000..95ec8ee6a1c --- /dev/null +++ b/print/ja-vflib-lib/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:44 jlam Exp $ + +.if !defined(VFLIB_BUILDLINK2_MK) +VFLIB_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= vflib +BUILDLINK_DEPENDS.vflib?= ja-vflib-lib>=2.24.2 +BUILDLINK_PKGSRCDIR.vflib?= ../../print/ja-vflib-lib + +EVAL_PREFIX+= BUILDLINK_PREFIX.vflib=ja-vflib-lib +BUILDLINK_PREFIX.vflib_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.vflib= include/VF.h +BUILDLINK_FILES.vflib+= lib/libVFlib2.* + +.include "../../graphics/freetype-lib/buildlink2.mk" + +BUILDLINK_TARGETS+= vflib-buildlink + +vflib-buildlink: _BUILDLINK_USE + +.endif # VFLIB_BUILDLINK2_MK diff --git a/print/ja-vflib-lib/distinfo b/print/ja-vflib-lib/distinfo index b95244aba9e..e40d8a74402 100644 --- a/print/ja-vflib-lib/distinfo +++ b/print/ja-vflib-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +$NetBSD: distinfo,v 1.2 2002/08/25 18:39:45 jlam Exp $ SHA1 (VFlib2-2.24.2.tar.gz) = 970ab8e18e50f10763af27ebcfee135bbfdbcda5 Size (VFlib2-2.24.2.tar.gz) = 540093 bytes diff --git a/print/ja-vflib-lib/patches/patch-aa b/print/ja-vflib-lib/patches/patch-aa index 1b9d5174dc8..141c29024b3 100644 --- a/print/ja-vflib-lib/patches/patch-aa +++ b/print/ja-vflib-lib/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/25 18:39:45 jlam Exp $ --- Makefile.in.orig Mon Sep 14 01:25:04 1998 +++ Makefile.in Mon May 1 04:37:47 2000 diff --git a/print/ja-vflib-lib/patches/patch-ab b/print/ja-vflib-lib/patches/patch-ab index 9d068e595d1..18d2f5ad162 100644 --- a/print/ja-vflib-lib/patches/patch-ab +++ b/print/ja-vflib-lib/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +$NetBSD: patch-ab,v 1.2 2002/08/25 18:39:45 jlam Exp $ --- configure.in.orig Wed Feb 17 23:58:02 1999 +++ configure.in Wed Jul 19 17:36:22 2000 diff --git a/print/ja-vflib-lib/patches/patch-ac b/print/ja-vflib-lib/patches/patch-ac index 6edbf99078a..3909779c542 100644 --- a/print/ja-vflib-lib/patches/patch-ac +++ b/print/ja-vflib-lib/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +$NetBSD: patch-ac,v 1.2 2002/08/25 18:39:45 jlam Exp $ --- src/Makefile.in.orig Tue Oct 27 02:33:17 1998 +++ src/Makefile.in diff --git a/print/ja-vflib-lib/patches/patch-ad b/print/ja-vflib-lib/patches/patch-ad index b95ba9db911..14ab542236c 100644 --- a/print/ja-vflib-lib/patches/patch-ad +++ b/print/ja-vflib-lib/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +$NetBSD: patch-ad,v 1.2 2002/08/25 18:39:45 jlam Exp $ --- tools/Imakefile.in.orig Tue Oct 27 03:02:45 1998 +++ tools/Imakefile.in Mon May 1 04:41:40 2000 diff --git a/print/ja-vflib-lib/patches/patch-ae b/print/ja-vflib-lib/patches/patch-ae index 9249c24bf0f..2802542da23 100644 --- a/print/ja-vflib-lib/patches/patch-ae +++ b/print/ja-vflib-lib/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +$NetBSD: patch-ae,v 1.2 2002/08/25 18:39:46 jlam Exp $ --- make-sub.in.orig Mon Aug 31 05:22:45 1998 +++ make-sub.in diff --git a/print/ja-vflib-lib/patches/patch-af b/print/ja-vflib-lib/patches/patch-af index 15a37a1df18..7b503390518 100644 --- a/print/ja-vflib-lib/patches/patch-af +++ b/print/ja-vflib-lib/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:53 seb Exp $ +$NetBSD: patch-af,v 1.2 2002/08/25 18:39:46 jlam Exp $ --- configure.orig Wed Feb 17 23:58:33 1999 +++ configure Sun May 27 18:43:19 2001 diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile index 1bfc839c0cd..75bf64c889f 100644 --- a/print/pdflib/Makefile +++ b/print/pdflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:37 fredb Exp $ +# $NetBSD: Makefile,v 1.16 2002/08/25 18:39:46 jlam Exp $ .include "Makefile.common" @@ -6,7 +6,7 @@ PKGNAME= pdflib-${PDFLIB_BASE_VERS} PKGREVISION= 1 COMMENT= C library to produce PDF files -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES ALL_TARGET= pdflib DOCDIR= ${PREFIX}/share/doc/pdflib diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common index 49358530002..d3a6658895e 100644 --- a/print/pdflib/Makefile.common +++ b/print/pdflib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2002/06/30 03:58:17 jschauma Exp $ +# $NetBSD: Makefile.common,v 1.5 2002/08/25 18:39:46 jlam Exp $ DISTNAME= pdflib-${PDFLIB_DIST_VERS} PKGREVISION= 1 @@ -38,5 +38,5 @@ CPPFLAGS+= -Dunix USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" diff --git a/print/pdflib/PLIST b/print/pdflib/PLIST index f719a904c07..91ba278fa41 100644 --- a/print/pdflib/PLIST +++ b/print/pdflib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/30 03:58:17 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:46 jlam Exp $ bin/pdflib-config include/pdflib.h lib/libpdf.a diff --git a/print/pdflib/buildlink2.mk b/print/pdflib/buildlink2.mk new file mode 100644 index 00000000000..e1dc75a25e8 --- /dev/null +++ b/print/pdflib/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:47 jlam Exp $ + +.if !defined(PDFLIB_BUILDLINK2_MK) +PDFLIB_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= pdflib +BUILDLINK_DEPENDS.pdflib?= pdflib>=4.0.1nb1 +BUILDLINK_PKGSRCDIR.pdflib?= ../../print/pdflib + +EVAL_PREFIX+= BUILDLINK_PREFIX.pdflib=pdflib +BUILDLINK_PREFIX.pdflib_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.pdflib= include/pdflib.h +BUILDLINK_FILES.pdflib+= lib/libpdf.* + +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" + +BUILDLINK_TARGETS+= pdflib-buildlink + +pdflib-buildlink: _BUILDLINK_USE + +.endif # PDFLIB_BUILDLINK2_MK diff --git a/print/pdflib/distinfo b/print/pdflib/distinfo index f5da9d1c84c..b4f3c5d29d6 100644 --- a/print/pdflib/distinfo +++ b/print/pdflib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/07/01 21:48:23 jschauma Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:39:47 jlam Exp $ SHA1 (pdflib-4.0.3.tar.gz) = 9fbe256249ef780c4607ee3070785d9a4ecc03f7 Size (pdflib-4.0.3.tar.gz) = 2373817 bytes diff --git a/print/pdflib/patches/patch-aa b/print/pdflib/patches/patch-aa index c7e2f02de68..9258115b515 100644 --- a/print/pdflib/patches/patch-aa +++ b/print/pdflib/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2002/06/30 03:58:17 jschauma Exp $ +$NetBSD: patch-aa,v 1.7 2002/08/25 18:39:47 jlam Exp $ --- configure.orig Sat Jun 29 21:46:02 2002 +++ configure Sat Jun 29 21:47:37 2002 diff --git a/security/PAM/Makefile b/security/PAM/Makefile index 00e2add0018..0e1ceb41828 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/01/29 22:20:54 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 18:39:48 jlam Exp $ # DISTNAME= Linux-${PKGNAME} @@ -11,7 +11,7 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.kernel.org/pub/linux/libs/pam/ COMMENT= Pluggable Authentication Modules -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -57,6 +57,6 @@ post-install: ${INSTALL_DATA} $${file} ${HTMLDIR}; \ done -.include "../../security/libcrack/buildlink.mk" +.include "../../security/libcrack/buildlink2.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk new file mode 100644 index 00000000000..14cc2a7d512 --- /dev/null +++ b/security/PAM/buildlink2.mk @@ -0,0 +1,52 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:48 jlam Exp $ + +.if !defined(PAM_BUILDLINK2_MK) +PAM_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_DEPENDS.pam?= PAM>=0.75 +BUILDLINK_PKGSRCDIR.pam?= ../../security/PAM + +.if exists(/usr/include/security/pam_appl.h) +_NEED_PAM= NO +.else +_NEED_PAM= YES +.endif + +.if ${_NEED_PAM} == "YES" + +BUILDLINK_PACKAGES+= pam +EVAL_PREFIX+= BUILDLINK_PREFIX.pam=PAM +BUILDLINK_PREFIX.pam_DEFAULT= ${LOCALBASE} + +BUILDLINK_FILES.pam= include/security/* +BUILDLINK_FILES.pam+= lib/libpam.* +BUILDLINK_FILES.pam+= lib/libpamc.* +BUILDLINK_FILES.pam+= lib/libpam_misc.* + +BUILDLINK_TARGETS+= pam-buildlink + +pam-buildlink: _BUILDLINK_USE + +.else + +# The PAM libraries are usually in /lib on Linux systems while the headers +# are in /usr/include. +# +BUILDLINK_PREFIX.pam= /usr +BUILDLINK_PREFIX.pam-inc= /usr +BUILDLINK_FILES.pam-inc= include/security/* +BUILDLINK_PREFIX.pam-lib= / +BUILDLINK_FILES.pam-lib+= lib/libpam.* +BUILDLINK_FILES.pam-lib+= lib/libpamc.* +BUILDLINK_FILES.pam-lib+= lib/libpam_misc.* + +BUILDLINK_TARGETS+= pam-inc-buildlink +BUILDLINK_TARGETS+= pam-lib-buildlink + +pam-inc-buildlink: _BUILDLINK_USE +pam-lib-buildlink: _BUILDLINK_USE + +.endif # _NEED_PAM +.endif # PAM_BUILDLINK2_MK diff --git a/security/cyrus-sasl/DEINSTALL b/security/cyrus-sasl/DEINSTALL index 75d06a8612e..22d58fd1bfe 100644 --- a/security/cyrus-sasl/DEINSTALL +++ b/security/cyrus-sasl/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.5 2002/07/31 03:23:06 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.6 2002/08/25 18:39:49 jlam Exp $ SASLDB=@PKG_SYSCONFDIR@/sasldb.db SASLSOCKETDIR=@SASLSOCKETDIR@ diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index c9f09bf7c12..45df43bdfc1 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2002/07/31 03:23:06 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2002/08/25 18:39:50 jlam Exp $ DISTNAME= cyrus-sasl-1.5.27 SVR4_PKGNAME= csasl @@ -13,7 +13,7 @@ COMMENT= Simple Authentication and Security Layer BUILD_DEPENDS+= automake>=1.4:../../devel/automake -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES USE_LIBTOOL= YES @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --with-saslauthd=${SASLSOCKETDIR} CONFIGURE_ARGS+= --with-dblib=ndbm CONFIGURE_ARGS+= --with-dbpath=${PKG_SYSCONFDIR}/sasldb CONFIGURE_ARGS+= --with-plugindir=${PREFIX}/lib/sasl -CONFIGURE_ARGS+= --with-rc4=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-rc4=${BUILDLINK_PREFIX.openssl} # Authentication mechanisms CONFIGURE_ARGS+= --enable-anon # ANONYMOUS @@ -66,9 +66,9 @@ CONFIGURE_ARGS+= --disable-gssapi # --- no GSSAPI PLIST_SRC+= ${.CURDIR}/PLIST.plugins .if defined(USE_PAM) -. include "../../security/PAM/buildlink.mk" +. include "../../security/PAM/buildlink2.mk" BUILD_DEFS+= USE_PAM -CONFIGURE_ARGS+= --with-pam=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-pam=${BUILDLINK_PREFIX.pam} .else CONFIGURE_ARGS+= --without-pam .endif @@ -105,6 +105,7 @@ post-install: ${INSTALL_DATA_DIR} ${HTMLDIR} cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR} -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/cyrus-sasl/PLIST.common b/security/cyrus-sasl/PLIST.common index 56498d790e4..0854e1e0a21 100644 --- a/security/cyrus-sasl/PLIST.common +++ b/security/cyrus-sasl/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.3 2002/07/31 03:23:06 jlam Exp $ +@comment $NetBSD: PLIST.common,v 1.4 2002/08/25 18:39:50 jlam Exp $ bin/sasl-config etc/rc.d/sasl_pwcheck etc/rc.d/saslauthd diff --git a/security/cyrus-sasl/buildlink2.mk b/security/cyrus-sasl/buildlink2.mk new file mode 100644 index 00000000000..38459f4ecad --- /dev/null +++ b/security/cyrus-sasl/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:50 jlam Exp $ + +.if !defined(CYRUS_SASL_BUILDLINK2_MK) +CYRUS_SASL_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= cyrus-sasl +BUILDLINK_DEPENDS.cyrus-sasl?= cyrus-sasl>=1.5.24nb2 +BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl + +EVAL_PREFIX+= BUILDLINK_PREFIX.cyrus-sasl=cyrus-sasl +BUILDLINK_PREFIX.cyrus-sasl_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.cyrus-sasl= include/hmac-md5.h +BUILDLINK_FILES.cyrus-sasl+= include/sasl.h +BUILDLINK_FILES.cyrus-sasl+= include/saslplug.h +BUILDLINK_FILES.cyrus-sasl+= include/saslutil.h +BUILDLINK_FILES.cyrus-sasl+= lib/libsasl.* + +.if defined(USE_PAM) +. include "../../security/PAM/buildlink2.mk" +.endif + +BUILDLINK_TARGETS+= cyrus-sasl-buildlink + +cyrus-sasl-buildlink: _BUILDLINK_USE + +.endif # CYRUS_SASL_BUILDLINK2_MK diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo index 01828ee9826..d2bedb53cd0 100644 --- a/security/cyrus-sasl/distinfo +++ b/security/cyrus-sasl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/07/31 03:23:07 jlam Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:39:51 jlam Exp $ SHA1 (cyrus-sasl-1.5.27.tar.gz) = eedaec8355219b61e64236e3a5d9845d3af5a13d Size (cyrus-sasl-1.5.27.tar.gz) = 528252 bytes diff --git a/security/cyrus-sasl/files/sasl_pwcheck.sh b/security/cyrus-sasl/files/sasl_pwcheck.sh index aa2243707a4..32ea60034f9 100644 --- a/security/cyrus-sasl/files/sasl_pwcheck.sh +++ b/security/cyrus-sasl/files/sasl_pwcheck.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: sasl_pwcheck.sh,v 1.8 2002/07/31 03:23:07 jlam Exp $ +# $NetBSD: sasl_pwcheck.sh,v 1.9 2002/08/25 18:39:51 jlam Exp $ # # The pwcheck daemon allows UNIX password authentication with Cyrus SASL. # diff --git a/security/cyrus-sasl/files/saslauthd.sh b/security/cyrus-sasl/files/saslauthd.sh index 273c35f782a..16b77de72df 100644 --- a/security/cyrus-sasl/files/saslauthd.sh +++ b/security/cyrus-sasl/files/saslauthd.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: saslauthd.sh,v 1.1 2002/07/31 03:23:07 jlam Exp $ +# $NetBSD: saslauthd.sh,v 1.2 2002/08/25 18:39:51 jlam Exp $ # # The saslauthd daemon allows cleartext UNIX password authentication via # several authentication mechanisms with Cyrus SASL. diff --git a/security/cyrus-sasl/patches/patch-aj b/security/cyrus-sasl/patches/patch-aj index 2510133d45a..2b86eb5ffad 100644 --- a/security/cyrus-sasl/patches/patch-aj +++ b/security/cyrus-sasl/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.1 2002/07/31 03:23:07 jlam Exp $ +$NetBSD: patch-aj,v 1.2 2002/08/25 18:39:51 jlam Exp $ --- saslauthd/Makefile.am.orig Fri Mar 23 20:41:35 2001 +++ saslauthd/Makefile.am diff --git a/security/cyrus-sasl/patches/patch-ak b/security/cyrus-sasl/patches/patch-ak index 242fb18bf86..adf8a601617 100644 --- a/security/cyrus-sasl/patches/patch-ak +++ b/security/cyrus-sasl/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.1 2002/07/31 03:23:07 jlam Exp $ +$NetBSD: patch-ak,v 1.2 2002/08/25 18:39:52 jlam Exp $ --- lib/checkpw.c.orig Sat Feb 17 00:06:48 2001 +++ lib/checkpw.c diff --git a/security/libcrack/Makefile b/security/libcrack/Makefile index 09926995adf..e3c0038eb98 100644 --- a/security/libcrack/Makefile +++ b/security/libcrack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/06/19 09:12:33 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 18:39:52 jlam Exp $ # DISTNAME= cracklib,2.7 @@ -11,8 +11,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.users.dircon.co.uk/~crypto/ COMMENT= password checking library -USE_LIBTOOL= YES -USE_BUILDLINK_ONLY= YES +USE_LIBTOOL= YES +USE_BUILDLINK2= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/cracklib diff --git a/security/libcrack/buildlink2.mk b/security/libcrack/buildlink2.mk new file mode 100644 index 00000000000..75143df9ada --- /dev/null +++ b/security/libcrack/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:53 jlam Exp $ + +.if !defined(LIBCRACK_BUILDLINK2_MK) +LIBCRACK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libcrack +BUILDLINK_DEPENDS.libcrack?= libcrack>=2.7 +BUILDLINK_PKGSRCDIR.libcrack?= ../../security/libcrack + +EVAL_PREFIX+= BUILDLINK_PREFIX.libcrack=libcrack +BUILDLINK_PREFIX.libcrack_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libcrack= include/cracklib/* +BUILDLINK_FILES.libcrack+= lib/libcrack.* + +BUILDLINK_TARGETS+= libcrack-buildlink + +libcrack-buildlink: _BUILDLINK_USE + +.endif # LIBCRACK_BUILDLINK2_MK diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile index 13e2c7af609..e46d7eb478b 100644 --- a/security/libmcrypt/Makefile +++ b/security/libmcrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/05/09 22:31:07 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 18:39:53 jlam Exp $ DISTNAME= libmcrypt-2.4.22 CATEGORIES= security devel @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://mcrypt.hellug.gr/ COMMENT= crypto algorithms library -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -18,5 +18,5 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool post-extract: ${RM} -rf ${WRKSRC}/libltdl -.include "../../devel/libtool/buildlink.mk" +.include "../../devel/libtool/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/libmcrypt/PLIST b/security/libmcrypt/PLIST index 74286d58577..6cb2cda8931 100644 --- a/security/libmcrypt/PLIST +++ b/security/libmcrypt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/05/09 22:31:08 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:53 jlam Exp $ bin/libmcrypt-config include/mcrypt.h lib/libmcrypt.a diff --git a/security/libmcrypt/buildlink2.mk b/security/libmcrypt/buildlink2.mk new file mode 100644 index 00000000000..43022583303 --- /dev/null +++ b/security/libmcrypt/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:53 jlam Exp $ + +.if !defined(LIBMCRYPT_BUILDLINK2_MK) +LIBMCRYPT_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libmcrypt +BUILDLINK_DEPENDS.libmcrypt?= libmcrypt>=2.4.17 +BUILDLINK_PKGSRCDIR.libmcrypt?= ../../security/libmcrypt + +EVAL_PREFIX+= BUILDLINK_PREFIX.libmcrypt=libmcrypt +BUILDLINK_PREFIX.libmcrypt_DEFAULT= ${LOCALBASE} + +BUILDLINK_FILES.libmcrypt= include/mcrypt.h +BUILDLINK_FILES.libmcrypt+= lib/libmcrypt.* + +.include "../../devel/libtool/buildlink2.mk" + +BUILDLINK_TARGETS+= libmcrypt-buildlink + +libmcrypt-buildlink: _BUILDLINK_USE + +.endif # LIBMCRYPT_BUILDLINK2_MK diff --git a/security/libmcrypt/distinfo b/security/libmcrypt/distinfo index 98edd69a513..1478c4e42b9 100644 --- a/security/libmcrypt/distinfo +++ b/security/libmcrypt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/05/09 22:31:08 wiz Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 18:39:54 jlam Exp $ SHA1 (libmcrypt-2.4.22.tar.gz) = f462cbbcb0c220cb30dead2afa63452c1a5b21e5 Size (libmcrypt-2.4.22.tar.gz) = 490383 bytes diff --git a/security/libmcrypt/patches/patch-aa b/security/libmcrypt/patches/patch-aa index 91c0dd27b65..212a2666291 100644 --- a/security/libmcrypt/patches/patch-aa +++ b/security/libmcrypt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2002/05/09 22:31:08 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2002/08/25 18:39:54 jlam Exp $ --- configure.orig Fri Feb 1 12:23:43 2002 +++ configure diff --git a/security/libmcrypt22/Makefile b/security/libmcrypt22/Makefile index 1e5330309b3..43298e30e72 100644 --- a/security/libmcrypt22/Makefile +++ b/security/libmcrypt22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/12 18:59:36 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 18:39:55 jlam Exp $ DISTNAME= libmcrypt-2.2.7 PKGNAME= libmcrypt22-2.2.7 @@ -10,7 +10,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://mcrypt.hellug.gr/ COMMENT= crypto algorithms library (version 2.2.x) -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --includedir=${PREFIX}/include/libmcrypt22 diff --git a/security/libmcrypt22/buildlink2.mk b/security/libmcrypt22/buildlink2.mk new file mode 100644 index 00000000000..92fbb2e31dd --- /dev/null +++ b/security/libmcrypt22/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:55 jlam Exp $ + +.if !defined(LIBMCRYPT22_BUILDLINK2_MK) +LIBMCRYPT22_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libmcrypt22 +BUILDLINK_DEPENDS.libmcrypt22?= libmcrypt22>=2.2.7 +BUILDLINK_PKGSRCDIR.libmcrypt22?= ../../security/libmcrypt22 + +EVAL_PREFIX+= BUILDLINK_PREFIX.libmcrypt22=libmcrypt22 +BUILDLINK_PREFIX.libmcrypt22_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libmcrypt22= include/libmcrypt22/mcrypt.h +BUILDLINK_FILES.libmcrypt22+= lib/libmcrypt22.* + +BUILDLINK_TRANSFORM.libmcrypt22= -e "s|include/libmcrypt22/|include/|g" +BUILDLINK_TRANSFORM+= l:mcrypt:mcrypt22 + +BUILDLINK_TARGETS+= libmcrypt22-buildlink + +libmcrypt22-buildlink: _BUILDLINK_USE + +.endif # LIBMCRYPT22_BUILDLINK2_MK diff --git a/security/mhash/Makefile b/security/mhash/Makefile index f2ea033ddc1..0955f9dbc77 100644 --- a/security/mhash/Makefile +++ b/security/mhash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/10/09 19:20:33 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 18:39:55 jlam Exp $ DISTNAME= mhash-0.8.9 CATEGORIES= security devel @@ -8,8 +8,10 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://mhash.sourceforge.net/ COMMENT= hash algorithms library -USE_BUILDLINK_ONLY= YES -USE_LIBTOOL= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES +USE_LIBTOOL= YES +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + .include "../../mk/bsd.pkg.mk" diff --git a/security/mhash/buildlink2.mk b/security/mhash/buildlink2.mk new file mode 100644 index 00000000000..c126b491292 --- /dev/null +++ b/security/mhash/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:56 jlam Exp $ + +.if !defined(MHASH_BUILDLINK2_MK) +MHASH_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= mhash +BUILDLINK_DEPENDS.mhash?= mhash>=0.8.3 +BUILDLINK_PKGSRCDIR.mhash?= ../../security/mhash + +EVAL_PREFIX+= BUILDLINK_PREFIX.mhash=mhash +BUILDLINK_PREFIX.mhash_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.mhash= include/mhash.h +BUILDLINK_FILES.mhash+= lib/libmhash.* + +BUILDLINK_TARGETS+= mhash-buildlink + +mhash-buildlink: _BUILDLINK_USE + +.endif # MHASH_BUILDLINK2_MK diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile index 4a7f79f0bc3..983fb8fa4fe 100644 --- a/security/rsaref/Makefile +++ b/security/rsaref/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2002/08/01 02:37:42 jschauma Exp $ +# $NetBSD: Makefile,v 1.26 2002/08/25 18:39:56 jlam Exp $ # DISTNAME= rsaref @@ -14,7 +14,7 @@ COMMENT= Encryption/authentication library, RSA/MDX/DES CRYPTO= yes LICENSE= no-commercial-use -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_LIBTOOL= yes MAKEFILE= unix/makefile ALL_TARGET= librsaref.la diff --git a/security/rsaref/buildlink2.mk b/security/rsaref/buildlink2.mk new file mode 100644 index 00000000000..7d5a2a45213 --- /dev/null +++ b/security/rsaref/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:57 jlam Exp $ + +.if !defined(RSAREF_BUILDLINK2_MK) +RSAREF_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= rsaref +BUILDLINK_DEPENDS.rsaref?= rsaref-2.0p3 +BUILDLINK_PKGSRCDIR.rsaref?= ../../security/rsaref + +EVAL_PREFIX+= BUILDLINK_PREFIX.rsaref=rsaref +BUILDLINK_PREFIX.rsaref_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.rsaref= include/rsaref/*.h +BUILDLINK_FILES.rsaref+= lib/librsaref.* + +BUILDLINK_TARGETS+= rsaref-buildlink + +rsaref-buildlink: _BUILDLINK_USE + +.endif # RSAREF_BUILDLINK2_MK diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile index 9a00522aed4..6970cbbbcce 100644 --- a/security/tcp_wrappers/Makefile +++ b/security/tcp_wrappers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 18:39:57 jlam Exp $ DISTNAME= tcp_wrappers_7.6-ipv6.1 PKGNAME= tcp_wrappers-7.6.1 @@ -12,7 +12,8 @@ COMMENT= Monitor and filter incoming requests for network services ONLY_FOR_PLATFORM= SunOS-*-* # in NetBSD base system -USE_LIBTOOL= YES +USE_BUILDLINK2= # defined +USE_LIBTOOL= # defined ALL_TARGET= sunos5 @@ -21,17 +22,16 @@ MAKE_ENV+= IPV6=-DHAVE_IPV6 .endif do-install: + cd ${WRKSRC}; ${PKGLIBTOOL} ${INSTALL_DATA} libwrap.la ${PREFIX}/lib + cd ${WRKSRC}; ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + tcpdmatch try-from safe_finger tcpdchk ${PREFIX}/bin + cd ${WRKSRC}; ${INSTALL_DATA} tcpd.h ${PREFIX}/include + cd ${WRKSRC}; ${PKGLIBTOOL} ${INSTALL_PROGRAM} tcpd ${PREFIX}/libexec + cd ${WRKSRC}; ${INSTALL_DATA} *.3 ${PREFIX}/man/man3 + cd ${WRKSRC}; ${INSTALL_DATA} *.5 ${PREFIX}/man/man5 + cd ${WRKSRC}; ${INSTALL_DATA} *.8 ${PREFIX}/man/man8 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcp_wrappers - cd ${WRKSRC} && \ - ${LIBTOOL} ${INSTALL_DATA} libwrap.la ${PREFIX}/lib && \ - ${LIBTOOL} ${INSTALL_PROGRAM} tcpdmatch try-from safe_finger tcpdchk \ - ${PREFIX}/bin && \ - ${INSTALL_DATA} tcpd.h ${PREFIX}/include && \ - ${LIBTOOL} ${INSTALL_PROGRAM} tcpd ${PREFIX}/libexec && \ - ${INSTALL_DATA} *.3 ${PREFIX}/man/man3 && \ - ${INSTALL_DATA} *.5 ${PREFIX}/man/man5 && \ - ${INSTALL_DATA} *.8 ${PREFIX}/man/man8 && \ - ${INSTALL_DATA} README README.NIS README.ipv6 \ - ${PREFIX}/share/doc/tcp_wrappers + cd ${WRKSRC}; ${INSTALL_DATA} README README.NIS README.ipv6 \ + ${PREFIX}/share/doc/tcp_wrappers .include "../../mk/bsd.pkg.mk" diff --git a/security/tcp_wrappers/buildlink2.mk b/security/tcp_wrappers/buildlink2.mk new file mode 100644 index 00000000000..ef0bac60f8e --- /dev/null +++ b/security/tcp_wrappers/buildlink2.mk @@ -0,0 +1,30 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:58 jlam Exp $ + +.if !defined(TCP_WRAPPERS_BUILDLINK2_MK) +TCP_WRAPPERS_BUILDLINK2_MK= # defined + +BUILDLINK_DEPENDS.tcp_wrappers?= tcp_wrappers>=7.6.1nb1 +BUILDLINK_PKGSRCDIR.tcp_wrappers?= ../../security/tcp_wrappers + +.if exists(/usr/include/tcpd.h) +_NEED_TCP_WRAPPERS= NO +.else +_NEED_TCP_WRAPPERS= YES +.endif + +.if ${_NEED_TCP_WRAPPERS} == "YES" +BUILDLINK_PACKAGES+= tcp_wrappers +EVAL_PREFIX+= BUILDLINK_PREFIX.tcp_wrappers=tcp_wrappers +BUILDLINK_PREFIX.tcp_wrappers_DEFAULT= ${LOCALBASE} +.else +BUILDLINK_PREFIX.tcp_wrappers= /usr +.endif + +BUILDLINK_FILES.tcp_wrappers= include/tcpd.h +BUILDLINK_FILES.tcp_wrappers+= lib/libwrap.* + +BUILDLINK_TARGETS+= tcp_wrappers-buildlink + +tcp_wrappers-buildlink: _BUILDLINK_USE + +.endif # TCP_WRAPPERS_BUILDLINK2_MK diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile index 3a772426a95..98e85322b65 100644 --- a/textproc/eb/Makefile +++ b/textproc/eb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/06/12 01:14:49 uebayasi Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 18:39:59 jlam Exp $ # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp DISTNAME= eb-3.2.2 @@ -47,7 +47,7 @@ EB_APPENDICES= \ EXTRACT_ONLY= ${EB_DISTFILES} DIST_SUBDIR= eb -USE_BUILDLINK_ONLY= # Defined +USE_BUILDLINK2= # Defined USE_LIBTOOL= # Defined GNU_CONFIGURE= # Defined CONFIGURE_ARGS+= --with-zlib @@ -69,7 +69,8 @@ post-install: ${GTAR} -C ${EB_APPENDIXDIR} -zxmf ${_DISTDIR}/$${f}; \ done -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" + .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/eb/PLIST b/textproc/eb/PLIST index 67bc5690bc3..b2b54e38f1e 100644 --- a/textproc/eb/PLIST +++ b/textproc/eb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/06/12 01:14:49 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 18:39:59 jlam Exp $ bin/ebappendix bin/ebfont bin/ebinfo diff --git a/textproc/eb/buildlink.mk b/textproc/eb/buildlink.mk index 07bef2c61bc..2d68f46afc8 100644 --- a/textproc/eb/buildlink.mk +++ b/textproc/eb/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2002/06/12 01:14:49 uebayasi Exp $ +# $NetBSD: buildlink.mk,v 1.4 2002/08/25 18:39:59 jlam Exp $ # # This Makefile fragment is included by packages that use EB. # diff --git a/textproc/eb/buildlink2.mk b/textproc/eb/buildlink2.mk new file mode 100644 index 00000000000..208aab4e2a2 --- /dev/null +++ b/textproc/eb/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:00 jlam Exp $ + +.if !defined(EB_BUILDLINK2_MK) +EB_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= eb + +# eb<=3.2.1 packages didn't fix eb.conf. +BUILDLINK_DEPENDS.eb?= eb>=3.2.2 +BUILDLINK_PKGSRCDIR.eb?= ../../textproc/eb + +EVAL_PREFIX+= BUILDLINK_PREFIX.eb=eb +BUILDLINK_PREFIX.eb_DEFAULT?= ${LOCALBASE} + +BUILDLINK_FILES.eb= include/eb/*.h +BUILDLINK_FILES.eb+= lib/libeb.* + +.if defined(GNU_CONFIGURE) +CONFIGURE_ARGS+= --with-eb-conf=${PKG_SYSCONFDIR}/eb.conf +.endif + +BUILDLINK_TARGETS+= eb-buildlink + +eb-buildlink: _BUILDLINK_USE + +.endif # EB_BUILDLINK2_MK diff --git a/textproc/eb/distinfo b/textproc/eb/distinfo index 53f99e7e64d..1cd687fb7b5 100644 --- a/textproc/eb/distinfo +++ b/textproc/eb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/06/12 01:14:49 uebayasi Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 18:40:00 jlam Exp $ SHA1 (eb/eb-3.2.2.tar.gz) = ae6fa87b996c239d95a8e24a4514eadb3cd9fb80 Size (eb/eb-3.2.2.tar.gz) = 1010300 bytes diff --git a/textproc/eb/patches/patch-aa b/textproc/eb/patches/patch-aa index 0195af39aea..ee24da38552 100644 --- a/textproc/eb/patches/patch-aa +++ b/textproc/eb/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2002/06/12 01:14:49 uebayasi Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:00 jlam Exp $ --- configure.orig Sun Jun 9 12:06:40 2002 +++ configure diff --git a/textproc/eb/patches/patch-ab b/textproc/eb/patches/patch-ab index a62a6f294e9..fe2297155ea 100644 --- a/textproc/eb/patches/patch-ab +++ b/textproc/eb/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2002/06/12 01:14:50 uebayasi Exp $ +$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:00 jlam Exp $ --- configure.ac.orig Sat Mar 30 15:45:45 2002 +++ configure.ac diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile index ae546d06637..31ba3e48d68 100644 --- a/textproc/expat/Makefile +++ b/textproc/expat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/08/20 11:46:49 drochner Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 18:40:01 jlam Exp $ # DISTNAME= expat-1.95.4 @@ -13,7 +13,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES DOCDIR= ${PREFIX}/share/doc/html/expat diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST index 551003351ed..e1f05413a34 100644 --- a/textproc/expat/PLIST +++ b/textproc/expat/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/20 11:46:49 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:40:01 jlam Exp $ bin/xmlwf include/expat.h lib/libexpat.a diff --git a/textproc/expat/buildlink2.mk b/textproc/expat/buildlink2.mk new file mode 100644 index 00000000000..f8cca3c5cca --- /dev/null +++ b/textproc/expat/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:01 jlam Exp $ + +.if !defined(EXPAT_BUILDLINK2_MK) +EXPAT_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= expat +BUILDLINK_DEPENDS.expat?= expat>=1.95.2 +BUILDLINK_PKGSRCDIR.expat?= ../../textproc/expat + +EVAL_PREFIX+= BUILDLINK_PREFIX.expat=expat +BUILDLINK_PREFIX.expat_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.expat= include/expat.h +BUILDLINK_FILES.expat+= lib/libexpat.* + +BUILDLINK_TARGETS+= expat-buildlink + +expat-buildlink: _BUILDLINK_USE + +.endif # EXPAT_BUILDLINK2_MK diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo index b66557a1c01..60e95f92867 100644 --- a/textproc/expat/distinfo +++ b/textproc/expat/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/08/20 11:46:50 drochner Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 18:40:02 jlam Exp $ SHA1 (expat-1.95.4.tar.gz) = e3c7d512f98a495b7c39d63d98e39a0c7b89d63a Size (expat-1.95.4.tar.gz) = 263409 bytes diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile index 0429f68ed4e..8a34f76362a 100644 --- a/textproc/intltool/Makefile +++ b/textproc/intltool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/06 13:15:21 rh Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 18:40:02 jlam Exp $ # DISTNAME= intltool-0.18 @@ -11,8 +11,8 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Toolbox for internationalisation USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/intltool/buildlink2.mk b/textproc/intltool/buildlink2.mk new file mode 100644 index 00000000000..163cdc7500f --- /dev/null +++ b/textproc/intltool/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:02 jlam Exp $ + +.if !defined(INTLTOOL_BUILDLINK2_MK) +INTLTOOL_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= intltool +BUILDLINK_DEPENDS.intltool?= intltool>=0.18 +BUILDLINK_PKGSRCDIR.intltool?= ../../textproc/intltool + +EVAL_PREFIX+= BUILDLINK_PREFIX.intltool=intltool +BUILDLINK_PREFIX.intltool_DEFAULT= ${LOCALBASE} + +.include "../../lang/perl5/buildlink2.mk" + +BUILDLINK_TARGETS+= intltool-buildlink + +intltool-buildlink: _BUILDLINK_USE + +.endif # INTLTOOL_BUILDLINK2_MK diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo index 833678ac708..2271d313586 100644 --- a/textproc/intltool/distinfo +++ b/textproc/intltool/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/02 13:02:50 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 18:40:02 jlam Exp $ SHA1 (intltool-0.18.tar.bz2) = f282b076f529bc5745b49ee384048b46ec6fe3c9 Size (intltool-0.18.tar.bz2) = 82619 bytes diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile index ec13828fa6a..2698c8756ad 100644 --- a/textproc/jade/Makefile +++ b/textproc/jade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/08/12 16:23:23 skrll Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 18:40:03 jlam Exp $ DISTNAME= jade-1.2.1 PKGREVISION= 4 @@ -17,7 +17,7 @@ PATCH_DIST_STRIP= -p1 CONFLICTS+= sp-[0-9]* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_GMAKE= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES @@ -49,7 +49,7 @@ post-install: # Installed by print/tex-jadetex ${RM} ${PREFIX}/share/sgml/jade/*jadetex.* -.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" # Turn off C++ optimization as there seem to be problems with the generated diff --git a/textproc/jade/buildlink2.mk b/textproc/jade/buildlink2.mk new file mode 100644 index 00000000000..1f30b866476 --- /dev/null +++ b/textproc/jade/buildlink2.mk @@ -0,0 +1,24 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:03 jlam Exp $ + +.if !defined(JADE_BUILDLINK2_MK) +JADE_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= jade +BUILDLINK_DEPENDS.jade?= jade>=1.2.1 +BUILDLINK_PKGSRCDIR.jade?= ../../textproc/jade + +EVAL_PREFIX+= BUILDLINK_PREFIX.jade=jade +BUILDLINK_PREFIX.jade_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.jade= include/sp/* +BUILDLINK_FILES.jade+= lib/libgrove.* +BUILDLINK_FILES.jade+= lib/libsp.* +BUILDLINK_FILES.jade+= lib/libspgrove.* +BUILDLINK_FILES.jade+= lib/libstyle.* + +.include "../../devel/gettext-lib/buildlink2.mk" + +BUILDLINK_TARGETS+= jade-buildlink + +jade-buildlink: _BUILDLINK_USE + +.endif # JADE_BUILDLINK2_MK diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo index 36d0015968f..85b49c7ccca 100644 --- a/textproc/jade/distinfo +++ b/textproc/jade/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/08/12 16:23:23 skrll Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:40:04 jlam Exp $ SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06 Size (jade-1.2.1.tar.gz) = 1092062 bytes @@ -9,6 +9,6 @@ SHA1 (patch-ab) = 1742175ec89ea8e796b4e874a488225850cf78e1 SHA1 (patch-ac) = c96ca44b40bbcc9c588dfe40045f4d386e32998d SHA1 (patch-ad) = 1afe17aeabda9f7f5c8531b09fb0af6085a8526f SHA1 (patch-ae) = a01bd39d4be17884f902a06c5c7324912935241f -SHA1 (patch-af) = ef312d2f090bc32cdac60296d6b85940205da2a3 -SHA1 (patch-ag) = e6772fab67961e12ee8870a15763cde466b60636 +SHA1 (patch-af) = eb8c986dd4051cb183ccbb8d6aa97f1e801eab58 +SHA1 (patch-ag) = 593c1b6488fee22cd634fa10c90c89fd858c8981 SHA1 (patch-ah) = d829ea273b99c06d83a6d7944ece12fbae513b6c diff --git a/textproc/jade/patches/patch-ad b/textproc/jade/patches/patch-ad index eeaedb9ca00..0a939261818 100644 --- a/textproc/jade/patches/patch-ad +++ b/textproc/jade/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.4 2002/05/20 18:18:03 cjep Exp $ +$NetBSD: patch-ad,v 1.5 2002/08/25 18:40:04 jlam Exp $ --- Makefile.prog.in.orig Wed Aug 29 15:59:35 2001 +++ Makefile.prog.in Wed Aug 29 16:01:13 2001 @@ -13,7 +13,7 @@ diff --git a/textproc/jade/patches/patch-af b/textproc/jade/patches/patch-af index 16148ce5709..3ef2977a951 100644 --- a/textproc/jade/patches/patch-af +++ b/textproc/jade/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1 2001/10/14 12:19:16 tron Exp $ +$NetBSD: patch-af,v 1.2 2002/08/25 18:40:04 jlam Exp $ --- spgrove/Makefile.sub.orig Sun Oct 14 13:51:50 2001 +++ spgrove/Makefile.sub Sun Oct 14 13:58:15 2001 @@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.1 2001/10/14 12:19:16 tron Exp $ LIB=spgrove INCLUDE=-I$(srcdir)/../grove -DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp $(LIB_THREADS) -+DEPLIBS=-lm -L$(TOP)/grove -lgrove -L$(TOP)/lib -lsp $(LIB_THREADS) ++DEPLIBS=-lm $(TOP)/grove/libgrove.la $(TOP)/lib/libsp.la $(LIB_THREADS) OBJS=GroveApp.o GroveBuilder.o SdNode.o GENSRCS=grove_inst.cxx diff --git a/textproc/jade/patches/patch-ag b/textproc/jade/patches/patch-ag index 052fdafaf92..8d45b0e5935 100644 --- a/textproc/jade/patches/patch-ag +++ b/textproc/jade/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2001/10/14 12:19:16 tron Exp $ +$NetBSD: patch-ag,v 1.2 2002/08/25 18:40:04 jlam Exp $ --- style/Makefile.sub.orig Sun Oct 14 13:51:50 2001 +++ style/Makefile.sub Sun Oct 14 14:01:26 2001 @@ -6,8 +6,8 @@ $NetBSD: patch-ag,v 1.1 2001/10/14 12:19:16 tron Exp $ LIB=style -DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp \ - -L$(TOP)/spgrove/.libs -lspgrove -+DEPLIBS=-lm -L$(TOP)/grove -lgrove -L$(TOP)/lib -lsp \ -+ -L$(TOP)/spgrove -lspgrove ++DEPLIBS=-lm $(TOP)/grove/libgrove.la $(TOP)/lib/libsp.la \ ++ $(TOP)/spgrove/libspgrove.la OBJS=Collector.o \ DssslApp.o \ DssslSpecEventHandler.o \ diff --git a/textproc/jade/patches/patch-ah b/textproc/jade/patches/patch-ah index 70a49e7a0c6..1665bd25cdc 100644 --- a/textproc/jade/patches/patch-ah +++ b/textproc/jade/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.2 2002/08/13 10:49:05 wiz Exp $ +$NetBSD: patch-ah,v 1.3 2002/08/25 18:40:05 jlam Exp $ --- Makefile.lib.in.orig Mon Aug 12 16:56:51 2002 +++ Makefile.lib.in Mon Aug 12 16:56:48 2002 @@ -18,7 +18,7 @@ diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile index 60b77e9ec86..803ddcfa785 100644 --- a/textproc/kakasi/Makefile +++ b/textproc/kakasi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 18:40:05 jlam Exp $ # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $ DISTNAME= kakasi-2.3.4 @@ -9,11 +9,11 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org HOMEPAGE= http://kakasi.namazu.org/ COMMENT= Kanji-Kana Simple Inverter, language filter for Japanese -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool post-install: ${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/ja_JP.EUC/man1 diff --git a/textproc/kakasi/PLIST b/textproc/kakasi/PLIST index e15c7e739c8..a3fc3bf2bfe 100644 --- a/textproc/kakasi/PLIST +++ b/textproc/kakasi/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/25 18:40:05 jlam Exp $ bin/atoc_conv bin/kakasi bin/kakasi-config diff --git a/textproc/kakasi/buildlink.mk b/textproc/kakasi/buildlink.mk index 1d75a6d3f9c..962f35efb0b 100644 --- a/textproc/kakasi/buildlink.mk +++ b/textproc/kakasi/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $ +# $NetBSD: buildlink.mk,v 1.2 2002/08/25 18:40:05 jlam Exp $ # # This Makefile fragment is included by packages that use kakasi. # diff --git a/textproc/kakasi/buildlink2.mk b/textproc/kakasi/buildlink2.mk new file mode 100644 index 00000000000..7daea228a7e --- /dev/null +++ b/textproc/kakasi/buildlink2.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:06 jlam Exp $ + +.if !defined(KAKASI_BUILDLINK2_MK) +KAKASI_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= kakasi +BUILDLINK_DEPENDS.kakasi?= kakasi>=2.3.0 +BUILDLINK_PKGSRCDIR.kakasi?= ../../textproc/kakasi + +EVAL_PREFIX+= BUILDLINK_PREFIX.kakasi=kakasi +BUILDLINK_PREFIX.kakasi_DEFAULT= ${LOCALBASE} + +BUILDLINK_FILES.kakasi= include/libkakasi.h +BUILDLINK_FILES.kakasi+= lib/libkakasi.* + +BUILDLINK_TARGETS+= kakasi-buildlink + +kakasi-buildlink: _BUILDLINK_USE + +.endif # KAKASI_BUILDLINK2_MK diff --git a/textproc/kakasi/distinfo b/textproc/kakasi/distinfo index 2fcdf44e6cf..bc455481dd9 100644 --- a/textproc/kakasi/distinfo +++ b/textproc/kakasi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $ +$NetBSD: distinfo,v 1.2 2002/08/25 18:40:06 jlam Exp $ SHA1 (kakasi-2.3.4.tar.gz) = ab95a226f301955d2e8ae0d347afbb567e25fbe7 Size (kakasi-2.3.4.tar.gz) = 1099258 bytes diff --git a/textproc/kakasi/patches/patch-aa b/textproc/kakasi/patches/patch-aa index d420c48f349..9597437ff37 100644 --- a/textproc/kakasi/patches/patch-aa +++ b/textproc/kakasi/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:06 jlam Exp $ --- lib/libkakasi.c.orig Sun Sep 2 20:43:21 2001 +++ lib/libkakasi.c diff --git a/textproc/kakasi/patches/patch-ab b/textproc/kakasi/patches/patch-ab index 368d9488c6f..2c65ffb7672 100644 --- a/textproc/kakasi/patches/patch-ab +++ b/textproc/kakasi/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:32 seb Exp $ +$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:06 jlam Exp $ --- lib/libkakasi.h.orig Mon Aug 27 11:11:56 2001 +++ lib/libkakasi.h diff --git a/textproc/libpspell/Makefile b/textproc/libpspell/Makefile index 7a430a51442..26a01e3c56f 100644 --- a/textproc/libpspell/Makefile +++ b/textproc/libpspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/03/05 15:32:16 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 18:40:07 jlam Exp $ # DISTNAME= pspell-.12.2 @@ -11,12 +11,12 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://pspell.sourceforge.net/ COMMENT= generic interface to spell checker libraries +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --enable-doc-dir=${PREFIX}/share/doc/pspell -USE_BUILDLINK_ONLY= YES .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libpspell/buildlink2.mk b/textproc/libpspell/buildlink2.mk new file mode 100644 index 00000000000..01aa7cbf01b --- /dev/null +++ b/textproc/libpspell/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:07 jlam Exp $ + +.if !defined(LIBPSPELL_BUILDLINK2_MK) +LIBPSPELL_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libpspell +BUILDLINK_DEPENDS.libpspell?= libpspell>=0.12.2nb1 +BUILDLINK_PKGSRCDIR.libpspell?= ../../textproc/libpspell + +EVAL_PREFIX+= BUILDLINK_PREFIX.libpspell=libpspell +BUILDLINK_PREFIX.libpspell_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libpspell= include/pspell/* +BUILDLINK_FILES.libpspell+= lib/libpspell* + +BUILDLINK_TARGETS+= libpspell-buildlink + +libpspell-buildlink: _BUILDLINK_USE + +.endif # LIBPSPELL_BUILDLINK2_MK diff --git a/textproc/libunicode/Makefile b/textproc/libunicode/Makefile index 76d296615c7..7dbb2e61252 100644 --- a/textproc/libunicode/Makefile +++ b/textproc/libunicode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/10/06 12:43:08 rh Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 18:40:08 jlam Exp $ # DISTNAME= libunicode-0.4 @@ -9,7 +9,7 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.pango.org/ COMMENT= library for manipulating Unicode characters and strings -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/textproc/libunicode/buildlink2.mk b/textproc/libunicode/buildlink2.mk new file mode 100644 index 00000000000..fe7668c5ff3 --- /dev/null +++ b/textproc/libunicode/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:09 jlam Exp $ + +.if !defined(LIBUNICODE_BUILDLINK2_MK) +LIBUNICODE_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libunicode +BUILDLINK_DEPENDS.libunicode?= libunicode>=0.4 +BUILDLINK_PKGSRCDIR.libunicode?= ../../textproc/libunicode + +EVAL_PREFIX+= BUILDLINK_PREFIX.libunicode=libunicode +BUILDLINK_PREFIX.libunicode_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libunicode= include/unicode.h +BUILDLINK_FILES.libunicode+= lib/libunicode.* + +BUILDLINK_TARGETS+= libunicode-buildlink + +libunicode-buildlink: _BUILDLINK_USE + +.endif # LIBUNICODE_BUILDLINK2_MK diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index cbcbdb69ea6..bdda8279c5b 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/02/03 22:29:11 skrll Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/25 18:40:09 jlam Exp $ # DISTNAME= libxml-1.8.16 @@ -10,11 +10,11 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://xmlsoft.org/ COMMENT= XML parser, mainly used by the GNOME project -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -.include "../../devel/zlib/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libxml/buildlink.mk b/textproc/libxml/buildlink.mk index 85a5a28369e..f69f1dee9b8 100644 --- a/textproc/libxml/buildlink.mk +++ b/textproc/libxml/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.12 2002/07/14 02:09:38 rh Exp $ +# $NetBSD: buildlink.mk,v 1.13 2002/08/25 18:40:10 jlam Exp $ # # This Makefile fragment is included by packages that use libxml. # diff --git a/textproc/libxml/buildlink2.mk b/textproc/libxml/buildlink2.mk new file mode 100644 index 00000000000..aeb062f59c0 --- /dev/null +++ b/textproc/libxml/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:10 jlam Exp $ + +.if !defined(LIBXML_BUILDLINK2_MK) +LIBXML_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libxml +BUILDLINK_DEPENDS.libxml?= libxml>=1.8.11 +BUILDLINK_PKGSRCDIR.libxml?= ../../textproc/libxml + +EVAL_PREFIX+= BUILDLINK_PREFIX.libxml=libxml +BUILDLINK_PREFIX.libxml_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libxml= include/gnome-xml/* +BUILDLINK_FILES.libxml+= lib/libxml.* +BUILDLINK_FILES.libxml+= lib/xmlConf.sh + +.include "../../devel/zlib/buildlink2.mk" + +BUILDLINK_TARGETS+= libxml-buildlink + +libxml-buildlink: _BUILDLINK_USE + +.endif # LIBXML_BUILDLINK2_MK diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 05346c81d0f..140719b74f0 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/07/12 15:45:02 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2002/08/25 18:40:10 jlam Exp $ DISTNAME= libxml2-${LIBXML_VERSION} CATEGORIES= textproc @@ -8,7 +8,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://xmlsoft.org/ COMMENT= XML parser library for GNOME -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -17,10 +17,11 @@ LIBXML_VERSION= 2.4.23 PLIST_SUBST+= LIBXML_VERSION=${LIBXML_VERSION} GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ARGS+= --without-python -.include "../../devel/zlib/buildlink.mk" -.include "../../converters/libiconv/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../converters/libiconv/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST index 333db665582..1d37b217fb2 100644 --- a/textproc/libxml2/PLIST +++ b/textproc/libxml2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2002/07/12 15:45:02 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2002/08/25 18:40:11 jlam Exp $ bin/xml2-config bin/xmlcatalog bin/xmllint diff --git a/textproc/libxml2/buildlink2.mk b/textproc/libxml2/buildlink2.mk new file mode 100644 index 00000000000..49e82707453 --- /dev/null +++ b/textproc/libxml2/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:11 jlam Exp $ + +.if !defined(LIBXML2_BUILDLINK2_MK) +LIBXML2_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libxml2 +BUILDLINK_DEPENDS.libxml2?= libxml2>=2.4.2 +BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2 + +EVAL_PREFIX+= BUILDLINK_PREFIX.libxml2=libxml2 +BUILDLINK_PREFIX.libxml2_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libxml2= include/libxml2/libxml/* +BUILDLINK_FILES.libxml2+= lib/libxml2.* +BUILDLINK_FILES.libxml2+= lib/xml2Conf.sh + +.include "../../devel/zlib/buildlink2.mk" +.include "../../converters/libiconv/buildlink2.mk" + +BUILDLINK_TARGETS+= libxml2-buildlink + +libxml2-buildlink: _BUILDLINK_USE + +.endif # LIBXML2_BUILDLINK2_MK diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index 1841d5b0e59..61f4e55ec46 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2002/07/12 15:45:02 wiz Exp $ +$NetBSD: distinfo,v 1.14 2002/08/25 18:40:11 jlam Exp $ SHA1 (libxml2-2.4.23.tar.gz) = a4e8ebc47b9e27de6486f280773e8c1ed9aecb5a Size (libxml2-2.4.23.tar.gz) = 2062657 bytes diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa index 4b9d0116e67..00a2b296d60 100644 --- a/textproc/libxml2/patches/patch-aa +++ b/textproc/libxml2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.9 2002/05/17 13:02:30 martti Exp $ +$NetBSD: patch-aa,v 1.10 2002/08/25 18:40:12 jlam Exp $ --- configure.orig Mon Apr 29 18:38:47 2002 +++ configure Fri May 17 14:51:28 2002 diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad index 300b081a74c..33d5c79a689 100644 --- a/textproc/libxml2/patches/patch-ad +++ b/textproc/libxml2/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.5 2002/05/17 13:02:30 martti Exp $ +$NetBSD: patch-ad,v 1.6 2002/08/25 18:40:12 jlam Exp $ --- doc/Makefile.in.orig Mon Apr 29 18:39:10 2002 +++ doc/Makefile.in Fri May 17 14:51:51 2002 diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 1e21275a368..bf7ad40405f 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/08/22 11:17:33 martti Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 18:40:13 jlam Exp $ DISTNAME= libxslt-1.0.19 PKGNAME= ${DISTNAME} @@ -7,19 +7,21 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/libxslt/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://xmlsoft.org/ -COMMENT= Xslt parser library for GNOME +COMMENT= XSLT parser library for GNOME -USE_BUILDLINK_ONLY= yes +BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.10 + +USE_BUILDLINK2= yes USE_GMAKE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.17 -.include "../../textproc/libxml2/buildlink.mk" -.include "../../lang/perl5/buildlink.mk" +.include "../../textproc/libxml2/buildlink2.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libxslt/buildlink2.mk b/textproc/libxslt/buildlink2.mk new file mode 100644 index 00000000000..ce09e46c9ad --- /dev/null +++ b/textproc/libxslt/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:13 jlam Exp $ + +.if !defined(LIBXSLT_BUILDLINK2_MK) +LIBXSLT_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libxslt +BUILDLINK_DEPENDS.libxslt?= libxslt>=1.0.7 +BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt + +EVAL_PREFIX+= BUILDLINK_PREFIX.libxslt=libxslt +BUILDLINK_PREFIX.libxslt_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libxslt= include/breakpoint/* +BUILDLINK_FILES.libxslt+= include/libexslt/* +BUILDLINK_FILES.libxslt+= include/libxslt/* +BUILDLINK_FILES.libxslt+= lib/libexslt.* +BUILDLINK_FILES.libxslt+= lib/libxslt.* +BUILDLINK_FILES.libxslt+= lib/libxsltbreakpoint.* +BUILDLINK_FILES.libxslt+= lib/xsltConf.sh + +.include "../../textproc/libxml2/buildlink2.mk" + +BUILDLINK_TARGETS+= libxslt-buildlink + +libxslt-buildlink: _BUILDLINK_USE + +.endif # LIBXSLT_BUILDLINK2_MK diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index d9e280c86bd..33a9168f258 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/01/01 03:11:18 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 18:40:14 jlam Exp $ DISTNAME= Sablot-0.71 PKGNAME= sablotron-0.71 @@ -9,12 +9,13 @@ MAINTAINER= uithuis@dds.nl HOMEPAGE= http://www.gingerall.com/charlie/ga/xml/p_sab.xml COMMENT= XML toolkit implementing XSLT, DOM, and XPath -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/tools/ltconfig -.include "../../converters/libiconv/buildlink.mk" -.include "../../textproc/expat/buildlink.mk" +.include "../../converters/libiconv/buildlink2.mk" +.include "../../textproc/expat/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/textproc/sablotron/buildlink2.mk b/textproc/sablotron/buildlink2.mk new file mode 100644 index 00000000000..5ef9f8c5643 --- /dev/null +++ b/textproc/sablotron/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:14 jlam Exp $ + +.if !defined(SABLOTRON_BUILDLINK2_MK) +SABLOTRON_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= sablotron +BUILDLINK_DEPENDS.sablotron?= sablotron>=0.71 +BUILDLINK_PKGSRCDIR.sablotron?= ../../textproc/sablotron + +EVAL_PREFIX+= BUILDLINK_PREFIX.sablotron=sablotron +BUILDLINK_PREFIX.sablotron_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.sablotron= include/sablot.h +BUILDLINK_FILES.sablotron+= include/sdom.h +BUILDLINK_FILES.sablotron+= include/shandler.h +BUILDLINK_FILES.sablotron+= include/sxpath.h +BUILDLINK_FILES.sablotron+= lib/libsablot.* + +.include "../../converters/libiconv/buildlink2.mk" +.include "../../textproc/expat/buildlink2.mk" + +BUILDLINK_TARGETS+= sablotron-buildlink + +sablotron-buildlink: _BUILDLINK_USE + +.endif # SABLOTRON_BUILDLINK2_MK diff --git a/textproc/sablotron/distinfo b/textproc/sablotron/distinfo index 56d06e487f3..edb7c6afc85 100644 --- a/textproc/sablotron/distinfo +++ b/textproc/sablotron/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/07/24 12:16:09 agc Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 18:40:14 jlam Exp $ SHA1 (Sablot-0.71.tar.gz) = 8da42bba936832941d4f077551d47c1d3393e6c4 Size (Sablot-0.71.tar.gz) = 274268 bytes diff --git a/textproc/sablotron/patches/patch-aa b/textproc/sablotron/patches/patch-aa index 2bf8c2ad4bc..048265e5255 100644 --- a/textproc/sablotron/patches/patch-aa +++ b/textproc/sablotron/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2002/07/24 11:16:27 agc Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:15 jlam Exp $ --- src/engine/Makefile.in 2002/07/24 11:00:26 1.1 +++ src/engine/Makefile.in 2002/07/24 11:01:31 diff --git a/textproc/sablotron/patches/patch-ab b/textproc/sablotron/patches/patch-ab index b55568fcf31..0b43597ea6d 100644 --- a/textproc/sablotron/patches/patch-ab +++ b/textproc/sablotron/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2002/07/24 12:16:09 agc Exp $ +$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:15 jlam Exp $ --- src/engine/Makefile.am 2002/07/24 12:13:41 1.1 +++ src/engine/Makefile.am 2002/07/24 12:14:28 diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 6c9b44e37d6..5c48814b174 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2002/03/13 17:37:48 fredb Exp $ +# $NetBSD: Makefile,v 1.26 2002/08/25 18:40:15 jlam Exp $ DISTNAME= WindowMaker-0.80.0 PKGNAME= windowmaker-0.80.0 @@ -12,16 +12,12 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.windowmaker.org/ COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone -BUILD_USES_MSGFMT= yes - -USE_BUILDLINK_ONLY= YES -REPLACE_BUILDLINK= WINGs/get-wings-flags -REPLACE_BUILDLINK+= WINGs/get-wutil-flags -REPLACE_BUILDLINK+= wrlib/get-wraster-flags +BUILD_USES_MSGFMT= YES +USE_BUILDLINK2= YES +USE_X11BASE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-usermenu \ --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale @@ -31,11 +27,6 @@ INSTALL_TARGET= install-strip .include "../../mk/bsd.prefs.mk" -# "egcs" has an optimizer problem on "arm32". -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" -CFLAGS= -.endif - # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options # to support. Currently supported options: # @@ -80,12 +71,17 @@ post-install: FAQ FAQ.I18N \ ${PREFIX}/share/doc/WindowMaker -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/hermes/buildlink.mk" -.include "../../graphics/libungif/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/hermes/buildlink2.mk" +.include "../../graphics/libungif/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" + +# "egcs" has an optimizer problem on "arm32". +.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" +CFLAGS:= -O0 +.endif diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST index e6098096b35..bf730c75689 100644 --- a/wm/windowmaker/PLIST +++ b/wm/windowmaker/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:30:04 seb Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 18:40:15 jlam Exp $ GNUstep/Apps/WPrefs.app/WPrefs GNUstep/Apps/WPrefs.app/WPrefs.tiff GNUstep/Apps/WPrefs.app/WPrefs.xpm diff --git a/wm/windowmaker/buildlink2.mk b/wm/windowmaker/buildlink2.mk new file mode 100644 index 00000000000..599722d8fca --- /dev/null +++ b/wm/windowmaker/buildlink2.mk @@ -0,0 +1,34 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:16 jlam Exp $ + +.if !defined(WINDOWMAKER_BUILDLINK2_MK) +WINDOWMAKER_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= windowmaker +BUILDLINK_DEPENDS.windowmaker?= windowmaker>=0.80.0nb1 +BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker + +EVAL_PREFIX+= BUILDLINK_PREFIX.windowmaker=windowmaker +BUILDLINK_PREFIX.windowmaker_DEFAULT= ${X11PREFIX} + +BUILDLINK_FILES.windowmaker= include/WINGs/* +BUILDLINK_FILES.windowmaker+= include/WMaker.h +BUILDLINK_FILES.windowmaker+= include/wraster.h +BUILDLINK_FILES.windowmaker+= lib/libExtraWINGs.a +BUILDLINK_FILES.windowmaker+= lib/libWINGs.a +BUILDLINK_FILES.windowmaker+= lib/libWMaker.a +BUILDLINK_FILES.windowmaker+= lib/libWUtil.a +BUILDLINK_FILES.windowmaker+= lib/libwraster.* + +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/hermes/buildlink2.mk" +.include "../../graphics/libungif/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + +BUILDLINK_TARGETS+= windowmaker-buildlink + +windowmaker-buildlink: _BUILDLINK_USE + +.endif # WINDOWMAKER_BUILDLINK2_MK diff --git a/www/apache/Makefile b/www/apache/Makefile index 965fef03d7e..82ef0c96559 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2002/08/01 00:58:33 mycroft Exp $ +# $NetBSD: Makefile,v 1.104 2002/08/25 18:40:16 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -36,7 +36,7 @@ COMMENT= Apache HTTP (Web) server CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]* EXTRACT_ONLY= ${DISTFILES:N*.gif} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES HAS_CONFIGURE= YES CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc" CONFIGURE_ARGS+= --enable-module=most \ @@ -48,7 +48,7 @@ CONFIGURE_ARGS+= --without-confadjust CONFIGURE_ARGS+= --with-perl=${PERL5} CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}" -CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_DIR}" +CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_PREFIX.libmm}" CONFIGURE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} .include "../../mk/bsd.prefs.mk" @@ -113,7 +113,7 @@ MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" .if (${OPSYS} == "SunOS") LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib -CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_DIR}/include/db2" +CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db2}/include/db2" CONFIGURE_ENV+= LIBS="-ldbm -ldb2" BUILDLINK_DEPENDS.db= db>=2.7.7 .include "../../databases/db/buildlink.mk" @@ -187,7 +187,8 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache -.include "../../devel/libmm/buildlink.mk" -.include "../../textproc/expat/buildlink.mk" +.include "../../devel/libmm/buildlink2.mk" +.include "../../textproc/expat/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/apache/PLIST b/www/apache/PLIST index b7c37dcfef4..fab804af501 100644 --- a/www/apache/PLIST +++ b/www/apache/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/06/20 17:12:37 taca Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/08/25 18:40:17 jlam Exp $ bin/checkgid bin/dbmmanage bin/htdigest diff --git a/www/apache/PLIST.shared b/www/apache/PLIST.shared index afcaaa7fe70..d8f6ea7d8fd 100644 --- a/www/apache/PLIST.shared +++ b/www/apache/PLIST.shared @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.shared,v 1.3 2002/07/30 18:40:14 wiz Exp $ +@comment $NetBSD: PLIST.shared,v 1.4 2002/08/25 18:40:17 jlam Exp $ lib/httpd/httpd.exp lib/httpd/mod_define.so lib/httpd/mod_proxy.so diff --git a/www/apache/buildlink2.mk b/www/apache/buildlink2.mk new file mode 100644 index 00000000000..f370d53398b --- /dev/null +++ b/www/apache/buildlink2.mk @@ -0,0 +1,33 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:17 jlam Exp $ + +.if !defined(APACHE_BUILDLINK2_MK) +APACHE_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= apache +BUILDLINK_DEPENDS.apache?= apache{,6}-1.3.* +BUILDLINK_PKGSRCDIR.apache?= ../../www/apache + +# For "apxs": +BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 +.if defined(APACHE_MODULE) +BUILDLINK_DEPMETHOD.apache?= full +.else +BUILDLINK_DEPMETHOD.apache?= build +.endif + +EVAL_PREFIX+= BUILDLINK_PREFIX.apache=apache +BUILDLINK_PREFIX.apache_DEFAULT= ${LOCALBASE} + +BUILDLINK_FILES.apache= include/httpd/*/*.[ch] +BUILDLINK_FILES.apache+= include/httpd/*.[ch] + +BUILDLINK_TARGETS+= apache-buildlink + +APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs +.if defined(GNU_CONFIGURE) +CONFIGURE_ARGS+= --with-apxs="${APXS}" +.endif + +apache-buildlink: _BUILDLINK_USE + +.endif # APACHE_BUILDLINK2_MK diff --git a/www/apache/distinfo b/www/apache/distinfo index d07d4a48d57..fb0883bf773 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2002/06/24 16:26:19 taca Exp $ +$NetBSD: distinfo,v 1.22 2002/08/25 18:40:18 jlam Exp $ SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f Size (apache_1.3.26.tar.gz) = 2303147 bytes diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh index afe01833999..67879c0f02f 100644 --- a/www/apache/files/apache.sh +++ b/www/apache/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.20 2002/07/07 00:45:18 tv Exp $ +# $NetBSD: apache.sh,v 1.21 2002/08/25 18:40:18 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON diff --git a/www/apache/files/config.layout b/www/apache/files/config.layout index 78cd648c07a..0c17293071d 100644 --- a/www/apache/files/config.layout +++ b/www/apache/files/config.layout @@ -1,4 +1,4 @@ -# $NetBSD: config.layout,v 1.5 2002/07/30 18:40:14 wiz Exp $ +# $NetBSD: config.layout,v 1.6 2002/08/25 18:40:19 jlam Exp $ <Layout pkgsrc> prefix: @PREFIX@ diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa index 7b5809cd53e..ea099ea49b5 100644 --- a/www/apache/patches/patch-aa +++ b/www/apache/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.19 2002/06/20 17:12:37 taca Exp $ +$NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $ --- Makefile.tmpl.orig Fri Jun 21 02:02:43 2002 +++ Makefile.tmpl diff --git a/www/apache/patches/patch-ao b/www/apache/patches/patch-ao index f2ca851a12c..40a221d0ad9 100644 --- a/www/apache/patches/patch-ao +++ b/www/apache/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.1 2002/06/20 17:12:37 taca Exp $ +$NetBSD: patch-ao,v 1.2 2002/08/25 18:40:19 jlam Exp $ --- configure.orig Thu Jun 20 20:56:07 2002 +++ configure diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile index 933a32f4888..bec3d6255db 100644 --- a/www/libghttp/Makefile +++ b/www/libghttp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/06/30 09:59:50 zuntum Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 18:40:20 jlam Exp $ DISTNAME= libghttp-1.0.9 CATEGORIES= www gnome @@ -8,7 +8,7 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME http client library -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/www/libghttp/buildlink2.mk b/www/libghttp/buildlink2.mk new file mode 100644 index 00000000000..befd6555ef3 --- /dev/null +++ b/www/libghttp/buildlink2.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:20 jlam Exp $ + +.if !defined(LIBGHTTP_BUILDLINK2_MK) +LIBGHTTP_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libghttp +BUILDLINK_DEPENDS.libghttp?= libghttp>=1.0.9 +BUILDLINK_PKGSRCDIR.libghttp?= ../../www/libghttp + +EVAL_PREFIX+= BUILDLINK_PREFIX.libghttp=libghttp +BUILDLINK_PREFIX.libghttp_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libghttp= include/ghttp* +BUILDLINK_FILES.libghttp+= lib/libghttp.* + +BUILDLINK_TARGETS+= libghttp-buildlink + +libghttp-buildlink: _BUILDLINK_USE + +.endif # LIBGHTTP_BUILDLINK2_MK diff --git a/www/libwww/Makefile b/www/libwww/Makefile index 46bc7ef163b..ac6830e2c3d 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2002/08/07 15:56:22 fredb Exp $ +# $NetBSD: Makefile,v 1.36 2002/08/25 18:40:21 jlam Exp $ DISTNAME= w3c-libwww-5.3.2 PKGNAME= libwww-5.3.2 @@ -13,14 +13,14 @@ COMMENT= The W3C Reference Library BUILD_DEPENDS+= automake>=1.4:../../devel/automake -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_GMAKE= YES USE_LIBTOOL= YES USE_PERL5= build -GNU_CONFIGURE= yes +GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-zlib --with-regex --without-x -CONFIGURE_ARGS+= --with-ssl="${BUILDLINK_PREFIX.openssl}" +CONFIGURE_ARGS+= --with-ssl="${SSLBASE}" DOCDIR= ${PREFIX}/share/doc/libwww LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig @@ -31,6 +31,22 @@ pre-configure: ${LOCALBASE}/bin/automake && \ ${LOCALBASE}/bin/autoconf -.include "../../devel/zlib/buildlink.mk" -.include "../../security/openssl/buildlink.mk" +.include "../../mk/bsd.prefs.mk" + +# Include SOCKS firewall support +.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5) +.if ${USE_SOCKS} == 4 +.include "../../net/socks4/buildlink.mk" +CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a +CONFIGURE_ARGS+= --with-socks5=no +.else +.include "../../net/socks5/buildlink.mk" +CONFIGURE_ARGS+= --with-socks4=no +CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_prefix.socks5}/lib/libsocks5.a +.endif +.endif + +.include "../../devel/zlib/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/libwww/buildlink.mk b/www/libwww/buildlink.mk index e2e252eedba..b620fff587b 100644 --- a/www/libwww/buildlink.mk +++ b/www/libwww/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2002/07/15 14:39:21 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:40:21 jlam Exp $ # # This Makefile fragment is included by packages that use libwww. # diff --git a/www/libwww/buildlink2.mk b/www/libwww/buildlink2.mk new file mode 100644 index 00000000000..e77dbf5150a --- /dev/null +++ b/www/libwww/buildlink2.mk @@ -0,0 +1,45 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:22 jlam Exp $ + +.if !defined(LIBWWW_BUILDLINK2_MK) +LIBWWW_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libwww +BUILDLINK_DEPENDS.libwww?= libwww>=5.3.2nb2 +BUILDLINK_PKGSRCDIR.libwww?= ../../www/libwww + +EVAL_PREFIX+= BUILDLINK_PREFIX.libwww=libwww +BUILDLINK_PREFIX.libwww_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libwww= include/wwwconf.h +BUILDLINK_FILES.libwww+= include/w3c-libwww/* +BUILDLINK_FILES.libwww+= lib/libmd5.* +BUILDLINK_FILES.libwww+= lib/libpics.* +BUILDLINK_FILES.libwww+= lib/libwwwapp.* +BUILDLINK_FILES.libwww+= lib/libwwwcache.* +BUILDLINK_FILES.libwww+= lib/libwwwcore.* +BUILDLINK_FILES.libwww+= lib/libwwwdir.* +BUILDLINK_FILES.libwww+= lib/libwwwfile.* +BUILDLINK_FILES.libwww+= lib/libwwwftp.* +BUILDLINK_FILES.libwww+= lib/libwwwgopher.* +BUILDLINK_FILES.libwww+= lib/libwwwhttp.* +BUILDLINK_FILES.libwww+= lib/libwwwhtml.* +BUILDLINK_FILES.libwww+= lib/libwwwinit.* +BUILDLINK_FILES.libwww+= lib/libwwwmime.* +BUILDLINK_FILES.libwww+= lib/libwwwmux.* +BUILDLINK_FILES.libwww+= lib/libwwwnews.* +BUILDLINK_FILES.libwww+= lib/libwwwssl.* +BUILDLINK_FILES.libwww+= lib/libwwwstream.* +BUILDLINK_FILES.libwww+= lib/libwwwtelnet.* +BUILDLINK_FILES.libwww+= lib/libwwwtrans.* +BUILDLINK_FILES.libwww+= lib/libwwwutils.* +BUILDLINK_FILES.libwww+= lib/libwwwxml.* +BUILDLINK_FILES.libwww+= lib/libwwwzip.* +BUILDLINK_FILES.libwww+= lib/libxmlparse.* +BUILDLINK_FILES.libwww+= lib/libxmltok.* + +.include "../../devel/zlib/buildlink2.mk" + +BUILDLINK_TARGETS+= libwww-buildlink + +libwww-buildlink: _BUILDLINK_USE + +.endif # LIBWWW_BUILDLINK2_MK diff --git a/www/libwww/distinfo b/www/libwww/distinfo index 75a9e5def45..8db016f4bbb 100644 --- a/www/libwww/distinfo +++ b/www/libwww/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/08/07 15:56:23 fredb Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:40:22 jlam Exp $ SHA1 (w3c-libwww-5.3.2.tar.gz) = c50f3624889b3a0ebc720264a1b9b64990457516 Size (w3c-libwww-5.3.2.tar.gz) = 1956340 bytes diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-ah index b49fcc8a4cc..506d67faf0c 100644 --- a/www/libwww/patches/patch-ah +++ b/www/libwww/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.5 2002/08/07 15:56:24 fredb Exp $ +$NetBSD: patch-ah,v 1.6 2002/08/25 18:40:23 jlam Exp $ --- configure.in.orig Thu Dec 14 11:49:06 2000 +++ configure.in Tue Aug 28 17:09:57 2001 @@ -213,7 +213,12 @@ diff --git a/www/libwww/patches/patch-aj b/www/libwww/patches/patch-aj index ba756c65bc7..ccb68746dd4 100644 --- a/www/libwww/patches/patch-aj +++ b/www/libwww/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.2 2002/05/20 19:07:42 cjep Exp $ +$NetBSD: patch-aj,v 1.3 2002/08/25 18:40:23 jlam Exp $ --- acinclude.m4.orig Tue Aug 28 14:56:47 2001 +++ acinclude.m4 Tue Aug 28 14:58:27 2001 @@ -251,19 +251,6 @@ diff --git a/www/neon/Makefile b/www/neon/Makefile index 310b0de6dd7..cf579b3a883 100644 --- a/www/neon/Makefile +++ b/www/neon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/08/03 01:24:53 hubertf Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 18:40:23 jlam Exp $ DISTNAME= neon-0.21.3 CATEGORIES= www @@ -9,17 +9,18 @@ HOMEPAGE= http://www.webdav.org/neon/ COMMENT= HTTP and WebDAV client library USE_GMAKE= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --with-ssl -CONFIGURE_ARGS+= --enable-libxml +CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +CONFIGURE_ARGS+= --with-libxml1 CONFIGURE_ARGS+= --enable-shared -.include "../../devel/zlib/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/neon/PLIST b/www/neon/PLIST index de6103fe233..ae1b590e508 100644 --- a/www/neon/PLIST +++ b/www/neon/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/03 01:24:53 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:40:24 jlam Exp $ bin/neon-config include/neon/ne_207.h include/neon/ne_acl.h diff --git a/www/neon/buildlink2.mk b/www/neon/buildlink2.mk new file mode 100644 index 00000000000..02a5bea42e4 --- /dev/null +++ b/www/neon/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:24 jlam Exp $ + +.if !defined(NEON_BUILDLINK2_MK) +NEON_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= neon +BUILDLINK_DEPENDS.neon?= neon>=0.19.3 +BUILDLINK_PKGSRCDIR.neon?= ../../www/neon + +EVAL_PREFIX+= BUILDLINK_PREFIX.neon=neon +BUILDLINK_PREFIX.neon_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.neon= include/neon/* +BUILDLINK_FILES.neon+= lib/libneon.* + +.include "../../devel/zlib/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" + +BUILDLINK_TARGETS+= neon-buildlink + +neon-buildlink: _BUILDLINK_USE + +.endif # NEON_BUILDLINK2_MK diff --git a/www/neon/distinfo b/www/neon/distinfo index 059e8319a57..f4d2db7a732 100644 --- a/www/neon/distinfo +++ b/www/neon/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/08/03 01:24:53 hubertf Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 18:40:24 jlam Exp $ SHA1 (neon-0.21.3.tar.gz) = 42f72fc2ebb29d9b687d5549bdd81742689f4846 Size (neon-0.21.3.tar.gz) = 476601 bytes diff --git a/www/php4/Makefile b/www/php4/Makefile index 2f71cc052d1..940c1371380 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2002/02/28 06:14:46 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2002/08/25 18:40:25 jlam Exp $ PKGNAME= php-${PHP_BASE_VERS} PKGREVISION= # empty @@ -7,7 +7,7 @@ COMMENT= HTML-embedded scripting language CONFLICTS+= ap-php-4.0.3pl1 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "Makefile.php" diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module index 713a94a4bb5..5abebe016c0 100644 --- a/www/php4/Makefile.module +++ b/www/php4/Makefile.module @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.module,v 1.15 2002/03/01 22:51:42 jlam Exp $ +# $NetBSD: Makefile.module,v 1.16 2002/08/25 18:40:25 jlam Exp $ # # This Makefile is provided to ease creating PHP4 packages for the extension # modules distributed in the PHP4 sources. @@ -23,6 +23,7 @@ EXTRACT_ELEMENTS?= ${DISTNAME}/ext/${PKGMODNAME} WRKSRC?= ${WRKDIR}/${EXTRACT_ELEMENTS} PHPIZE?= ${BUILDLINK_PREFIX.php4}/bin/phpize +PHP_CONFIG?= ${BUILDLINK_PREFIX.php4}/bin/php-config GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-php-config=${PHP_CONFIG} @@ -55,4 +56,4 @@ do-module-install: ${INSTALL_DATA} ${MODULESDIR}/${PKGMODNAME}.so \ ${PREFIX}/${PHP_EXTENSION_DIR} -.include "../../www/php4/buildlink.mk" +.include "../../www/php4/buildlink2.mk" diff --git a/www/php4/buildlink2.mk b/www/php4/buildlink2.mk new file mode 100644 index 00000000000..2168f363054 --- /dev/null +++ b/www/php4/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:25 jlam Exp $ + +.if !defined(PHP4_BUILDLINK2_MK) +PHP4_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= php4 +BUILDLINK_DEPENDS.php4?= php>=4.1.0 +BUILDLINK_PKGSRCDIR.php4?= ../../www/php4 + +# This adds a build-dependency as php4 has no libraries. +BUILDLINK_DEPMETHOD.php4?= build + +EVAL_PREFIX+= BUILDLINK_PREFIX.php4=php +BUILDLINK_PREFIX.php4_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.php4= include/php/*/*/*.h +BUILDLINK_FILES.php4+= include/php/*/*.h +BUILDLINK_FILES.php4+= include/php/*.h + +BUILDLINK_TARGETS+= php4-buildlink + +php4-buildlink: _BUILDLINK_USE + +.endif # PHP4_BUILDLINK2_MK diff --git a/www/php4/distinfo b/www/php4/distinfo index 6c2e5ae17ab..7ccb6d669ea 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2002/02/28 06:14:46 jlam Exp $ +$NetBSD: distinfo,v 1.9 2002/08/25 18:40:26 jlam Exp $ SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 Size (php-4.1.2.tar.gz) = 3359964 bytes SHA1 (patch-aa) = 08f98c6b41c24a2aa8fa417bba50cf0cb5f711af SHA1 (patch-ac) = 9478c18dbe18e8c4c05dffce31fa3f923562c832 -SHA1 (patch-ad) = 3b90e5c60493689cfad5ea3563f19d03b7b3f354 +SHA1 (patch-ad) = 4ac02d0e0e5bd612254020d46292534a0e9445b0 SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78 SHA1 (patch-af) = 34ec060ed3cdbcfc44286323f85f9938a79b0444 SHA1 (patch-ag) = 91e84f6d6862a328d3f66f87260e8f2b2953fc11 diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad index 3cf81567ff7..58d6848539e 100644 --- a/www/php4/patches/patch-ad +++ b/www/php4/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.7 2002/02/28 06:14:47 jlam Exp $ +$NetBSD: patch-ad,v 1.8 2002/08/25 18:40:26 jlam Exp $ --- configure.orig Wed Feb 27 04:18:32 2002 +++ configure @@ -45,6 +45,15 @@ $NetBSD: patch-ad,v 1.7 2002/02/28 06:14:47 jlam Exp $ echo "$ac_t""no" 1>&6 fi +@@ -58680,7 +58662,7 @@ + + TSRM_LIB='TSRM/libtsrm.la' + TSRM_DIR=TSRM +-CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/TSRM" ++INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" + + if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then + cat >> confdefs.h <<\EOF @@ -63418,7 +63400,7 @@ if test "$enable_debug" != "yes"; then diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile index 9fbf620c81f..d9c51cc3abb 100644 --- a/x11/Xbae/Makefile +++ b/x11/Xbae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/04/17 03:03:07 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 18:40:27 jlam Exp $ # DISTNAME= Xbae-4.9.1 @@ -9,14 +9,14 @@ MAINTAINER= drochner@netbsd.org HOMEPAGE= http://www.lesstif.org/Xbae.html COMMENT= Motif-compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-motif-includes=${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= --with-motif-libraries=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --with-motif-includes=${MOTIFBASE}/include +CONFIGURE_ARGS+= --with-motif-libraries=${MOTIFBASE}/lib PLIST_SUBST+= LOCALBASE=${LOCALBASE} post-install: @@ -26,6 +26,5 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/ac_find_xbae.m4 \ ${LOCALBASE}/share/aclocal/ac_find_xbae.m4 -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xbae/buildlink2.mk b/x11/Xbae/buildlink2.mk new file mode 100644 index 00000000000..9a795ad90b0 --- /dev/null +++ b/x11/Xbae/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:28 jlam Exp $ + +.if !defined(XBAE_BUILDLINK2_MK) +XBAE_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= Xbae +BUILDLINK_DEPENDS.Xbae?= Xbae>=4.8.4 +BUILDLINK_PKGSRCDIR.Xbae?= ../../x11/Xbae + +EVAL_PREFIX+= BUILDLINK_PREFIX.Xbae=Xbae +BUILDLINK_PREFIX.Xbae_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.Xbae= include/Xbae/* +BUILDLINK_FILES.Xbae+= lib/libXbae.* + +.include "../../mk/motif.buildlink2.mk" + +BUILDLINK_TARGETS+= Xbae-buildlink + +Xbae-buildlink: _BUILDLINK_USE + +.endif # XBAE_BUILDLINK2_MK diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 03202b2d027..f8e0d9be09c 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/10/24 22:11:12 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2002/08/25 18:40:29 jlam Exp $ # DISTNAME= ${PKGNAME}-source @@ -21,15 +21,14 @@ COMMENT= Fast Light Tool Kit for graphical user interfaces USE_X11BASE= # defined USE_GMAKE= # defined USE_LIBTOOL= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL} +CONFIGURE_ARGS+= --enable-libtool=${PKGLIBTOOL} test: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test -.include "../../graphics/Mesa/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/Mesa/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/buildlink2.mk b/x11/fltk/buildlink2.mk new file mode 100644 index 00000000000..16ede3b1e94 --- /dev/null +++ b/x11/fltk/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:29 jlam Exp $ + +.if !defined(FLTK_BUILDLINK2_MK) +FLTK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= fltk +BUILDLINK_DEPENDS.fltk?= fltk>=1.0.9 +BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk + +EVAL_PREFIX+= BUILDLINK_PREFIX.fltk=fltk +BUILDLINK_PREFIX.fltk_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.fltk= include/FL/* +BUILDLINK_FILES.fltk+= lib/libfltk.* + +.include "../../graphics/Mesa/buildlink2.mk" + +BUILDLINK_TARGETS+= fltk-buildlink + +fltk-buildlink: _BUILDLINK_USE + +.endif # FLTK_BUILDLINK2_MK diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index dc077480d53..0e2b2ce2af7 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2002/03/24 19:53:40 rh Exp $ +# $NetBSD: Makefile,v 1.77 2002/08/25 18:40:30 jlam Exp $ DISTNAME= gnome-libs-1.4.1.4 CATEGORIES= x11 gnome @@ -23,7 +23,7 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ X11BASE=${X11BASE} \ PKGLOCALEDIR=${PKGLOCALEDIR} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES LOCALSTATEDIR= /var/gnome PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ @@ -33,9 +33,9 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -.include "../../databases/db/buildlink.mk" +. include "../../databases/db/buildlink2.mk" -CPPFLAGS+= -I${BUILDLINK_DIR}/include/db2 +CPPFLAGS+= -I${BUILDLINK_PREFIX.db}/include/db2 pre-configure: ${MV} ${WRKSRC}/configure ${WRKSRC}/configure-pre-db-sub && \ @@ -63,11 +63,11 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \ ${LOCALBASE}/share/aclocal/libart.m4 -.include "../../audio/esound/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../net/ORBit/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../audio/esound/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../net/ORBit/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-libs/PLIST b/x11/gnome-libs/PLIST index add4dcc2008..3ad23a5e873 100644 --- a/x11/gnome-libs/PLIST +++ b/x11/gnome-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2002/07/01 10:10:00 agc Exp $ +@comment $NetBSD: PLIST,v 1.8 2002/08/25 18:40:30 jlam Exp $ bin/dns-helper bin/gconfigger bin/gnome-bug diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk index b9c99f98f16..9766a2e235b 100644 --- a/x11/gnome-libs/buildlink.mk +++ b/x11/gnome-libs/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.17 2002/07/14 01:19:15 rh Exp $ +# $NetBSD: buildlink.mk,v 1.18 2002/08/25 18:40:31 jlam Exp $ # # This Makefile fragment is included by packages that use gnome-libs. # diff --git a/x11/gnome-libs/buildlink2.mk b/x11/gnome-libs/buildlink2.mk new file mode 100644 index 00000000000..2d45f1405fe --- /dev/null +++ b/x11/gnome-libs/buildlink2.mk @@ -0,0 +1,41 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:31 jlam Exp $ + +.if !defined(GNOME_LIBS_BUILDLINK2_MK) +GNOME_LIBS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= gnome-libs +BUILDLINK_DEPENDS.gnome-libs?= gnome-libs>=1.4.1.4 +BUILDLINK_PKGSRCDIR.gnome-libs?= ../../x11/gnome-libs + +EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-libs=gnome-libs +BUILDLINK_PREFIX.gnome-libs_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.gnome-libs= include/gnome-1.0/gnome.h +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/gtk-xmhtml/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/libart_lgpl/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/libgnome/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/libgnomeui/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/libgnorba/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/popt-gnome.h +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/zvt/* +BUILDLINK_FILES.gnome-libs+= lib/gnome-libs/*/* +BUILDLINK_FILES.gnome-libs+= lib/libart_lgpl.* +BUILDLINK_FILES.gnome-libs+= lib/libgnome.* +BUILDLINK_FILES.gnome-libs+= lib/libgnomesupport.* +BUILDLINK_FILES.gnome-libs+= lib/libgnomeui.* +BUILDLINK_FILES.gnome-libs+= lib/libgnorba.* +BUILDLINK_FILES.gnome-libs+= lib/libgnorbagtk.* +BUILDLINK_FILES.gnome-libs+= lib/libgtkxmhtml.* +BUILDLINK_FILES.gnome-libs+= lib/libzvt.* + +.include "../../audio/esound/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../net/ORBit/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + +BUILDLINK_TARGETS+= gnome-libs-buildlink + +gnome-libs-buildlink: _BUILDLINK_USE + +.endif # GNOME_LIBS_BUILDLINK2_MK diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo index a41390daa47..2c9f94092e5 100644 --- a/x11/gnome-libs/distinfo +++ b/x11/gnome-libs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.13 2002/08/01 13:25:54 tron Exp $ +$NetBSD: distinfo,v 1.14 2002/08/25 18:40:31 jlam Exp $ SHA1 (gnome-libs-1.4.1.4.tar.gz) = 3315752f9d4e8392c5e7b902d45cc7b795cdd63a Size (gnome-libs-1.4.1.4.tar.gz) = 3631342 bytes -SHA1 (patch-aa) = ed906dfe8164bacabbe4f2922eecd10125a76b26 +SHA1 (patch-aa) = bcc6ba3d4375a38fe8b515725aff4903e6df1be7 SHA1 (patch-ab) = 13a6c8c58a1acfb61150d13408fa260a82f49484 SHA1 (patch-ac) = 601cb8850ab9497fb9ab25843d1e9fd47306256e SHA1 (patch-ad) = 10e46c8965137c8c0a3acf177898ca07fb4c90fa diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa index 147f0413f3b..ecd77adabf0 100644 --- a/x11/gnome-libs/patches/patch-aa +++ b/x11/gnome-libs/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.16 2002/03/24 19:53:42 rh Exp $ +$NetBSD: patch-aa,v 1.17 2002/08/25 18:40:32 jlam Exp $ --- configure.orig Tue Jan 22 14:35:12 2002 +++ configure @@ -12,8 +12,8 @@ $NetBSD: patch-aa,v 1.16 2002/03/24 19:53:42 rh Exp $ - GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/\(-L[^ ]*\) .*$/\1/' -e 's/^.*\(-L[^ ]*\)$/\1/'` -fi -GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`" -+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`" -+GLIB_LIBS="`$GLIB_CONFIG --libs`" ++GLIB_CFLAGS="`glib-config --cflags`" ++GLIB_LIBS="`glib-config --libs`" +GLIB_LDFLAGS="$GLIB_LIBS" diff --git a/x11/gnome-libs/patches/patch-ac b/x11/gnome-libs/patches/patch-ac index 1159a9fd0a8..a4a70c0fb88 100644 --- a/x11/gnome-libs/patches/patch-ac +++ b/x11/gnome-libs/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.12 2002/08/01 13:25:55 tron Exp $ +$NetBSD: patch-ac,v 1.13 2002/08/25 18:40:32 jlam Exp $ --- zvt/subshell-includes.h.orig Fri Jun 15 02:04:52 2001 +++ zvt/subshell-includes.h Thu Aug 1 15:15:35 2002 diff --git a/x11/gnome-libs/patches/patch-az b/x11/gnome-libs/patches/patch-az index 371c60d66ae..f57724934cc 100644 --- a/x11/gnome-libs/patches/patch-az +++ b/x11/gnome-libs/patches/patch-az @@ -1,4 +1,4 @@ -$NetBSD: patch-az,v 1.1 2002/07/01 10:10:01 agc Exp $ +$NetBSD: patch-az,v 1.2 2002/08/25 18:40:32 jlam Exp $ --- libart_lgpl/doc/Makefile.in 2002/06/28 10:35:09 1.1 +++ libart_lgpl/doc/Makefile.in 2002/06/28 10:35:23 diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 3b1e833f836..da0b6a161f6 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2002/08/13 14:53:31 tron Exp $ +# $NetBSD: Makefile,v 1.75 2002/08/25 18:40:33 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 3 @@ -14,7 +14,7 @@ COMMENT= Gimp toolkit. Libraries for building X11 user interfaces BUILD_USES_MSGFMT= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_PERL5= build USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -35,7 +35,7 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} # The following ensures that `gtk-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= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib GTK_VERSION= ${DISTNAME:S/gtk+-//} GTK_MAJOR_VERSION= ${GTK_VERSION:C/\..*//} @@ -65,8 +65,7 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \ ${LOCALBASE}/share/aclocal/gtk.m4 -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/glib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST index cfb90b9903e..e99bb0b7090 100644 --- a/x11/gtk/PLIST +++ b/x11/gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/08/01 09:32:16 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/08/25 18:40:33 jlam Exp $ bin/gtk-config share/gtk/gtkrc.az share/gtk/gtkrc.be diff --git a/x11/gtk/buildlink2.mk b/x11/gtk/buildlink2.mk new file mode 100644 index 00000000000..78b57d90d49 --- /dev/null +++ b/x11/gtk/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:33 jlam Exp $ + +.if !defined(GTK_BUILDLINK2_MK) +GTK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= gtk +BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.8 +BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk + +EVAL_PREFIX+= BUILDLINK_PREFIX.gtk=gtk +BUILDLINK_PREFIX.gtk_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.gtk= include/gdk/* +BUILDLINK_FILES.gtk+= include/gtk/* +BUILDLINK_FILES.gtk+= include/gtk-*/*/* +BUILDLINK_FILES.gtk+= lib/libgdk.* +BUILDLINK_FILES.gtk+= lib/libgtk.* + +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib/buildlink2.mk" + +BUILDLINK_TARGETS+= gtk-buildlink + +gtk-buildlink: _BUILDLINK_USE + +.endif # GTK_BUILDLINK2_MK diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo index fdd41e3ad09..660a4a5112c 100644 --- a/x11/gtk/distinfo +++ b/x11/gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/07/18 02:19:33 rh Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 18:40:34 jlam Exp $ SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c Size (gtk+-1.2.10.tar.gz) = 2868322 bytes diff --git a/x11/gtk/patches/patch-ag b/x11/gtk/patches/patch-ag index 8c3c29016f5..3cf44e21680 100644 --- a/x11/gtk/patches/patch-ag +++ b/x11/gtk/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2002/07/18 02:19:34 rh Exp $ +$NetBSD: patch-ag,v 1.2 2002/08/25 18:40:34 jlam Exp $ --- gdk.pc.in.orig Thu Nov 30 11:18:35 2000 +++ gdk.pc.in diff --git a/x11/gtk/patches/patch-ah b/x11/gtk/patches/patch-ah index 3f01b379916..083a051d8d5 100644 --- a/x11/gtk/patches/patch-ah +++ b/x11/gtk/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2002/07/18 02:19:35 rh Exp $ +$NetBSD: patch-ah,v 1.2 2002/08/25 18:40:35 jlam Exp $ --- gtk+.pc.in.orig Thu Nov 30 11:18:35 2000 +++ gtk+.pc.in diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 14f35a50e95..92946b66435 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2002/08/15 08:38:33 skrll Exp $ +# $NetBSD: Makefile,v 1.39 2002/08/25 18:40:35 jlam Exp $ DISTNAME= kdelibs-2.2.2 PKGREVISION= 2 @@ -7,14 +7,14 @@ COMMENT= Support libraries for the KDE integrated X11 desktop .include "../../x11/kde2/Makefile.kde2" -BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.8 +BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.8 BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9 BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096} -CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_DIR}" +CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" .if (${MACHINE_ARCH} == "arm32") BROKEN= Compilation causes arm32 machines to hang @@ -28,22 +28,9 @@ LIBS+= -Wl,--export-dynamic GCC_VERSION!= gcc --version .if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha) -.include "../../lang/gcc/Makefile.gcc" +. include "../../lang/gcc/Makefile.gcc" .endif -# Override KDE_INCLUDES and QT_INCLUDES at build-time since their values -# are used by reference within the kdelibs2 Makefiles -# -MAKE_FLAGS+= KDE_INCLUDES="-I${BUILDLINK_DIR}/include" -MAKE_FLAGS+= QT_INCLUDES="-I${BUILDLINK_QTDIR}/include" - -# The configure script looks for xml2-config in the environment as -# ${XML_CONFIG}, not as ${XML2_CONFIG} like it's supposed to. -# -CONFIGURE_ENV+= XML_CONFIG="${XML2_CONFIG}" -KDEDIR= ${PREFIX} -BUILDLINK_KDEDIR= ${BUILDLINK_DIR} - REPLACE_PERL= \ ${WRKSRC}/kio/proxytype.pl \ ${WRKSRC}/kio/useragent.pl @@ -52,7 +39,7 @@ PLIST_SRC= ${WRKDIR}/PLIST UNLIMIT_RESOURCES= datasize .if defined(USE_CUPS) && (${USE_CUPS} == "YES") -.include "../../print/cups/buildlink.mk" +. include "../../print/cups/buildlink2.mk" BUILD_DEFS+= USE_CUPS PLIST_SUBST+= CUPS= @@ -106,27 +93,29 @@ post-install: ${ECHO} "@dirrm share/kde"; \ ) > ${PLIST_SRC} -.include "../../archivers/bzip2/buildlink.mk" -.include "../../audio/libaudiofile/buildlink.mk" -.include "../../devel/pcre/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../lang/perl5/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../textproc/libxml2/buildlink.mk" -.include "../../textproc/libxslt/buildlink.mk" -.include "../../x11/kde2/buildlink.mk" -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/ossaudio.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../archivers/bzip2/buildlink2.mk" +.include "../../audio/libaudiofile/buildlink2.mk" +.include "../../devel/pcre/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" +.include "../../textproc/libxslt/buildlink2.mk" +.include "../../x11/kde2/buildlink2.mk" +.include "../../x11/qt2-libs/buildlink2.mk" +.include "../../mk/ossaudio.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" # XXX On NetBSD, the egcs and gcc-2.95.3 for: # XXX # XXX alpha # XXX -# XXX has an optimization bug when compiling with -O2 that is tickled by -# XXX ${WRKSRC}/kdeprint/management/kmiconview.cpp. -# XXX ${WRKSRC}/kdecore/kwinmodule.cpp +# XXX have an optimization bug when compiling with -O2 that is tickled by: +# XXX +# XXX ${WRKSRC}/kdeprint/management/kmiconview.cpp +# XXX ${WRKSRC}/kdecore/kwinmodule.cpp +# .if ${OPSYS} == "NetBSD" . if (${MACHINE_ARCH} == "alpha") CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*//g} diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk index 0a7a4a75177..6c970f5d327 100644 --- a/x11/kdelibs2/buildlink.mk +++ b/x11/kdelibs2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.21 2002/08/15 08:48:08 skrll Exp $ +# $NetBSD: buildlink.mk,v 1.22 2002/08/25 18:40:35 jlam Exp $ # # This Makefile fragment is included by packages that use kdelibs2. # diff --git a/x11/kdelibs2/buildlink2.mk b/x11/kdelibs2/buildlink2.mk new file mode 100644 index 00000000000..28c6bb286fe --- /dev/null +++ b/x11/kdelibs2/buildlink2.mk @@ -0,0 +1,36 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:36 jlam Exp $ + +.if !defined(KDELIBS2_BUILDLINK2_MK) +KDELIBS2_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_PACKAGES+= kdelibs2 +BUILDLINK_DEPENDS.kdelibs2?= kdelibs>=2.2.2nb2 +BUILDLINK_PKGSRCDIR.kdelibs2?= ../../x11/kdelibs2 + +EVAL_PREFIX+= BUILDLINK_PREFIX.kdelibs2=kdelibs +BUILDLINK_PREFIX.kdelibs2_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.kdelibs2!= ${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdelibs2/PLIST + +KDEDIR= ${BUILDLINK_PREFIX.kdelibs2} + +BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9 +BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2 +USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096} + +.include "../../audio/libaudiofile/buildlink2.mk" +.include "../../devel/pcre/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../x11/qt2-libs/buildlink2.mk" +.include "../../mk/ossaudio.buildlink2.mk" + +.if defined(USE_CUPS) && (${USE_CUPS} == "YES") +.include "../../print/cups/buildlink2.mk" +.endif + +BUILDLINK_TARGETS+= kdelibs2-buildlink + +kdelibs2-buildlink: _BUILDLINK_USE + +.endif # KDELIBS2_BUILDLINK2_MK diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo index 4672e7b5b2d..74ee881ce9d 100644 --- a/x11/kdelibs2/distinfo +++ b/x11/kdelibs2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2002/08/16 12:21:53 tron Exp $ +$NetBSD: distinfo,v 1.20 2002/08/25 18:40:36 jlam Exp $ SHA1 (kdelibs-2.2.2.tar.bz2) = 6ae1096ffb547f317adca6b29cb9ce9dcaf1863c Size (kdelibs-2.2.2.tar.bz2) = 5955592 bytes diff --git a/x11/kdelibs2/patches/patch-bt b/x11/kdelibs2/patches/patch-bt index a764b508680..c6e4cc777ab 100644 --- a/x11/kdelibs2/patches/patch-bt +++ b/x11/kdelibs2/patches/patch-bt @@ -1,4 +1,4 @@ -$NetBSD: patch-bt,v 1.2 2002/08/15 08:38:34 skrll Exp $ +$NetBSD: patch-bt,v 1.3 2002/08/25 18:40:36 jlam Exp $ --- kssl/kopenssl.cc.orig Wed Sep 5 00:08:18 2001 +++ kssl/kopenssl.cc diff --git a/x11/kdelibs2/patches/patch-bw b/x11/kdelibs2/patches/patch-bw index 91ef000444c..a35e06e119f 100644 --- a/x11/kdelibs2/patches/patch-bw +++ b/x11/kdelibs2/patches/patch-bw @@ -1,4 +1,4 @@ -$NetBSD: patch-bw,v 1.2 2002/08/15 08:38:34 skrll Exp $ +$NetBSD: patch-bw,v 1.3 2002/08/25 18:40:37 jlam Exp $ --- kssl/ksslcertificate.cc.orig Thu Aug 15 09:25:29 2002 +++ kssl/ksslcertificate.cc diff --git a/x11/kdelibs2/patches/patch-by b/x11/kdelibs2/patches/patch-by index fc074b8100d..ac5ffa28dcf 100644 --- a/x11/kdelibs2/patches/patch-by +++ b/x11/kdelibs2/patches/patch-by @@ -1,4 +1,4 @@ -$NetBSD: patch-by,v 1.1 2002/08/15 08:38:34 skrll Exp $ +$NetBSD: patch-by,v 1.2 2002/08/25 18:40:37 jlam Exp $ --- kssl/kopenssl.h.orig Sun Jul 29 05:55:41 2001 +++ kssl/kopenssl.h diff --git a/x11/kdelibs2/patches/patch-bz b/x11/kdelibs2/patches/patch-bz index 8b7254a47ec..8767779b41c 100644 --- a/x11/kdelibs2/patches/patch-bz +++ b/x11/kdelibs2/patches/patch-bz @@ -1,4 +1,4 @@ -$NetBSD: patch-bz,v 1.1 2002/08/16 12:21:53 tron Exp $ +$NetBSD: patch-bz,v 1.2 2002/08/25 18:40:37 jlam Exp $ --- kdesu/kdesu_pty.cpp.orig Wed Apr 11 18:48:56 2001 +++ kdesu/kdesu_pty.cpp Fri Aug 16 14:19:18 2002 diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index c8bd1832464..c39b56611af 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.61 2001/10/03 10:03:54 jlam Exp $ +# $NetBSD: Makefile,v 1.62 2002/08/25 18:40:37 jlam Exp $ COMMENT= API compatible clone of the OSF/Motif toolkit CONFLICTS+= openmotif-[0-9]* -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined .include "Makefile.common" @@ -36,5 +36,4 @@ pre-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif/PLIST b/x11/lesstif/PLIST index 2031ab1c02f..9118d59c7ed 100644 --- a/x11/lesstif/PLIST +++ b/x11/lesstif/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/05/20 19:11:07 cjep Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:40:38 jlam Exp $ bin/mwm bin/mxmkmf bin/uil diff --git a/x11/lesstif/buildlink2.mk b/x11/lesstif/buildlink2.mk new file mode 100644 index 00000000000..ba8dc49c174 --- /dev/null +++ b/x11/lesstif/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:38 jlam Exp $ + +.if !defined(LESSTIF_BUILDLINK2_MK) +LESSTIF_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= lesstif +BUILDLINK_DEPENDS.lesstif?= lesstif>=0.91.4 +BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif + +EVAL_PREFIX+= BUILDLINK_PREFIX.lesstif=lesstif +BUILDLINK_PREFIX.lesstif_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.lesstif= include/Mrm/* +BUILDLINK_FILES.lesstif+= include/Xm/* +BUILDLINK_FILES.lesstif+= include/uil/* +BUILDLINK_FILES.lesstif+= lib/libMrm.* +BUILDLINK_FILES.lesstif+= lib/libUil.* +BUILDLINK_FILES.lesstif+= lib/libXm.* + +BUILDLINK_TARGETS+= lesstif-buildlink + +lesstif-buildlink: _BUILDLINK_USE + +.endif # LESSTIF_BUILDLINK2_MK diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile index 47bc8c5de45..ccee4a8ab66 100644 --- a/x11/lesstif12/Makefile +++ b/x11/lesstif12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/09/14 01:57:44 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 18:40:39 jlam Exp $ PKGNAME= lesstif12-${LESSTIF_VERSION} COMMENT= API compatible clone of the OSF/Motif toolkit, version 1.2 @@ -7,7 +7,7 @@ CONFLICTS+= lesstif-0.[0-8]* CONFLICTS+= lesstif-0.90* CONFLICTS+= lesstif-0.91 lesstif-0.91.[0-3] -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined .include "../lesstif/Makefile.common" @@ -22,5 +22,4 @@ CONFIGURE_ARGS+= --enable-default-12 post-install: ${RMDIR} -p ${PREFIX}/share/doc/html/lesstif 2> /dev/null || ${TRUE} -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif12/buildlink2.mk b/x11/lesstif12/buildlink2.mk new file mode 100644 index 00000000000..ed5ee4bbf33 --- /dev/null +++ b/x11/lesstif12/buildlink2.mk @@ -0,0 +1,24 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:39 jlam Exp $ + +.if !defined(LESSTIF12_BUILDLINK2_MK) +LESSTIF12_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= lesstif12 +BUILDLINK_DEPENDS.lesstif12?= lesstif12>=0.91.4 +BUILDLINK_PKGSRCDIR.lesstif12?= ../../x11/lesstif12 + +EVAL_PREFIX+= _LESSTIF12_PREFIX=lesstif12 +_LESSTIF12_PREFIX_DEFAULT= ${X11PREFIX} +BUILDLINK_PREFIX.lesstif12= ${_LESSTIF12_PREFIX}/LessTif/Motif1.2 +BUILDLINK_FILES.lesstif12= include/Mrm/* +BUILDLINK_FILES.lesstif12+= include/Xm/* +BUILDLINK_FILES.lesstif12+= include/uil/* +BUILDLINK_FILES.lesstif12+= lib/libMrm.* +BUILDLINK_FILES.lesstif12+= lib/libUil.* +BUILDLINK_FILES.lesstif12+= lib/libXm.* + +BUILDLINK_TARGETS+= lesstif12-buildlink + +lesstif12-buildlink: _BUILDLINK_USE + +.endif # LESSTIF12_BUILDLINK2_MK diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index dc9644ac051..b26c970554c 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/01/10 12:10:45 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 18:40:39 jlam Exp $ # FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp # OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp @@ -25,7 +25,7 @@ CONFLICTS+= lesstif-[0-9]* DIST_SUBDIR= openmotif WRKSRC= ${WRKDIR}/motif USE_X11BASE= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined ALL_TARGET= World DEINSTALL_TMPL= ${.CURDIR}/DEINSTALL @@ -105,6 +105,5 @@ post-install: ${INSTALL_MAN} $${file} ${PREFIX}/man/$${file}; \ done -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/openmotif/buildlink2.mk b/x11/openmotif/buildlink2.mk new file mode 100644 index 00000000000..64e67004677 --- /dev/null +++ b/x11/openmotif/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:40 jlam Exp $ + +.if !defined(OPENMOTIF_BUILDLINK2_MK) +OPENMOTIF_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= openmotif +BUILDLINK_DEPENDS.openmotif?= openmotif>=2.1.30 +BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif + +EVAL_PREFIX+= BUILDLINK_PREFIX.openmotif=openmotif +BUILDLINK_PREFIX.openmotif_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.openmotif= include/Mrm/* +BUILDLINK_FILES.openmotif+= include/Xm/* +BUILDLINK_FILES.openmotif+= include/uil/* +BUILDLINK_FILES.openmotif+= lib/libMrm.* +BUILDLINK_FILES.openmotif+= lib/libUil.* +BUILDLINK_FILES.openmotif+= lib/libXm.* + +BUILDLINK_TARGETS+= openmotif-buildlink + +openmotif-buildlink: _BUILDLINK_USE + +.endif # OPENMOTIF_BUILDLINK2_MK diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo index 0365b4fdcc8..0dec8634f5c 100644 --- a/x11/openmotif/distinfo +++ b/x11/openmotif/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/06/22 04:38:31 jlam Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:40:40 jlam Exp $ SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes diff --git a/x11/openmotif/patches/patch-ap b/x11/openmotif/patches/patch-ap index d77f040d844..eaf406f84c7 100644 --- a/x11/openmotif/patches/patch-ap +++ b/x11/openmotif/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.2 2002/06/22 04:38:31 jlam Exp $ +$NetBSD: patch-ap,v 1.3 2002/08/25 18:40:40 jlam Exp $ --- config/cf/NetBSD.cf.orig Sat Jun 22 00:09:12 2002 +++ config/cf/NetBSD.cf diff --git a/x11/openmotif/patches/patch-as b/x11/openmotif/patches/patch-as index 64a9fbdb628..eaf3628e1ab 100644 --- a/x11/openmotif/patches/patch-as +++ b/x11/openmotif/patches/patch-as @@ -1,4 +1,4 @@ -$NetBSD: patch-as,v 1.1 2002/06/22 04:38:32 jlam Exp $ +$NetBSD: patch-as,v 1.2 2002/08/25 18:40:41 jlam Exp $ --- config/cf/Imake.cf.orig Sat Jun 22 00:09:11 2002 +++ config/cf/Imake.cf diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile index fa8555e395c..46e6ff51fcd 100644 --- a/x11/qt2-designer-kde/Makefile +++ b/x11/qt2-designer-kde/Makefile @@ -1,32 +1,32 @@ -# $NetBSD: Makefile,v 1.10 2002/03/14 13:57:53 tron Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 18:40:42 jlam Exp $ # -.include "../qt2-libs/Makefile.common" - PKGNAME= qt2-designer-kde-${QTVERSION} PKGREVISION= 2 COMMENT= Visual (WYSIWYG) QT GUI builder with KDE widget support CONFLICTS+= qt2-designer-[0-9]* -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2 +.include "../qt2-libs/Makefile.common" + CONFIGURE_ARGS+= -kde -CONFIGURE_ENV+= QTDIR="${QTPREFIX}" \ - KDEDIR="${BUILDLINK_DIR}" -MAKE_ENV+= QTDIR=${QTPREFIX} \ - KDEDIR="${BUILDLINK_DIR}" +CONFIGURE_ENV+= KDEDIR="${KDEDIR}" +MAKE_ENV+= KDEDIR="${KDEDIR}" ALL_TARGET= sub-tools UNLIMIT_RESOURCES= datasize do-install: - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_DATA} \ + ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + +.include "../../x11/kdelibs2/buildlink2.mk" -.include "../../x11/kdelibs2/buildlink.mk" -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile index 8e55a32f581..98c9e278b27 100644 --- a/x11/qt2-designer/Makefile +++ b/x11/qt2-designer/Makefile @@ -1,7 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/03/13 17:38:01 fredb Exp $ -# - -.include "../qt2-libs/Makefile.common" +# $NetBSD: Makefile,v 1.17 2002/08/25 18:40:41 jlam Exp $ PKGNAME= qt2-designer-${QTVERSION} PKGREVISION= 2 @@ -9,15 +6,21 @@ COMMENT= Visual (WYSIWYG) QT GUI builder CONFLICTS+= qt2-designer-kde-[0-9]* -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2 +.include "../qt2-libs/Makefile.common" + ALL_TARGET= sub-tools do-install: - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_DATA} \ + ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + +.include "../../x11/qt2-libs/buildlink2.mk" -.include "../../x11/qt2-libs/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-designer/buildlink2.mk b/x11/qt2-designer/buildlink2.mk new file mode 100644 index 00000000000..7f7f743e1d2 --- /dev/null +++ b/x11/qt2-designer/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:41 jlam Exp $ + +.if !defined(QT2_DESIGNER_BUILDLINK2_MK) +QT2_DESIGNER_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= qt2-designer +BUILDLINK_DEPENDS.qt2-designer?= \ + {qt2-designer>=2.3.1nb2,qt2-designer-kde>=2.3.1nb2} +BUILDLINK_PKGSRCDIR.qt2-designer?= ../../x11/qt2-designer + +EVAL_PREFIX+= BUILDLINK_PREFIX.qt2-designer=qt2-designer +BUILDLINK_PREFIX.qt2-designer_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.qt2-designer= qt2/bin/designer +BUILDLINK_FILES.qt2-designer+= qt2/bin/uic +BUILDLINK_FILES.qt2-designer+= qt2/lib/libqutil.* + +.include "../../x11/qt2-libs/buildlink2.mk" + +CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic" +MAKE_ENV+= UIC="${QTDIR}/bin/uic" + +BUILDLINK_TARGETS+= qt2-designer-buildlink + +qt2-designer-buildlink: _BUILDLINK_USE + +.endif # QT2_DESIGNER_BUILDLINK2_MK diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile index 26e206fb083..84f80f8c794 100644 --- a/x11/qt2-libs/Makefile +++ b/x11/qt2-libs/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.17 2002/03/13 17:38:02 fredb Exp $ -# -#USE_MESA= yes +# $NetBSD: Makefile,v 1.18 2002/08/25 18:40:42 jlam Exp $ -.include "../qt2-libs/Makefile.common" +PKGNAME= qt2-libs-${QTVERSION} +PKGREVISION= 2 +COMMENT= C++ X GUI toolkit + +USE_BUILDLINK2= yes -PKGNAME= qt2-libs-${QTVERSION} -PKGREVISION= 2 -COMMENT= C++ X GUI toolkit +.include "../qt2-libs/Makefile.common" -USE_BUILDLINK_ONLY= yes -CONFIGURE_ARGS+= -I${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= -L${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CONFIGURE_ARGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib CONFIGURE_ENV+= QTDIR="${WRKSRC}" MAKE_ENV+= QTDIR="${WRKSRC}" @@ -22,14 +21,14 @@ do-install: ${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin ${INSTALL_DATA_DIR} ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib ${INSTALL_DATA_DIR} ${QTPREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/Mesa/buildlink.mk" -.include "../../graphics/mng/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/mng/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common index 4d293c76496..5d7483cda2d 100644 --- a/x11/qt2-libs/Makefile.common +++ b/x11/qt2-libs/Makefile.common @@ -1,12 +1,11 @@ -# $NetBSD: Makefile.common,v 1.17 2001/10/09 19:51:41 tron Exp $ +# $NetBSD: Makefile.common,v 1.18 2002/08/25 18:40:43 jlam Exp $ # -DISTNAME= qt-x11-${QTVERSION} -WRKSRC= ${WRKDIR}/qt-${QTVERSION} -CATEGORIES= x11 -MASTER_SITES= \ - ftp://ftp.trolltech.com/qt/source/ \ - ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/ +DISTNAME= qt-x11-${QTVERSION} +WRKSRC= ${WRKDIR}/qt-${QTVERSION} +CATEGORIES= x11 +MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ + ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/ .include "../qt2/Makefile.common" @@ -38,7 +37,7 @@ PATCHDIR= ${.CURDIR}/../../x11/qt2-libs/patches .if ${OPSYS} == "SunOS" BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs -CONFIGURE_ENV+= CXX=${LOCALBASE}/egcs/bin/g++ +CXX= ${LOCALBASE}/egcs/bin/g++ CONFIGURE_ARGS+= -platform solaris-g++ .endif diff --git a/x11/qt2-libs/buildlink2.mk b/x11/qt2-libs/buildlink2.mk new file mode 100644 index 00000000000..9b4c199532e --- /dev/null +++ b/x11/qt2-libs/buildlink2.mk @@ -0,0 +1,33 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:43 jlam Exp $ + +.if !defined(QT2_LIBS_BUILDLINK2_MK) +QT2_LIBS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= qt2-libs +BUILDLINK_DEPENDS.qt2-libs?= qt2-libs>=2.3.1nb2 +BUILDLINK_PKGSRCDIR.qt2-libs?= ../../x11/qt2-libs + +EVAL_PREFIX+= BUILDLINK_PREFIX.qt2-libs=qt2-libs +BUILDLINK_PREFIX.qt2-libs_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.qt2-libs+= qt2/include/*.h +BUILDLINK_FILES.qt2-libs+= qt2/lib/libqt.* + +QTDIR= ${BUILDLINK_PREFIX.qt2-libs}/qt2 + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/mng/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" + +CONFIGURE_ENV+= QTDIR="${QTDIR}" +CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" +MAKE_ENV+= QTDIR="${QTDIR}" +MAKE_ENV+= MOC="${QTDIR}/bin/moc" +LDFLAGS+= -Wl,-R${QTDIR}/lib + +BUILDLINK_TARGETS+= qt2-libs-buildlink + +qt2-libs-buildlink: _BUILDLINK_USE + +.endif # QT2_LIBS_BUILDLINK2_MK diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo index f25c1e6cdcb..76d2db8cb34 100644 --- a/x11/qt2-libs/distinfo +++ b/x11/qt2-libs/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2001/11/16 09:08:05 jlam Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:40:43 jlam Exp $ SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823 Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538 -SHA1 (patch-ab) = 29254fdd872f763fb48512cbf982481b88e40e5b -SHA1 (patch-ac) = ce19f2f1dd839b86dda1de20268d380138c39415 +SHA1 (patch-ab) = cada94d79878a49e24211ab7d17c097bbf5a9794 +SHA1 (patch-ac) = c94b7b93e991f89fbfe6b3e0e142d825c7e16eac SHA1 (patch-ad) = 26482d22e1d016ef514a43a69a5d58b19f03193c SHA1 (patch-ae) = 3ca7c34f608458950e5036f4a0b9ca0c53f83343 SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b diff --git a/x11/qt2-libs/patches/patch-ab b/x11/qt2-libs/patches/patch-ab index e0f433c5120..fc467d58e57 100644 --- a/x11/qt2-libs/patches/patch-ab +++ b/x11/qt2-libs/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $ +$NetBSD: patch-ab,v 1.8 2002/08/25 18:40:44 jlam Exp $ --- configs/netbsd-g++-static.in.orig Wed Jun 13 04:56:48 2001 +++ configs/netbsd-g++-static.in @@ -14,10 +14,10 @@ $NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $ # Compiling with support libraries -SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_X11 = -I@BUILDLINK_X11_DIR@/include ++SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_OPENGL = -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include ++SYSCONF_CXXFLAGS_OPENGL = -I@LOCALBASE@/include -I@X11BASE@/include # Compiling YACC output SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses @@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $ # Linking with support libraries # X11 -SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_X11 = -L@BUILDLINK_X11_DIR@/lib ++SYSCONF_LFLAGS_X11 = -L@X11BASE@/lib SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $ SYSCONF_LIBS_QT_OPENGL = # OpenGL -SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_OPENGL = -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib ++SYSCONF_LFLAGS_OPENGL = -L@LOCALBASE@/lib -L@X11BASE@/lib SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu # Yacc SYSCONF_LIBS_YACC = diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac index 4ad0ebf9062..406bb05f400 100644 --- a/x11/qt2-libs/patches/patch-ac +++ b/x11/qt2-libs/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $ +$NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $ --- configs/solaris-g++-static.in.orig Wed Jun 13 04:56:50 2001 +++ configs/solaris-g++-static.in @@ -11,10 +11,10 @@ $NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $ # Compiling with support libraries -SYSCONF_CXXFLAGS_X11 = -I/usr/openwin/include -+SYSCONF_CXXFLAGS_X11 = -I@BUILDLINK_X11_DIR@/include ++SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -SYSCONF_CXXFLAGS_OPENGL = -+SYSCONF_CXXFLAGS_OPENGL = -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include ++SYSCONF_CXXFLAGS_OPENGL = -I@LOCALBASE@/include -I@X11BASE@/include # Compiling YACC output SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses @@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $ # Linking with support libraries # X11 -SYSCONF_LFLAGS_X11 = -L/usr/openwin/lib -+SYSCONF_LFLAGS_X11 = -L@BUILDLINK_X11_DIR@/lib ++SYSCONF_LFLAGS_X11 = -L@X11BASE@/lib SYSCONF_LIBS_X11 = -lXext -lX11 -lm -lresolv -lsocket -lnsl # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $ SYSCONF_LIBS_QT_OPENGL = # OpenGL -SYSCONF_LFLAGS_OPENGL = -+SYSCONF_LFLAGS_OPENGL = -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib ++SYSCONF_LFLAGS_OPENGL = -L@LOCALBASE@/lib -L@X11BASE@/lib SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu # Yacc SYSCONF_LIBS_YACC = diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 892a3f38dc3..df0ac57fbd6 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/08/08 16:17:08 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 18:40:44 jlam Exp $ # .include "../qt3-libs/Makefile.common" @@ -7,8 +7,7 @@ PKGNAME= qt3-libs-${QTVERSION} PKGREVISION= 2 COMMENT= C++ X GUI toolkit -USE_BUILDLINK_ONLY= yes -BUILDLINK_QTDIR= ${WRKSRC} +USE_BUILDLINK2= yes MAKE_ENV+= LIBQT="${WRKSRC}/lib/libqt-mt.la" @@ -26,7 +25,7 @@ do-install: ${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin ${INSTALL_DATA_DIR} ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib ${INSTALL_DATA_DIR} ${QTPREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/*.h ${QTPREFIX}/include ${INSTALL_DATA_DIR} ${QTPREFIX}/include/private @@ -36,12 +35,12 @@ do-install: ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqjpeg.la ${QTPREFIX}/plugins/imageformats ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqmng.la ${QTPREFIX}/plugins/imageformats -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/Mesa/buildlink.mk" -.include "../../graphics/mng/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/freetype2/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/mng/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index fb69f91ff8f..87a405334a7 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,10 +1,9 @@ -# $NetBSD: Makefile.common,v 1.5 2002/05/29 19:09:55 skrll Exp $ +# $NetBSD: Makefile.common,v 1.6 2002/08/25 18:40:44 jlam Exp $ # -DISTNAME= qt-x11-free-${QTVERSION} -CATEGORIES= x11 -MASTER_SITES= \ - ftp://ftp.trolltech.com/qt/source/ \ - ftp://ftp.bero.org/pub/qt/source/ +DISTNAME= qt-x11-free-${QTVERSION} +CATEGORIES= x11 +MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ + ftp://ftp.bero.org/pub/qt/source/ .include "../qt3/Makefile.common" @@ -40,12 +39,15 @@ PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches .if ${OPSYS} == "SunOS" BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs -CONFIGURE_ENV+= CXX=${LOCALBASE}/egcs/bin/g++ +CXX= ${LOCALBASE}/egcs/bin/g++ CONFIGURE_ARGS+= -platform solaris-g++ .endif post-patch: ${SED} \ + -e 's:@LOCALBASE@:${LOCALBASE}:g' \ + -e 's:@X11BASE@:${X11BASE}:g' \ + -e 's:@X11PREFIX@:${X11PREFIX}:g' \ -e 's:@CC@:${CC}:g' \ -e 's:@CXX@:${CXX}:g' \ -e 's:@LDFLAGS@:${LDFLAGS}:g' \ @@ -53,9 +55,7 @@ post-patch: -e 's:@CXXFLAGS@:${CXXFLAGS}:g' \ -e 's:@LEX@:${LEX}:g' \ -e 's:@YACC@:${YACC}:g' \ - -e 's:@LIBTOOL@:${LIBTOOL}:g' \ - -e 's:@BUILDLINK_DIR@:${BUILDLINK_DIR}:g' \ - -e 's:@BUILDLINK_X11_DIR@:${BUILDLINK_X11_DIR}:g' \ + -e 's:@LIBTOOL@:${PKGLIBTOOL}:g' \ ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf for dir in ${WRKSRC}/mkspecs/*; do \ ${CP} ${WRKSRC}/qmake.conf $${dir}; \ diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST index 340b89691ed..d21cbf55150 100644 --- a/x11/qt3-libs/PLIST +++ b/x11/qt3-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/05/29 19:09:55 skrll Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 18:40:45 jlam Exp $ qt3/bin/moc qt3/include/jri.h qt3/include/jri_md.h diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk new file mode 100644 index 00000000000..1b8441de487 --- /dev/null +++ b/x11/qt3-libs/buildlink2.mk @@ -0,0 +1,34 @@ +# $NetBSD + +.if !defined(QT3_LIBS_BUILDLINK2_MK) +QT3_LIBS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= qt3-libs +BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.4nb2 +BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs + +EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-libs=qt3-libs +BUILDLINK_PREFIX.qt3-libs_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.qt3-libs+= qt3/include/*.h +BUILDLINK_FILES.qt3-libs+= qt3/include/private/*.h +BUILDLINK_FILES.qt3-libs+= qt3/lib/libqt-mt.* + +QTDIR= ${BUILDLINK_PREFIX.qt3-libs}/qt3 + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/mng/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" + +CONFIGURE_ENV+= QTDIR="${QTDIR}" +CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" +MAKE_ENV+= QTDIR="${QTDIR}" +MAKE_ENV+= MOC="${QTDIR}/bin/moc" +LDFLAGS+= -Wl,-R${QTDIR}/lib + +BUILDLINK_TARGETS+= qt3-libs-buildlink + +qt3-libs-buildlink: _BUILDLINK_USE + +.endif # QT3_LIBS_BUILDLINK2_MK diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 534207eed7d..61de67c9423 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/05/30 12:33:26 skrll Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:40:46 jlam Exp $ SHA1 (qt-x11-free-3.0.4.tar.gz) = 1bed903c622009fbbcce8386bb1b48b4202f3dbb Size (qt-x11-free-3.0.4.tar.gz) = 15198015 bytes diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 0e0c274971d..edbd31989f1 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# -# $Id: qmake.conf,v 1.3 2002/05/30 12:33:27 skrll Exp $ +# $NetBSD: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $ +# $Id: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $ # # qmake configuration for netbsd-g++ # @@ -32,14 +32,14 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_INCDIR = @BUILDLINK_DIR@/include -QMAKE_LIBDIR = @BUILDLINK_DIR@/lib -QMAKE_INCDIR_X11 = @BUILDLINK_X11_DIR@/include -QMAKE_LIBDIR_X11 = @BUILDLINK_X11_DIR@/lib +QMAKE_INCDIR = @LOCALBASE@/include +QMAKE_LIBDIR = @LOCALBASE@/lib +QMAKE_INCDIR_X11 = @X11BASE@/include +QMAKE_LIBDIR_X11 = @X11BASE@/lib QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib -QMAKE_INCDIR_OPENGL = @BUILDLINK_DIR@/include -QMAKE_LIBDIR_OPENGL = @BUILDLINK_DIR@/lib +QMAKE_INCDIR_OPENGL = @X11PREFIX@/include +QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib QMAKE_LINK = @LIBTOOL@ --mode=link @CXX@ QMAKE_LINK_SHLIB_CMD = \ diff --git a/x11/qt3-libs/patches/patch-aa b/x11/qt3-libs/patches/patch-aa index e52c4f01b2a..3983e6e2cab 100644 --- a/x11/qt3-libs/patches/patch-aa +++ b/x11/qt3-libs/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2002/05/30 12:33:27 skrll Exp $ +$NetBSD: patch-aa,v 1.5 2002/08/25 18:40:47 jlam Exp $ --- Makefile.orig Thu May 30 09:42:36 2002 +++ Makefile diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad index c00ab0b972f..241ef83148f 100644 --- a/x11/qt3-libs/patches/patch-ad +++ b/x11/qt3-libs/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2002/05/29 19:09:56 skrll Exp $ +$NetBSD: patch-ad,v 1.2 2002/08/25 18:40:47 jlam Exp $ --- src/kernel/qthread_unix.cpp.orig Fri May 24 16:43:12 2002 +++ src/kernel/qthread_unix.cpp diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 116f8eae19e..c2e7acf3edf 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/03/20 17:38:23 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2002/08/25 18:40:48 jlam Exp $ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 @@ -12,13 +12,12 @@ COMMENT= Graphical toolkit for TCL WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib MAKE_ENV+= TOUCH="${TOUCH}" USE_X11= yes USE_LIBTOOL= yes -USE_BUILDLINK_ONLY= yes -REPLACE_BUILDLINK+= tkConfig.sh +USE_BUILDLINK2= yes # Initially install the man pages into ${WRKDIR}/man, as we need a staged # install to avoid overwriting existing manpages in ${PREFIX}/man. @@ -87,6 +86,5 @@ post-install: test: cd ${WRKSRC}; ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test -.include "../../lang/tcl/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../lang/tcl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/buildlink2.mk b/x11/tk/buildlink2.mk new file mode 100644 index 00000000000..fda29966ba8 --- /dev/null +++ b/x11/tk/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:48 jlam Exp $ + +.if !defined(TK_BUILDLINK2_MK) +TK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= tk +BUILDLINK_DEPENDS.tk?= tk>=8.3.4 +BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk + +EVAL_PREFIX+= BUILDLINK_PREFIX.tk=tk +BUILDLINK_PREFIX.tk_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.tk= include/tk.h +BUILDLINK_FILES.tk+= include/tkDecls.h +BUILDLINK_FILES.tk+= include/tkPlatDecls.h +BUILDLINK_FILES.tk+= include/tkIntXlibDecls.h +BUILDLINK_FILES.tk+= include/tk/*/*.h +BUILDLINK_FILES.tk+= lib/libtk83.* +BUILDLINK_FILES.tk+= lib/libtkstub83.* + +.include "../../lang/tcl/buildlink2.mk" + +BUILDLINK_TARGETS+= tk-buildlink + +tk-buildlink: _BUILDLINK_USE + +.endif # TK_BUILDLINK2_MK diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile index 74a351568dc..15ca6ca8588 100644 --- a/x11/wxGTK/Makefile +++ b/x11/wxGTK/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:04 fredb Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/25 18:40:49 jlam Exp $ # DISTNAME= wxGTK-2.2.7 @@ -10,7 +10,8 @@ MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.freiburg.linux.de/~wxxt/ COMMENT= GTK-based implementation of the wxWindows GUI library -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined +USE_X11= # defined USE_GMAKE= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined @@ -31,9 +32,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE ${INSTALL_DATA} ${WRKSRC}/SYMBOLS.txt ${DOCDIR}/SYMBOLS -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/jpeg/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/x11/wxGTK/buildlink2.mk b/x11/wxGTK/buildlink2.mk new file mode 100644 index 00000000000..879a356ab29 --- /dev/null +++ b/x11/wxGTK/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:49 jlam Exp $ + +.if !defined(WXGTK_BUILDLINK2_MK) +WXGTK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= wxGTK +BUILDLINK_DEPENDS.wxGTK?= wxGTK>=2.2.7nb1 +BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK + +EVAL_PREFIX+= BUILDLINK_PREFIX.wxGTK=wxGTK +BUILDLINK_PREFIX.wxGTK_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.wxGTK= include/wx/* +BUILDLINK_FILES.wxGTK+= include/wx/*/* +BUILDLINK_FILES.wxGTK+= lib/wx/include/wx/gtk/* +BUILDLINK_FILES.wxGTK+= lib/libwx_gtk.* + +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + +BUILDLINK_TARGETS+= wxGTK-buildlink + +wxGTK-buildlink: _BUILDLINK_USE + +.endif # WXGTK_BUILDLINK2_MK diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile index 4daba9a4b56..34227a1770c 100644 --- a/x11/xview-config/Makefile +++ b/x11/xview-config/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:53 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 18:40:50 jlam Exp $ # $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp # @@ -15,6 +15,8 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL EXTRACT_ELEMENTS= ${DISTNAME}/config WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS} + +USE_BUILDLINK2= # defined USE_IMAKE= # defined post-extract: diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile index 1c52e8bf66c..9250472d82e 100644 --- a/x11/xview-lib/Makefile +++ b/x11/xview-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/04/10 04:49:58 seb Exp $ +# $NetBSD: Makefile,v 1.20 2002/08/25 18:40:50 jlam Exp $ # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp # @@ -17,6 +17,7 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL # builds, but binaries in../xview-clients all crash NOT_FOR_PLATFORM= *-*-alpha +USE_BUILDLINK2= # defined USE_IMAKE= # defined post-install: diff --git a/x11/xview-lib/buildlink2.mk b/x11/xview-lib/buildlink2.mk new file mode 100644 index 00000000000..03ea1955dc3 --- /dev/null +++ b/x11/xview-lib/buildlink2.mk @@ -0,0 +1,27 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:50 jlam Exp $ + +.if !defined(XVIEW_BUILDLINK2_MK) +XVIEW_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= xview +BUILDLINK_DEPENDS.xview?= xview-lib>=3.2.1 +BUILDLINK_PKGSRCDIR.xview?= ../../x11/xview-lib + +EVAL_PREFIX+= BUILDLINK_PREFIX.xview=xview-lib +BUILDLINK_PREFIX.xview_DEFAULT= ${X11PREFIX} + +BUILDLINK_FILES.xview= include/bitmaps/* +BUILDLINK_FILES.xview+= include/images/* +BUILDLINK_FILES.xview+= include/olgx/* +BUILDLINK_FILES.xview+= include/olgx_private/* +BUILDLINK_FILES.xview+= include/pixrect/* +BUILDLINK_FILES.xview+= include/xview/* +BUILDLINK_FILES.xview+= include/xview_private/* +BUILDLINK_FILES.xview+= lib/libolgx.* +BUILDLINK_FILES.xview+= lib/libxview.* + +BUILDLINK_TARGETS+= xview-buildlink + +xview-buildlink: _BUILDLINK_USE + +.endif # XVIEW_BUILDLINK2_MK |