diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
| commit | a020ed9056d4d74e13cd2a99898f3dec09c162b7 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /www | |
| parent | 287b5c5601b23446d25c27bbf0140c8dc4b4391e (diff) | |
| download | pkgsrc-a020ed9056d4d74e13cd2a99898f3dec09c162b7.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'www')
93 files changed, 265 insertions, 299 deletions
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile index 88cd9fd1f46..267b7ef0368 100644 --- a/www/Mosaic/Makefile +++ b/www/Mosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2002/08/01 02:37:42 jschauma Exp $ +# $NetBSD: Makefile,v 1.36 2002/08/25 21:51:41 jlam Exp $ # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp # @@ -17,14 +17,14 @@ LICENSE= mosaic-license NOT_FOR_PLATFORM= *-*-alpha #LP64 problems -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES USE_MOTIF12= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-jpegdir=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-pngdir=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-zdir=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-jpegdir=${BUILDLINK_PREFIX.jpeg} +CONFIGURE_ARGS+= --with-pngdir=${BUILDLINK_PREFIX.png} +CONFIGURE_ARGS+= --with-zdir=${BUILDLINK_PREFIX.zlib} CPPFLAGS+= -Dunix @@ -39,10 +39,9 @@ do-install: ${PREFIX}/lib/X11/app-defaults/Mosaic ${INSTALL_DATA_DIR} ${PREFIX}/share/mosaic -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/Mosaic/PLIST b/www/Mosaic/PLIST index 7b132edd133..c6dd2055419 100644 --- a/www/Mosaic/PLIST +++ b/www/Mosaic/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:30:05 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:41 jlam Exp $ bin/Mosaic bin/mosaic lib/X11/app-defaults/Mosaic diff --git a/www/amaya/Makefile b/www/amaya/Makefile index a11d5764851..7dc7d59ece4 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/04/23 02:08:54 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2002/08/25 21:51:42 jlam Exp $ DISTNAME= amaya-src-5.1 PKGNAME= amaya-5.1 @@ -15,7 +15,7 @@ HOMEPAGE= http://www.w3.org/Amaya/ COMMENT= Web Browser/Editor from the World Wide Web Consortium EXTRACT_ELEMENTS= Amaya -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes USE_GMAKE= yes @@ -30,8 +30,8 @@ CFLAGS+= -Dunix # files in the right place. # ac_cv_path_motif= no_motif= -ac_cv_path_motif+= ac_motif_includes=${BUILDLINK_DIR}/include -ac_cv_path_motif+= ac_motif_libraries=${BUILDLINK_DIR}/lib +ac_cv_path_motif+= ac_motif_includes=${MOTIFBASE}/include +ac_cv_path_motif+= ac_motif_libraries=${MOTIFBASE}/lib post-extract: ${MKDIR} ${WRKSRC} @@ -49,9 +49,9 @@ post-patch: pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/Amaya -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../www/libwww/buildlink.mk" -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../www/libwww/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/amaya/distinfo b/www/amaya/distinfo index b0ce9e11c47..0eb11a035bd 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.5 2002/07/01 02:23:16 kristerw Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:51:42 jlam Exp $ SHA1 (amaya-src-5.1.tgz) = fe032cce47ed3979606d43bd21e10c2d41d6e05b Size (amaya-src-5.1.tgz) = 4925073 bytes SHA1 (patch-aa) = 22dd34ab9dcd70220effb2fff690f70a5f1bbeb7 SHA1 (patch-ab) = 6f5940d24e285dcdcaf4420cf25b6bc8f750ab28 SHA1 (patch-ac) = e8740b482a7422fadadff451fb148beacd081838 -SHA1 (patch-ad) = 18a23b68f0f81d8767d17905cd762956b37e33b4 +SHA1 (patch-ad) = de880e28c117fdb64fc48e2b2d03be16c634bd8b SHA1 (patch-ae) = 5e1e356471bb26ca463e3f09f0447044d2aaac39 SHA1 (patch-af) = 9f29ef449cd5112b771e4c248a881ec4b41d7a0f diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa index 5911b4c8c7f..270e007a1ad 100644 --- a/www/amaya/patches/patch-aa +++ b/www/amaya/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2002/07/01 02:23:17 kristerw Exp $ +$NetBSD: patch-aa,v 1.9 2002/08/25 21:51:43 jlam Exp $ --- ../configure.orig Tue Jul 3 13:23:50 2001 +++ ../configure Mon Jul 1 02:48:37 2002 @@ -3049,7 +3049,7 @@ diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad index 7f400064792..0381b191b19 100644 --- a/www/amaya/patches/patch-ad +++ b/www/amaya/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.4 2001/08/09 19:03:19 jlam Exp $ +$NetBSD: patch-ad,v 1.5 2002/08/25 21:51:43 jlam Exp $ --- ../annotlib/Makefile.in.orig Thu Apr 5 06:49:33 2001 +++ ../annotlib/Makefile.in @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2001/08/09 19:03:19 jlam Exp $ - -I@top_srcdir@/../libwww/modules/expat/xmlparse \ - -I@top_srcdir@/../libwww/modules/expat/xmltok \ + -I@top_srcdir@/amaya/f \ -+ -I${BUILDLINK_DIR}/include/w3c-libwww \ ++ -I${LOCALBASE}/include/w3c-libwww \ @THOTINCLUDES@ $(X_FLAGS) diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae index f433c8f3dc5..2588356d406 100644 --- a/www/amaya/patches/patch-ae +++ b/www/amaya/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.5 2002/07/01 02:23:17 kristerw Exp $ +$NetBSD: patch-ae,v 1.6 2002/08/25 21:51:44 jlam Exp $ --- ../thotlib/include/ustring.h.orig Mon Jul 1 02:49:43 2002 +++ ../thotlib/include/ustring.h Mon Jul 1 02:55:09 2002 @@ -5,7 +5,11 @@ diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af index b0159b8d36e..83595a3e7a0 100644 --- a/www/amaya/patches/patch-af +++ b/www/amaya/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.4 2002/07/01 02:23:17 kristerw Exp $ +$NetBSD: patch-af,v 1.5 2002/08/25 21:51:44 jlam Exp $ --- ../config.h.in.orig Mon Jul 1 02:52:16 2002 +++ ../config.h.in Mon Jul 1 02:52:51 2002 @@ -321,6 +321,9 @@ diff --git a/www/ap-DBI/Makefile b/www/ap-DBI/Makefile index beb93be1117..75a5b9ce2e7 100644 --- a/www/ap-DBI/Makefile +++ b/www/ap-DBI/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:28 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:44 jlam Exp $ # DISTNAME= ApacheDBI-0.87 @@ -12,11 +12,11 @@ COMMENT= perl5 Apache modules for DBI connections DEPENDS+= ap-perl-[0-9]*:../../www/ap-perl DEPENDS+= apache{,6}-1.3.*:../../www/apache -USE_BUILDLINK_ONLY= YES -PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/DBI/.packlist +USE_BUILDLINK2= YES +PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/DBI/.packlist do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-auth-pam/Makefile b/www/ap-auth-pam/Makefile index 8f330ae57be..4485053854a 100644 --- a/www/ap-auth-pam/Makefile +++ b/www/ap-auth-pam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/03/06 19:33:38 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:45 jlam Exp $ DISTNAME= mod_auth_pam-1.0a PKGNAME= ap-auth-pam-1.0a @@ -9,9 +9,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://pam.sourceforge.net/mod_auth_pam/ COMMENT= module to allow Apache authentication using PAM -DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache - -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES LIBS+= -lpam EGDIR= ${PREFIX}/share/examples/mod_auth_pam @@ -27,6 +26,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${HTMLDIR} ${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${HTMLDIR} -.include "../../security/PAM/buildlink.mk" -.include "../../www/apache/buildlink.mk" +.include "../../security/PAM/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile index 35b82e9004a..233df7d6b1f 100644 --- a/www/ap-dav/Makefile +++ b/www/ap-dav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/08/13 22:19:48 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:45 jlam Exp $ DISTNAME= mod_dav-1.0.3-1.3.6 PKGNAME= ap-dav-1.0.3 @@ -12,11 +12,10 @@ COMMENT= Apache WebDAV module # Ugly mess that says apache>=1.3.9 and apache<2.0. BUILDLINK_DEPENDS.apache= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*} -DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache - -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-expat=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat} AP_MODULE_DIR= ${PREFIX}/lib/httpd DOCDIR= ${PREFIX}/share/doc/mod_dav @@ -29,6 +28,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${HTMLDIR} -.include "../../textproc/expat/buildlink.mk" -.include "../../www/apache/buildlink.mk" +.include "../../textproc/expat/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-dav/distinfo b/www/ap-dav/distinfo index 54a943b8033..9e28a4502a9 100644 --- a/www/ap-dav/distinfo +++ b/www/ap-dav/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/03/06 15:35:04 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:51:46 jlam Exp $ SHA1 (mod_dav-1.0.3-1.3.6.tar.gz) = cf1baa75c14131f96299be3fdf26d1fa91e6c7e3 Size (mod_dav-1.0.3-1.3.6.tar.gz) = 185284 bytes -SHA1 (patch-aa) = 1c5cf37e8b8f750bb4b02bf0bce2e3a3ce5033a2 -SHA1 (patch-ab) = 9da9919f52e309135637977c4ea200b8273d47b1 SHA1 (patch-ad) = 5c08ec68748b6fabb5cb5361ef04fb760cd76008 diff --git a/www/ap-dav/patches/patch-aa b/www/ap-dav/patches/patch-aa deleted file mode 100644 index 214a4bd1c2f..00000000000 --- a/www/ap-dav/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/03/06 15:35:05 jlam Exp $ - ---- configure.in.orig Sat Nov 3 09:48:13 2001 -+++ configure.in -@@ -24,15 +24,6 @@ - CPPFLAGS="$CPPFLAGS -traditional-cpp" - fi - --# --# Check for /usr/pkg/{lib,include} which is where NetBSD puts binary --# and source packages. This should be harmless on other OSs. --# --if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then -- CFLAGS="$CFLAGS -I/usr/pkg/include" -- LDFLAGS="$LDFLAGS -L/usr/pkg/lib" --fi -- - AC_HEADER_STDC - - AC_MSG_CHECKING(for static Apache module support) diff --git a/www/ap-dav/patches/patch-ab b/www/ap-dav/patches/patch-ab deleted file mode 100644 index a356182000e..00000000000 --- a/www/ap-dav/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/03/06 15:35:06 jlam Exp $ - ---- configure.orig Mon Nov 5 00:04:50 2001 -+++ configure -@@ -1720,15 +1720,6 @@ - CPPFLAGS="$CPPFLAGS -traditional-cpp" - fi - --# --# Check for /usr/pkg/{lib,include} which is where NetBSD puts binary --# and source packages. This should be harmless on other OSs. --# --if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then -- CFLAGS="$CFLAGS -I/usr/pkg/include" -- LDFLAGS="$LDFLAGS -L/usr/pkg/lib" --fi -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile index 8e924177f8d..2df99c2f086 100644 --- a/www/ap-perl/Makefile +++ b/www/ap-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/07/26 08:57:14 grant Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/25 21:51:49 jlam Exp $ # DISTNAME= mod_perl-1.25 @@ -16,13 +16,11 @@ DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache DEPENDS+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES LIBPERL5_REQD= ${PERL5_REQD} PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/mod_perl/.packlist -REPLACE_BUILDLINK= blib/lib/Apache/MyConfig.pm -REPLACE_BUILDLINK_SED= -e "s|${APXS}|${PREFIX}/sbin/apxs|g" - MAKE_PARAMS+= USE_APXS=1 MAKE_PARAMS+= WITH_APXS=${APXS} MAKE_PARAMS+= EVERYTHING=1 @@ -35,10 +33,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \ ${PREFIX}/share/httpd/htdocs/manual/mod -.include "../../lang/perl5/buildlink.mk" -.include "../../www/apache/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" .if exists(${PERL5_ARCHLIB}/DynaLoader_pic.o) -MAKE_ENV+= DYNALOADER_OBJ_PIC="${PERL5_ARCHLIB}/DynaLoader_pic.o" +DYNALOADER_OBJ_PIC= ${PERL5_ARCHLIB}/DynaLoader_pic.o +.elif ${OPSYS} == "NetBSD" +DYNALOADER_OBJ_PIC= ${PERL5_ARCHLIB}/auto/DynaLoader/DynaLoader.a .endif +MAKE_ENV+= DYNALOADER_OBJ_PIC="${DYNALOADER_OBJ_PIC}" diff --git a/www/ap-perl/distinfo b/www/ap-perl/distinfo index efd5f4ad331..e556646eafa 100644 --- a/www/ap-perl/distinfo +++ b/www/ap-perl/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2002/07/26 08:57:15 grant Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 21:51:50 jlam Exp $ SHA1 (mod_perl-1.25.tar.gz) = a3ad57bbf1143cdda4b80754ce8f34913f5df053 Size (mod_perl-1.25.tar.gz) = 366834 bytes -SHA1 (patch-aa) = c19469efd351e3a545feb79a6d3af4f734b27449 +SHA1 (patch-aa) = 22e439087a30b042e8a79e646b57f61040c47f36 SHA1 (patch-ab) = 18b02747ae4b9ab17ce252cf003bf9fd7e4b2560 diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa index e6cde71440a..f6c76bdbc2d 100644 --- a/www/ap-perl/patches/patch-aa +++ b/www/ap-perl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2001/10/01 08:36:44 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:50 jlam Exp $ --- apaci/Makefile.tmpl.orig Tue Nov 24 11:38:52 1998 +++ apaci/Makefile.tmpl Fri Apr 30 20:36:05 1999 @@ -11,15 +11,6 @@ $NetBSD: patch-aa,v 1.5 2001/10/01 08:36:44 jlam Exp $ all: lib -@@ -58,7 +58,7 @@ - - libperl.so: $(MP_OBJS_PIC) - $(MP_RM) $@ -- $(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) $(MP_LIBS) -+ ld $(MP_LDFLAGS_SHLIB:S/-Wl,//g) -o $@ $(MP_OBJS_PIC) $(MP_LIBS:S/-Wl,//g:N*.a) - - .SUFFIXES: .xs .c .o .lo - @@ -94,7 +94,8 @@ # FOR STAND-ALONE BUILDING ONLY diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile index 4bc8add773c..f91c1e84c32 100644 --- a/www/ap-php4/Makefile +++ b/www/ap-php4/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.21 2002/02/28 18:32:19 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2002/08/25 21:51:51 jlam Exp $ PKGNAME= ap-php-${PHP_BASE_VERS} PKGREVISION= # empty COMMENT= Apache module for PHP4 DEPENDS+= php>=${PHP_BASE_VERS}:../../www/php4 -DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES .include "../../www/php4/Makefile.php" @@ -20,5 +20,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/.libs/libphp4.so \ ${PREFIX}/lib/httpd/mod_php4.so -.include "../../www/apache/buildlink.mk" +.include "../../www/apache/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index c450b9623b6..72c58bd7a06 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2002/08/01 01:03:17 mycroft Exp $ +# $NetBSD: Makefile,v 1.59 2002/08/25 21:51:52 jlam Exp $ DISTNAME= mod_ssl-2.8.10-1.3.26 PKGNAME= ap-ssl-2.8.10 @@ -14,13 +14,19 @@ COMMENT= SSL/TLS protocols module for Apache CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]* -DEPENDS+= apache-1.3.26nb4:../../www/apache +BUILDLINK_DEPENDS.apache= apache-1.3.26nb4 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE} + +.include "../../mk/bsd.prefs.mk" + +.if ${_USE_RPATH} == "yes" MAKE_ENV+= SSL_RPATH_LDFLAGS="-R${SSLBASE}/lib" +.endif PKG_SYSCONFSUBDIR?= httpd @@ -93,7 +99,8 @@ post-install: cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.PRM *.prm \ ${EGDIR}/ssl.prm -.include "../../security/openssl/buildlink.mk" -.include "../../www/apache/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo index d74201615a6..fc6dc7e21cf 100644 --- a/www/ap-ssl/distinfo +++ b/www/ap-ssl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/06/24 16:26:50 taca Exp $ +$NetBSD: distinfo,v 1.13 2002/08/25 21:51:52 jlam Exp $ SHA1 (mod_ssl-2.8.10-1.3.26.tar.gz) = 6af4bbd91f2323c95f8d3ca1c461edc17fc1d13e Size (mod_ssl-2.8.10-1.3.26.tar.gz) = 753241 bytes diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 48174c447a3..90916d9a928 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/07/30 18:40:15 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 21:51:53 jlam Exp $ DISTNAME= httpd-${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} @@ -19,10 +19,7 @@ CONFLICTS+= ap-*-[0-9]* # Apache-1.x DSOs BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= YES -REPLACE_BUILDLINK= config_vars.mk -REPLACE_BUILDLINK_SED= -e "s|${BUILDLINK_DIR}|${LOCALBASE}|g" - +USE_BUILDLINK2= YES USE_GMAKE= YES USE_LIBTOOL= YES @@ -39,7 +36,7 @@ CONFIGURE_ARGS+= --with-mpm=prefork --with-devrandom=/dev/urandom # Apache Portable Runtime Utility library configure options CONFIGURE_ARGS+= --with-dbm=sdbm -CONFIGURE_ARGS+= --with-expat=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat} .include "../../mk/bsd.prefs.mk" @@ -94,15 +91,15 @@ OWN_DIRS_PERMS+= /var/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 # Add dependencies for the modules that will be built. For each module # ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace -# separated list of dependencies or buildlink.mk files needed to build +# separated list of dependencies or buildlink2.mk files needed to build # ap_mod, and _AP_CFG_ARGS.ap_mod is a whitespace separated list of # configure script options for ap_mod. # -_AP_DEPENDS.ssl= ../../security/openssl/buildlink.mk -_AP_DEPENDS.deflate= ../../devel/zlib/buildlink.mk +_AP_DEPENDS.ssl= ../../security/openssl/buildlink2.mk +_AP_DEPENDS.deflate= ../../devel/zlib/buildlink2.mk -_AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_DIR} -_AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_DIR} +_AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_PREFIX.openssl} +_AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_PREFIX.zlib} .for _ap_mod in ${APACHE_MODULES} . if defined(_AP_DEPENDS.${_ap_mod}) && !empty(_AP_DEPENDS.${_ap_mod}) @@ -158,7 +155,8 @@ post-install: done ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache -.include "../../lang/perl5/buildlink.mk" -.include "../../textproc/expat/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../textproc/expat/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/apache2/PLIST b/www/apache2/PLIST index a703fc38546..10492b1dc88 100644 --- a/www/apache2/PLIST +++ b/www/apache2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/06/18 23:58:07 itojun Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/08/25 21:51:53 jlam Exp $ bin/apr-config bin/apu-config etc/rc.d/apache diff --git a/www/apache2/distinfo b/www/apache2/distinfo index eb04878cd1d..275fd049f14 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: distinfo,v 1.9 2002/08/25 21:51:54 jlam Exp $ SHA1 (httpd-2.0.39.tar.gz) = 3f04dbffc081a34dbfc9aeab6738f320285db292 Size (httpd-2.0.39.tar.gz) = 4413542 bytes diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh index d0e23dfd460..22e29461d57 100644 --- a/www/apache2/files/apache.sh +++ b/www/apache2/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.4 2002/07/07 00:45:19 tv Exp $ +# $NetBSD: apache.sh,v 1.5 2002/08/25 21:51:55 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa index afb9d0159c6..f6dd727f42a 100644 --- a/www/apache2/patches/patch-aa +++ b/www/apache2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:55 jlam Exp $ --- Makefile.in.orig Sat Jun 15 18:41:03 2002 +++ Makefile.in Wed Jun 19 07:39:04 2002 diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad index 46c70bbfd95..19e255f87cb 100644 --- a/www/apache2/patches/patch-ad +++ b/www/apache2/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.4 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-ad,v 1.5 2002/08/25 21:51:56 jlam Exp $ --- config.layout.orig Fri May 17 23:49:30 2002 +++ config.layout Wed Jun 19 07:39:33 2002 diff --git a/www/apache2/patches/patch-ag b/www/apache2/patches/patch-ag index 1daea42bd56..17311fc94cf 100644 --- a/www/apache2/patches/patch-ag +++ b/www/apache2/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.5 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-ag,v 1.6 2002/08/25 21:51:56 jlam Exp $ --- support/Makefile.in.orig Sat Jun 15 13:41:52 2002 +++ support/Makefile.in Wed Jun 19 07:39:51 2002 diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah index 213e51de12c..7bd670cd6e4 100644 --- a/www/apache2/patches/patch-ah +++ b/www/apache2/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.5 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-ah,v 1.6 2002/08/25 21:51:57 jlam Exp $ --- support/apachectl.in.orig Mon May 27 20:46:01 2002 +++ support/apachectl.in Wed Jun 19 07:40:07 2002 diff --git a/www/apache2/patches/patch-ak b/www/apache2/patches/patch-ak index b41d3aba122..f38289721b6 100644 --- a/www/apache2/patches/patch-ak +++ b/www/apache2/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.2 2002/06/01 13:18:02 itojun Exp $ +$NetBSD: patch-ak,v 1.3 2002/08/25 21:51:57 jlam Exp $ --- docs/conf/httpd-std.conf.in.orig Wed Apr 24 16:24:35 2002 +++ docs/conf/httpd-std.conf.in diff --git a/www/apache2/patches/patch-an b/www/apache2/patches/patch-an index a3556ccde6f..560177b1d27 100644 --- a/www/apache2/patches/patch-an +++ b/www/apache2/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.2 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-an,v 1.3 2002/08/25 21:51:57 jlam Exp $ --with-randomdev=foo does not work. diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao index 1968e2f8621..51a179fba15 100644 --- a/www/apache2/patches/patch-ao +++ b/www/apache2/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.2 2002/06/18 23:58:08 itojun Exp $ +$NetBSD: patch-ao,v 1.3 2002/08/25 21:51:57 jlam Exp $ --with-randomdev=foo does not work. diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 22d4ec13618..40687be9ab9 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2002/08/01 00:58:33 mycroft Exp $ +# $NetBSD: Makefile,v 1.56 2002/08/25 21:51:58 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -30,7 +30,7 @@ COMMENT= Apache HTTP (Web) server with IPv6 support CONFLICTS= apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]* EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES HAS_CONFIGURE= YES CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc" CONFIGURE_ARGS+= --enable-module=most \ @@ -110,10 +110,10 @@ 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.db}/include/db2" CONFIGURE_ENV+= LIBS="-ldbm -ldb2" BUILDLINK_DEPENDS.db= db>=2.7.7 -.include "../../databases/db/buildlink.mk" +.include "../../databases/db/buildlink2.mk" .endif BUILD_DEFS+= APACHE_CUSTOM_CFLAGS @@ -166,6 +166,7 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache -.include "../../textproc/expat/buildlink.mk" +.include "../../textproc/expat/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/apache6/PLIST b/www/apache6/PLIST index 8dc35c896d9..117a2a3a31b 100644 --- a/www/apache6/PLIST +++ b/www/apache6/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/07/30 18:40:15 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:58 jlam Exp $ bin/checkgid bin/dbmmanage bin/htdigest diff --git a/www/apache6/distinfo b/www/apache6/distinfo index cbc6354bf8e..13a09c62da5 100644 --- a/www/apache6/distinfo +++ b/www/apache6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/06/20 07:24:18 itojun Exp $ +$NetBSD: distinfo,v 1.13 2002/08/25 21:51:59 jlam Exp $ SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f Size (apache_1.3.26.tar.gz) = 2303147 bytes diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh index ecd1538c740..3d98771f53d 100644 --- a/www/apache6/files/apache.sh +++ b/www/apache6/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.14 2002/07/07 00:45:19 tv Exp $ +# $NetBSD: apache.sh,v 1.15 2002/08/25 21:51:59 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout index 7f6ab362761..a425fdf3a53 100644 --- a/www/apache6/files/config.layout +++ b/www/apache6/files/config.layout @@ -1,4 +1,4 @@ -# $NetBSD: config.layout,v 1.4 2002/07/30 18:40:15 wiz Exp $ +# $NetBSD: config.layout,v 1.5 2002/08/25 21:52:00 jlam Exp $ <Layout pkgsrc> prefix: @PREFIX@ diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index 8977736d919..97fed7fd952 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/08/23 08:37:24 mrg Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/25 21:52:00 jlam Exp $ # DISTNAME= bozohttpd-5.14 @@ -12,7 +12,7 @@ COMMENT= bozotic HTTP server; small and secure BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES MAKE_ENV+= BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/man @@ -23,10 +23,10 @@ CPPFLAGS+= -DINET6 .endif pre-patch: - ${MV} ${WRKSRC}/bozohttpd.8 ${WRKSRC}/bozohttpd.8.in + ${MV} -f ${WRKSRC}/bozohttpd.8 ${WRKSRC}/bozohttpd.8.in post-patch: - ${SED} -e "s,@PREFIX@,${PREFIX},g" <${WRKSRC}/bozohttpd.8.in \ - >${WRKSRC}/bozohttpd.8 + ${SED} -e "s,@PREFIX@,${PREFIX},g" \ + ${WRKSRC}/bozohttpd.8.in > ${WRKSRC}/bozohttpd.8 .include "../../mk/bsd.pkg.mk" diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index 3e976b522e3..08e029babf5 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2002/08/23 08:37:24 mrg Exp $ +$NetBSD: distinfo,v 1.17 2002/08/25 21:52:00 jlam Exp $ SHA1 (bozohttpd-5.14.tar.bz2) = ce4eeb87b8005b4eac5d52c8647c0ed3cae9f56e Size (bozohttpd-5.14.tar.bz2) = 21666 bytes diff --git a/www/bozohttpd/patches/patch-ab b/www/bozohttpd/patches/patch-ab index 0ada442a2d8..ce776824eed 100644 --- a/www/bozohttpd/patches/patch-ab +++ b/www/bozohttpd/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.11 2002/08/23 08:37:25 mrg Exp $ +$NetBSD: patch-ab,v 1.12 2002/08/25 21:52:01 jlam Exp $ --- bozohttpd.8.in.orig Fri Aug 23 15:43:44 2002 +++ bozohttpd.8.in Fri Aug 23 15:48:04 2002 diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 2b2f9cb18da..a76a6d023ba 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/02/28 18:23:57 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 21:52:02 jlam Exp $ DISTNAME= cadaver-0.19.1 CATEGORIES= www @@ -9,14 +9,14 @@ HOMEPAGE= http://www.webdav.org/cadaver/ COMMENT= command-line WebDAV client USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES ALL_TARGET= cadaver GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-netrc CONFIGURE_ARGS+= --with-included-neon CONFIGURE_ARGS+= --with-libxml1 -CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE} # We don't need curses, just termcap. CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no @@ -35,7 +35,8 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/doc/cadaver.1 ${PREFIX}/man/man1 -.include "../../devel/readline/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/communicator/MESSAGE b/www/communicator/MESSAGE index cf0207e201c..3afe517e97b 100644 --- a/www/communicator/MESSAGE +++ b/www/communicator/MESSAGE @@ -1,5 +1,5 @@ ============================================================================== -$NetBSD: MESSAGE,v 1.2 2002/06/30 19:07:18 dmcmahill Exp $ +$NetBSD: MESSAGE,v 1.3 2002/08/25 21:52:02 jlam Exp $ alpha: The Digital UNIX version of Netscape requires COMPAT_OSF1 in your kernel, plus /emul/osf1 libraries. diff --git a/www/communicator/Makefile b/www/communicator/Makefile index e13f855a82e..d8814e5f1c3 100644 --- a/www/communicator/Makefile +++ b/www/communicator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2002/04/05 09:33:22 tron Exp $ +# $NetBSD: Makefile,v 1.31 2002/08/25 21:52:03 jlam Exp $ # COMMENT= Netscape communicator - Digital UNIX/Linux/SunOS binary @@ -6,4 +6,6 @@ COMMENT= Netscape communicator - Digital UNIX/Linux/SunOS binary BINNAME= communicator DIST_SDIR_NAME= complete_install +USE_BUILDLINK2= # defined + .include "../navigator/Makefile.common" diff --git a/www/communicator/PLIST.post b/www/communicator/PLIST.post index b9478e12b26..5e4e9a9b158 100644 --- a/www/communicator/PLIST.post +++ b/www/communicator/PLIST.post @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.post,v 1.3 2002/06/26 10:30:06 seb Exp $ +@comment $NetBSD: PLIST.post,v 1.4 2002/08/25 21:52:03 jlam Exp $ @dirrm lib/netscape/${BINNAME}-${NS_VERS}/spell @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/trouble diff --git a/www/curl/Makefile b/www/curl/Makefile index 376f2eb0acd..f30303e08e1 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/06/10 01:32:37 shell Exp $ +# $NetBSD: Makefile,v 1.20 2002/08/25 21:52:03 jlam Exp $ DISTNAME= curl-7.9.7 CATEGORIES= www @@ -13,16 +13,11 @@ COMMENT= client that groks URLs # list it into IPv6-ready packages BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} - -# This causes curl-config not to be regenerated during build-time as it was -# already created at configure-time. -# -AUTOMAKE_POST_PATTERNS+= curl-config +CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/curl @@ -37,5 +32,5 @@ post-install: ${SED} '/php/d' ${WRKSRC}/docs/examples/README > \ ${PREFIX}/share/examples/curl/README -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/curl/PLIST b/www/curl/PLIST index 175674531c8..3e74f5890ee 100644 --- a/www/curl/PLIST +++ b/www/curl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/06/10 01:32:38 shell Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 21:52:04 jlam Exp $ bin/curl bin/curl-config include/curl/curl.h diff --git a/www/curl/distinfo b/www/curl/distinfo index 049bc876f18..ad74ff8fc63 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2002/07/19 04:25:17 mycroft Exp $ +$NetBSD: distinfo,v 1.15 2002/08/25 21:52:04 jlam Exp $ SHA1 (curl-7.9.7.tar.gz) = 6fcb23be788984bcfca7debe5f307ec65fb56101 Size (curl-7.9.7.tar.gz) = 717489 bytes diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa index c49ccc5dd46..70f422a7538 100644 --- a/www/curl/patches/patch-aa +++ b/www/curl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2002/06/11 12:35:14 agc Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:05 jlam Exp $ --- src/writeout.c 2002/06/11 12:31:17 1.1 +++ src/writeout.c 2002/06/11 12:31:35 diff --git a/www/curl/patches/patch-ab b/www/curl/patches/patch-ab index 73debccae81..00ec637fcad 100644 --- a/www/curl/patches/patch-ab +++ b/www/curl/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2002/07/19 04:25:18 mycroft Exp $ +$NetBSD: patch-ab,v 1.3 2002/08/25 21:52:05 jlam Exp $ --- lib/ftp.c.orig Mon Apr 29 11:57:25 2002 +++ lib/ftp.c Fri Jul 19 04:22:35 2002 diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile index 682b213e63f..38bdaf653be 100644 --- a/www/cvsweb/Makefile +++ b/www/cvsweb/Makefile @@ -1,5 +1,5 @@ # -# $NetBSD: Makefile,v 1.13 2002/08/06 00:01:53 lukem Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 21:52:06 jlam Exp $ # DISTNAME= cvsweb-2.0.5 @@ -10,7 +10,7 @@ MAINTAINER= lukem@netbsd.org HOMEPAGE= http://www.freebsd.org/projects/cvsweb.html COMMENT= Web interface for browsing a CVS repository -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES PKG_SYSCONFSUBDIR?= httpd EGDIR= ${PREFIX}/share/examples/${PKGBASE} @@ -56,6 +56,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f} .endfor -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/cvsweb/PLIST b/www/cvsweb/PLIST index 137772fd506..aa3ef16dba1 100644 --- a/www/cvsweb/PLIST +++ b/www/cvsweb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/27 03:22:23 lukem Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:06 jlam Exp $ libexec/cgi-bin/cvsweb.cgi share/doc/cvsweb/ChangeLog share/doc/cvsweb/INSTALL diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo index 1b52921be46..0312a61a64b 100644 --- a/www/cvsweb/distinfo +++ b/www/cvsweb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/07/24 11:38:47 martti Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 21:52:06 jlam Exp $ SHA1 (cvsweb-2.0.5.tar.gz) = 6fb2049eb8f9a79788b9f84523399d761dbc6205 Size (cvsweb-2.0.5.tar.gz) = 51948 bytes diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa index adc4bc8a931..047560575bc 100644 --- a/www/cvsweb/patches/patch-aa +++ b/www/cvsweb/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2002/07/24 11:38:47 martti Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:07 jlam Exp $ --- cvsweb.cgi.orig Tue Jul 23 15:58:32 2002 +++ cvsweb.cgi Wed Jul 24 11:01:53 2002 diff --git a/www/cvsweb/patches/patch-ab b/www/cvsweb/patches/patch-ab index 887883c3ccd..fb5ad4dce57 100644 --- a/www/cvsweb/patches/patch-ab +++ b/www/cvsweb/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/07/24 11:38:47 martti Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:07 jlam Exp $ --- cvsweb.conf.orig Wed Jul 10 17:30:56 2002 +++ cvsweb.conf Wed Jul 24 11:02:29 2002 diff --git a/www/dillo/Makefile b/www/dillo/Makefile index c3928dc51c2..1e0e5568931 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/06/27 20:15:04 agc Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 21:52:08 jlam Exp $ # DISTNAME= dillo-0.6.6 @@ -9,16 +9,17 @@ MAINTAINER= Benjamin.Wong@cc.gatech.edu HOMEPAGE= http://dillo.cipsga.org.br/ COMMENT= Very small and fast graphical web-browser -USE_BUILDLINK_ONLY= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_BUILDLINK2= yes +USE_X11= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/dillo -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/dillo/distinfo b/www/dillo/distinfo index 0ce76f0ab5a..8b7072b2fc0 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/06/27 20:15:05 agc Exp $ +$NetBSD: distinfo,v 1.10 2002/08/25 21:52:08 jlam Exp $ SHA1 (dillo-0.6.6.tar.gz) = 6ff27fe122f53f2e554a5377b67258d2df7ec381 Size (dillo-0.6.6.tar.gz) = 310331 bytes diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab index af04a4fb0df..8c92ab926e2 100644 --- a/www/dillo/patches/patch-ab +++ b/www/dillo/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2002/05/21 11:13:31 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2002/08/25 21:52:09 jlam Exp $ --- Makefile.in.orig Tue May 21 12:53:53 2002 +++ Makefile.in diff --git a/www/elinks/Makefile b/www/elinks/Makefile index e677806d308..c2acb21b29d 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/30 04:02:54 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:52:09 jlam Exp $ # DISTNAME= elinks-0.3.0 @@ -13,7 +13,7 @@ COMMENT= Extended/Enhanced Links (elinks) CONFLICTS= links-[0-9]* links-gui-[0-9]* GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/elinks/PLIST b/www/elinks/PLIST index f873c74ea0c..86193dffab0 100644 --- a/www/elinks/PLIST +++ b/www/elinks/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/17 18:06:19 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:52:09 jlam Exp $ bin/links man/man1/links.1 diff --git a/www/elinks/distinfo b/www/elinks/distinfo index a245ad05e18..bceb64299bf 100644 --- a/www/elinks/distinfo +++ b/www/elinks/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/02 13:03:11 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 21:52:10 jlam Exp $ SHA1 (elinks-0.3.0.tar.bz2) = c531d7922b1fb51fb8eeda960ff1e41c656db03e Size (elinks-0.3.0.tar.bz2) = 446820 bytes diff --git a/www/kannel/Makefile b/www/kannel/Makefile index b96f7504015..9c238159345 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/22 11:31:33 martti Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:10 jlam Exp $ # DISTNAME= gateway-${KANNEL_VER} @@ -13,14 +13,16 @@ COMMENT= Open source WAP and SMS gateway KANNEL_VER= 1.2.0 GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_GMAKE= YES USE_PERL5= YES PTHREAD_OPTS+= require CONFIGURE_ARGS+= --disable-docs CONFIGURE_ARGS+= --disable-ssl +CFLAGS+= -I${BUILDLINK_PREFIX.libxml2}/include/libxml2/libxml + +.include "../../textproc/libxml2/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" -.include "../../textproc/libxml2/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/kannel/PLIST b/www/kannel/PLIST index 2ccc25843f3..3c479ac6329 100644 --- a/www/kannel/PLIST +++ b/www/kannel/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/22 11:31:33 martti Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:11 jlam Exp $ bin/seewbmp bin/wmlsc bin/wmlsdasm diff --git a/www/kannel/distinfo b/www/kannel/distinfo index c8dcb6d4983..8849ff73f22 100644 --- a/www/kannel/distinfo +++ b/www/kannel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/08/22 11:31:34 martti Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 21:52:11 jlam Exp $ SHA1 (gateway-1.2.0.tar.gz) = f81fdfca26be69de8505550a076fb3628f477af2 Size (gateway-1.2.0.tar.gz) = 2094749 bytes diff --git a/www/kannel/patches/patch-aa b/www/kannel/patches/patch-aa index 44833ee7cf7..f29dc5d844d 100644 --- a/www/kannel/patches/patch-aa +++ b/www/kannel/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2002/08/22 11:31:35 martti Exp $ +$NetBSD: patch-aa,v 1.4 2002/08/25 21:52:11 jlam Exp $ --- utils/start-stop-daemon.c.orig Mon Apr 23 16:52:29 2001 +++ utils/start-stop-daemon.c Sun Jul 7 21:28:04 2002 diff --git a/www/kannel/patches/patch-ab b/www/kannel/patches/patch-ab index b0cc30f4055..099d58a9054 100644 --- a/www/kannel/patches/patch-ab +++ b/www/kannel/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/22 11:31:35 martti Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:12 jlam Exp $ --- Makefile.in.orig Tue Jun 11 20:59:52 2002 +++ Makefile.in Sun Jul 7 21:30:27 2002 diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile index 0b870aaf104..e7d417a214c 100644 --- a/www/links-gui/Makefile +++ b/www/links-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/07/26 15:29:23 jschauma Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 21:52:14 jlam Exp $ # PKGNAME= links-gui-2.1.0.2 @@ -6,9 +6,14 @@ COMMENT= Lynx-like text and graphics WWW browser CONFLICTS+= links-[0-9]* elinks-[0-9]* +USE_BUILDLINK2= YES +USE_X11= YES + +.include "../../www/links/Makefile.common" + CONFIGURE_ARGS+= --enable-graphics -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" + .include "../../www/links/Makefile.common" diff --git a/www/links-gui/distinfo b/www/links-gui/distinfo index bea413ca0a8..3add7a0c8b9 100644 --- a/www/links-gui/distinfo +++ b/www/links-gui/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/02 11:23:05 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 21:52:14 jlam Exp $ SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 Size (links-2.1pre2.tar.bz2) = 3509541 bytes diff --git a/www/links/Makefile b/www/links/Makefile index 26f1eea6774..ffe1bed752f 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.13 2002/07/02 11:23:04 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 21:52:13 jlam Exp $ # PKGNAME= links-2.1.0.2 - COMMENT= Lynx-like text WWW browser CONFLICTS+= links-gui-[0-9]* elinks-[0-9]* -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../www/links/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/www/links/Makefile.common b/www/links/Makefile.common index 2ff6b33369a..63e80aa5ad8 100644 --- a/www/links/Makefile.common +++ b/www/links/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2002/07/02 11:23:04 wiz Exp $ +# $NetBSD: Makefile.common,v 1.3 2002/08/25 21:52:13 jlam Exp $ # DISTNAME= links-2.1pre2 @@ -13,10 +13,8 @@ MAINTAINER= jschauma@netbsd.org HOMEPAGE= http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/ GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES - CONFIGURE_ARGS+= --enable-javascript -PLIST_SRC= ../../www/links/PLIST -.include "../../security/openssl/buildlink.mk" -.include "../../mk/bsd.pkg.mk" +PLIST_SRC= ${.CURDIR}/../../www/links/PLIST + +.include "../../security/openssl/buildlink2.mk" diff --git a/www/links/distinfo b/www/links/distinfo index 8bd039c1387..9d57f1c4a52 100644 --- a/www/links/distinfo +++ b/www/links/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/07/02 11:23:04 wiz Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 21:52:13 jlam Exp $ SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 Size (links-2.1pre2.tar.bz2) = 3509541 bytes diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index c3a1835cbce..e786337ca68 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2002/05/22 15:01:28 fredb Exp $ +# $NetBSD: Makefile,v 1.40 2002/08/25 21:52:16 jlam Exp $ # DISTNAME= lynx2.8.5dev.7 @@ -15,11 +15,10 @@ HOMEPAGE= http://lynx.browser.org/ COMMENT= Alphanumeric display oriented World-Wide Web Client BUILD_USES_MSGFMT= yes -USE_BUILDLINK_ONLY= yes WRKSRC= ${WRKDIR}/lynx2-8-5 -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALL_TARGET= install-full install-lss @@ -63,10 +62,10 @@ post-install: .include "../../mk/bsd.prefs.mk" .if (${LYNX_SCREEN_LIB} == slang) -. include "../../devel/libslang/buildlink.mk" +. include "../../devel/libslang/buildlink2.mk" .elif (${LYNX_SCREEN_LIB} == ncurses) USE_NCURSES= color -. include "../../devel/ncurses/buildlink.mk" +. include "../../devel/ncurses/buildlink2.mk" CONFIGURE_ARGS+= --enable-color-style .elif (${LYNX_SCREEN_LIB} == curses) . if ${MACHINE_PLATFORM:MNetBSD-1.5*-i386} != "" @@ -97,10 +96,10 @@ pre-configure: .endif .if ${USE_SOCKS} == 4 CONFIGURE_ARGS+= --with-socks -. include "../../net/socks4/buildlink.mk" +. include "../../net/socks4/buildlink2.mk" .else CONFIGURE_ARGS+= --with-socks5 -. include "../../net/socks5/buildlink.mk" +. include "../../net/socks5/buildlink2.mk" .endif .endif @@ -109,7 +108,8 @@ CONFIGURE_ARGS+= --with-socks5 CONFIGURE_ARGS+= --enable-ipv6 .endif -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" -.include "../../security/openssl/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo index 65c3306a1c0..91d4eaa336c 100644 --- a/www/lynx-current/distinfo +++ b/www/lynx-current/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/08/21 12:01:04 blymn Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:16 jlam Exp $ SHA1 (lynx2.8.5dev.7.tar.bz2) = 8e9eb4bf11944c24517e99ec0ef76b203022c5fe Size (lynx2.8.5dev.7.tar.bz2) = 1966524 bytes diff --git a/www/lynx-current/patches/patch-ab b/www/lynx-current/patches/patch-ab index 418ef218bfa..50d84e01d56 100644 --- a/www/lynx-current/patches/patch-ab +++ b/www/lynx-current/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/21 12:01:04 blymn Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:17 jlam Exp $ --- src/LYCurses.c.orig Wed Aug 21 21:16:48 2002 +++ src/LYCurses.c diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 260063fdc6f..af308c11057 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2002/08/19 23:56:15 fredb Exp $ +# $NetBSD: Makefile,v 1.51 2002/08/25 21:52:14 jlam Exp $ # DISTNAME= lynx2.8.4rel.1 @@ -26,7 +26,7 @@ BUILD_USES_MSGFMT= yes WRKSRC= ${WRKDIR}/lynx2-8-4 -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-bin install-cfg install-help install-lss INSTALL_TARGET+= install-doc install-man @@ -71,10 +71,10 @@ post-install: .include "../../mk/bsd.prefs.mk" .if (${LYNX_SCREEN_LIB} == slang) -. include "../../devel/libslang/buildlink.mk" +. include "../../devel/libslang/buildlink2.mk" .elif (${LYNX_SCREEN_LIB} == ncurses) USE_NCURSES= color -. include "../../devel/ncurses/buildlink.mk" +. include "../../devel/ncurses/buildlink2.mk" CONFIGURE_ARGS+= --enable-color-style .elif (${LYNX_SCREEN_LIB} != curses) pre-configure: @@ -101,10 +101,10 @@ pre-configure: .endif .if ${USE_SOCKS} == 4 CONFIGURE_ARGS+= --with-socks -. include "../../net/socks4/buildlink.mk" +. include "../../net/socks4/buildlink2.mk" .else CONFIGURE_ARGS+= --with-socks5 -. include "../../net/socks5/buildlink.mk" +. include "../../net/socks5/buildlink2.mk" .endif .endif @@ -113,7 +113,8 @@ CONFIGURE_ARGS+= --with-socks5 CONFIGURE_ARGS+= --enable-ipv6 .endif -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" -.include "../../security/openssl/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/lynx/distinfo b/www/lynx/distinfo index 8bc21ff1066..7aaf0ca5f31 100644 --- a/www/lynx/distinfo +++ b/www/lynx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/08/20 13:39:43 blymn Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 21:52:15 jlam Exp $ SHA1 (lynx2.8.4rel.1.tar.bz2) = 11285022fbe6910fb0a47adc14581ceb0c3bfc98 Size (lynx2.8.4rel.1.tar.bz2) = 1940531 bytes diff --git a/www/lynx/patches/patch-ab b/www/lynx/patches/patch-ab index 587b6005028..8885ec50eb3 100644 --- a/www/lynx/patches/patch-ab +++ b/www/lynx/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/20 13:41:33 blymn Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:16 jlam Exp $ --- src/LYCurses.c.orig Tue Aug 20 22:33:51 2002 +++ src/LYCurses.c diff --git a/www/netscape/Makefile b/www/netscape/Makefile index 8236cc29f23..512f226f6a9 100644 --- a/www/netscape/Makefile +++ b/www/netscape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/04/05 11:56:28 tron Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 21:52:18 jlam Exp $ # COMMENT= Open new communicator, navigator, or mozilla window @@ -21,6 +21,8 @@ DEPENDS+= {communicator,navigator,mozilla}-[0-9]*:../../www/communicator DISTFILES= # empty MASTER_SITES= # empty +USE_BUILDLINK2= # defined + EXTRACT_ONLY= # empty WRKSRC= ${WRKDIR} NO_CHECKSUM= yes diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile index a11fca0e798..4b9ffe77d72 100644 --- a/www/ns-remote/Makefile +++ b/www/ns-remote/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/03/26 22:43:46 abs Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 21:52:18 jlam Exp $ DISTNAME= ns-remote PKGNAME= ns-remote-1.6 @@ -12,7 +12,8 @@ COMMENT= remote-control Netscape Navigator and Communicator DIST_SUBDIR= netscape -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= # defined +USE_X11= # defined .include "../../mk/bsd.prefs.mk" @@ -31,5 +32,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ns-remote ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/ns-open ${PREFIX}/bin -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/opera6/Makefile b/www/opera6/Makefile index 32530ff0f73..33e0b46ba1e 100644 --- a/www/opera6/Makefile +++ b/www/opera6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/07/04 22:11:21 tron Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:19 jlam Exp $ DISTNAME= opera-${OPERA_PKG_VERSION} CATEGORIES= www @@ -25,10 +25,12 @@ DIST_SUBDIR= . EXTRACT_ONLY= # empty PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC +USE_BUILDLINK2= # defined + .include "../../mk/bsd.prefs.mk" # A default so lintpkgsrc is happy -OPERA_PKG_VERSION= 6.02 +OPERA_PKG_VERSION= 6.01 .if (${MACHINE_ARCH} == i386) DEPENDS+= suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat diff --git a/www/opera6/distinfo b/www/opera6/distinfo index 9409d8e109b..ade677721cf 100644 --- a/www/opera6/distinfo +++ b/www/opera6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/07/04 22:11:21 tron Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 21:52:19 jlam Exp $ SHA1 (./opera-6.02-20020701.1-static-qt.i386.rpm) = 8d043a6340907289011a6be7a3bd3ffa2b740a2a Size (./opera-6.02-20020701.1-static-qt.i386.rpm) = 4915848 bytes diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index 134c6260054..cb0b8fc3b50 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/20 08:52:33 uebayasi Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:20 jlam Exp $ DISTNAME= sitecopy-0.11.4 CATEGORIES= www @@ -9,11 +9,11 @@ HOMEPAGE= http://www.lyra.org/sitecopy/ COMMENT= utility for synchronizing remote and local web sites USE_GMAKE= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined BUILD_USES_MSGFMT= # defined GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE} CONFIGURE_ARGS+= --with-included-neon CONFIGURE_ARGS+= --enable-libxml @@ -29,8 +29,9 @@ pre-build: ${RM} -f ${WRKSRC}/fnmatch.h ${LN} -sf ${WRKSRC}/lib/fnmatch.h ${WRKSRC}/fnmatch.h -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/libgetopt/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/libgetopt/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/sitecopy/PLIST b/www/sitecopy/PLIST index 36c6f3ad640..34c7c86259d 100644 --- a/www/sitecopy/PLIST +++ b/www/sitecopy/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/20 08:52:33 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:20 jlam Exp $ bin/sitecopy man/man1/sitecopy.1 share/doc/sitecopy/FAQ diff --git a/www/sitecopy/distinfo b/www/sitecopy/distinfo index 4ec0136ceed..bbc7d2d658c 100644 --- a/www/sitecopy/distinfo +++ b/www/sitecopy/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/08/22 09:45:35 uebayasi Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:52:20 jlam Exp $ SHA1 (sitecopy-0.11.4.tar.gz) = 765e40e769e91fff0323e4cae73ad8048b453a2c Size (sitecopy-0.11.4.tar.gz) = 737326 bytes diff --git a/www/sitecopy/patches/patch-aa b/www/sitecopy/patches/patch-aa index cc9cd5e600a..5b3f368e4b0 100644 --- a/www/sitecopy/patches/patch-aa +++ b/www/sitecopy/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2002/08/20 08:52:34 uebayasi Exp $ +$NetBSD: patch-aa,v 1.3 2002/08/25 21:52:21 jlam Exp $ --- Makefile.in.orig Mon Jan 14 06:02:02 2002 +++ Makefile.in diff --git a/www/sitecopy/patches/patch-ab b/www/sitecopy/patches/patch-ab index 35219df9a09..b7b3919c7de 100644 --- a/www/sitecopy/patches/patch-ab +++ b/www/sitecopy/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2002/08/20 08:52:34 uebayasi Exp $ +$NetBSD: patch-ab,v 1.2 2002/08/25 21:52:22 jlam Exp $ --- src/console_fe.c.orig Mon Jan 14 05:42:21 2002 +++ src/console_fe.c diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile index 4c9624f5e0d..0c9fb9edacc 100644 --- a/www/surfraw/Makefile +++ b/www/surfraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/03/22 05:04:12 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 21:52:22 jlam Exp $ # DISTNAME= surfraw-1.0.7 @@ -11,15 +11,15 @@ COMMENT= Shell Users' Revolutionary Front Rage Against the Web CONFLICTS+= surfaw-[0-9]* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} # Override sysconfdir so that the installation puts the example config file # in ${EGDIR}. # -MAKE_FLAGS+= sysconfdir=${EGDIR} -MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}" +MAKE_FLAGS+= sysconfdir=${EGDIR} +MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}" DOCDIR= ${PREFIX}/share/doc/surfraw EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/www/urlget/Makefile b/www/urlget/Makefile index b4f047c5b4f..41bc10aaeb6 100644 --- a/www/urlget/Makefile +++ b/www/urlget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/09/27 19:57:02 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:52:23 jlam Exp $ # DISTNAME= urlget-1.3 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/ MAINTAINER= kim@tac.nyc.ny.us COMMENT= simple command-line tool to retrieve an HTTP URL -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.prefs.mk" diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 41ea2d4a98a..2502e501fa3 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2002/05/17 00:01:12 kei Exp $ +# $NetBSD: Makefile,v 1.38 2002/08/25 21:52:23 jlam Exp $ # PKGNAME= w3m-${W3M_BASE_VERS} diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common index a3c5fa577a3..78dc5bce1d4 100644 --- a/www/w3m/Makefile.common +++ b/www/w3m/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2002/07/19 11:56:47 wiz Exp $ +# $NetBSD: Makefile.common,v 1.8 2002/08/25 21:52:24 jlam Exp $ # DISTNAME= w3m-${W3M_VERS} @@ -8,7 +8,7 @@ MASTER_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/ MAINTAINER= kei@netbsd.org HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/ -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes W3M_VERS= ${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS} W3M_BASE_VERS= 0.3 @@ -96,9 +96,9 @@ CONFIGURE_ENV+= use_cookie=n .endif .if ${W3M_USE_SSL} == YES CONFIGURE_ENV+= use_ssl=y use_ssl_verify=y -CONFIGURE_ARGS+= --ssl-includedir=${BUILDLINK_DIR}/include/openssl -CONFIGURE_ARGS+= --ssl-libdir=${BUILDLINK_DIR}/lib -.include "../../security/openssl/buildlink.mk" +CONFIGURE_ARGS+= --ssl-includedir=${SSLBASE}/include/openssl +CONFIGURE_ARGS+= --ssl-libdir=${SSLBASE}/lib +.include "../../security/openssl/buildlink2.mk" .else CONFIGURE_ENV+= use_ssl=n use_ssl_verify=n .endif @@ -126,8 +126,8 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --bindir=${PREFIX}/bin CONFIGURE_ARGS+= --libdir=${PREFIX}/${HELPERDIR} CONFIGURE_ARGS+= --helpdir=${PREFIX}/${HELPDIR} -CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_PREFIX.boehm-gc}/include +CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_PREFIX.boehm-gc}/lib .if ${W3M_USE_IMAGE} == YES PLIST_SUBST+= USE_IMAGE='' @@ -184,8 +184,8 @@ post-install: ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html) .if ${W3M_USE_IMAGE} == YES -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" .endif -.include "../../devel/boehm-gc/buildlink.mk" +.include "../../devel/boehm-gc/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/w3m/PLIST b/www/w3m/PLIST index fde92532c96..0625cec1d1c 100644 --- a/www/w3m/PLIST +++ b/www/w3m/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/05/10 06:27:22 kei Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 21:52:24 jlam Exp $ bin/w3m man/man1/w3m.1 man/ja_JP.EUC/man1/w3m.1 diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile index 439a0e784b9..5486438db26 100644 --- a/www/wdg-validate/Makefile +++ b/www/wdg-validate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/07/11 09:51:11 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:52:24 jlam Exp $ # DISTNAME= validate @@ -16,9 +16,9 @@ DEPENDS+= lq-sp>=1.3.4.5:../../textproc/lq-sp DIST_SUBDIR= ${PKGNAME} EXTRACT_ONLY= sgml-lib-1.0.tar.gz -USE_BUILDLINK_ONLY= YES -REPLACE_PERL= validate.netbsd -NO_BUILD= YES +USE_BUILDLINK2= YES +REPLACE_PERL= validate.netbsd +NO_BUILD= YES post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/validate ${WRKSRC}/validate.netbsd @@ -34,5 +34,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/validate.README ${CP} -R ${WRKSRC}/lib/* ${PREFIX}/lib/validate -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/wdg-validate/distinfo b/www/wdg-validate/distinfo index cc99954c28d..b3441276d5a 100644 --- a/www/wdg-validate/distinfo +++ b/www/wdg-validate/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/07/11 09:51:11 wiz Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:25 jlam Exp $ SHA1 (wdg-validate-1.0.4/validate) = eb9ea352528fa5db2cbedc5ad4dbe59aa91d5e58 Size (wdg-validate-1.0.4/validate) = 15210 bytes diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index d2ee917b8ef..94687e85b9c 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/03/13 17:37:53 fredb Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 21:52:25 jlam Exp $ # DISTNAME= webalizer-2.01-09-src @@ -16,11 +16,12 @@ COMMENT= Web server log file analysis program WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --enable-dns -CONFIGURE_ENV+= ac_cv_GDLIB=${BUILDLINK_DIR}/include +CONFIGURE_ENV+= ac_cv_GDLIB=${BUILDLINK_PREFIX.gd}/include EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/webalizer.conf.sample ${PKG_SYSCONFDIR}/webalizer.conf @@ -32,7 +33,7 @@ post-build: ${MV} -f ${WRKSRC}/$${file}.fixed ${WRKSRC}/$${file}; \ done -.include "../../graphics/gd/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/gd/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/weblint/Makefile b/www/weblint/Makefile index 4455e3abe11..4b91e6ff35c 100644 --- a/www/weblint/Makefile +++ b/www/weblint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/11/29 13:27:48 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:52:25 jlam Exp $ # DISTNAME= weblint-1.020 @@ -13,7 +13,7 @@ MAINTAINER= packages@netbsd.org #HOMEPAGE= http://www.weblint.org/ COMMENT= HTML validator and sanity checker -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |