? wip ? mk/pkgformat/pkg/depends.mk-20130327 Index: chat/libpurple/buildlink3.mk =================================================================== RCS file: /cvsroot/pkgsrc/chat/libpurple/buildlink3.mk,v retrieving revision 1.39 diff -p -u -r1.39 buildlink3.mk --- chat/libpurple/buildlink3.mk 16 Feb 2013 11:19:23 -0000 1.39 +++ chat/libpurple/buildlink3.mk 13 Apr 2013 16:07:48 -0000 @@ -23,6 +23,8 @@ pkgbase := libpurple .if empty(PKG_BUILD_OPTIONS.libpurple:Mgnutls) . include "../../devel/nss/buildlink3.mk" .endif + +.include "../../devel/glib2/buildlink3.mk" .endif # LIBPURPLE_BUILDLINK3_MK BUILDLINK_TREE+= -libpurple Index: chat/weechat/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/chat/weechat/distinfo,v retrieving revision 1.23 diff -p -u -r1.23 distinfo --- chat/weechat/distinfo 24 Nov 2012 11:16:06 -0000 1.23 +++ chat/weechat/distinfo 13 Apr 2013 16:07:48 -0000 @@ -6,5 +6,7 @@ Size (weechat-0.3.9.2.tar.bz2) = 2721004 SHA1 (patch-aa) = 86a3cfd780fb52d8dea92d5f9d72bb3ac2df91bf SHA1 (patch-ab) = d0fac0994602dfa0afde9fe14487f44f8cce25d6 SHA1 (patch-ac) = e9fa664f040bd6549ddd8e860ec4568931bcab6b -SHA1 (patch-src_gui_curses_gui-curses-term_c) = 85d59b3bc4dc3bac8b972d19a20a35afbcd599c8 +SHA1 (patch-configure) = e7d8c886fd55f633ffd4a3419a445c031b561d2b +SHA1 (patch-configure.in) = 9d341fe4d046333a5e5aafe48c2edf8f26448a8d +SHA1 (patch-src_gui_curses_gui-curses-term_c) = db7a4223e728d9f30491eada9d1c41881ea2e066 SHA1 (patch-src_plugins_script_script_repo_h) = 041b5e284a3b4cd6998c7e93e3f24f8ccb04980a Index: chat/weechat/patches/patch-configure =================================================================== RCS file: chat/weechat/patches/patch-configure diff -N chat/weechat/patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ chat/weechat/patches/patch-configure 13 Apr 2013 16:07:48 -0000 @@ -0,0 +1,15 @@ +$NetBSD$ + +Check for . + +--- configure.orig 2013-01-19 17:37:48.000000000 +0000 ++++ configure +@@ -17137,7 +17137,7 @@ $as_echo "$as_me: WARNING: + else + NCURSES_LFLAGS="-lncursesw" + fi +- for ac_header in ncurses.h ncursesw/curses.h ++ for ac_header in ncurses.h ncurses/term.h ncursesw/curses.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" Index: chat/weechat/patches/patch-configure.in =================================================================== RCS file: chat/weechat/patches/patch-configure.in diff -N chat/weechat/patches/patch-configure.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ chat/weechat/patches/patch-configure.in 13 Apr 2013 16:07:48 -0000 @@ -0,0 +1,15 @@ +$NetBSD$ + +Check for . + +--- configure.in.orig 2012-11-18 09:50:21.000000000 +0000 ++++ configure.in +@@ -200,7 +200,7 @@ if test "x$enable_ncurses" = "xyes" ; th + else + NCURSES_LFLAGS="-lncursesw" + fi +- AC_CHECK_HEADERS([ncurses.h ncursesw/curses.h]) ++ AC_CHECK_HEADERS([ncurses.h ncurses/term.h ncursesw/curses.h]) + AC_SUBST(NCURSES_LFLAGS) + else + not_asked="$not_asked ncurses" Index: chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c =================================================================== RCS file: /cvsroot/pkgsrc/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c,v retrieving revision 1.1 diff -p -u -r1.1 patch-src_gui_curses_gui-curses-term_c --- chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c 29 May 2012 00:32:27 -0000 1.1 +++ chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c 13 Apr 2013 16:07:48 -0000 @@ -1,13 +1,21 @@ -$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.1 2012/05/29 00:32:27 dholland Exp $ +$NetBSD$ + +Include , not . +Check for HAVE_NCURSES_TERM_H, not for HAVE_NCURSES_CURSES_H. Workaround for build failure on early NetBSD 6.99.* and prerelease 6.0 (PR 46492) ---- src/gui/curses/gui-curses-term.c~ 2012-01-08 10:28:06.000000000 +0000 +--- src/gui/curses/gui-curses-term.c.orig 2012-03-10 07:56:43.000000000 +0000 +++ src/gui/curses/gui-curses-term.c -@@ -28,6 +28,10 @@ - #ifdef HAVE_NCURSESW_CURSES_H - #include +@@ -25,9 +25,13 @@ + #include "config.h" + #endif + +-#ifdef HAVE_NCURSESW_CURSES_H +-#include ++#ifdef HAVE_NCURSES_TERM_H ++#include #else +#ifdef __NetBSD__ +/* workaround for build failure on early 6.99.* and prerelease 6.0 */ Index: cross/libtool-base/DESCR =================================================================== RCS file: cross/libtool-base/DESCR diff -N cross/libtool-base/DESCR --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross/libtool-base/DESCR 13 Apr 2013 16:07:49 -0000 @@ -0,0 +1,10 @@ +This is GNU Libtool, a generic library support script. Libtool hides +the complexity of using shared libraries behind a consistent, portable +interface. + +To use libtool, add the new generic library building commands to your +Makefile, Makefile.in, or Makefile.am. + +This package includes the libtool script and support files. + +This is the cross-compilation version of libtool. Index: cross/libtool-base/Makefile =================================================================== RCS file: cross/libtool-base/Makefile diff -N cross/libtool-base/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross/libtool-base/Makefile 13 Apr 2013 16:07:49 -0000 @@ -0,0 +1,108 @@ +# copypasta from devel/libtool-base/Makefile, tweaked slightly + +# $NetBSD: Makefile,v 1.98 2012/07/26 12:04:04 bsiegert Exp $ + +########################################################################### +########################################################################### +# +# HEADS UP! DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS: +# +########################################################################### +########################################################################### +# +# This package is maintained specially in order to preserve pkgsrc +# specific OS changes that diverge from the "out of the box" libtool. +# In order to keep this package in a maintainable condition, the .m4 files +# must be manipulated in order to generate the patch-* files. +# +# See devel/libtool/patches/manual.README for instructions on how to make +# these patch files properly; otherwise your changes WILL be lost on the +# next libtool update. +# +# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE +# INSTRUCTIONS. There are no exceptions to this rule. +# +########################################################################### +########################################################################### + +.include "../../devel/libtool/Makefile.common" + +# [TRC 20130325: Tweak for cross-build.] +PKGNAME= ${DISTNAME:S/^libtool-/cross-libtool-base-${TARGET_ARCH}-/} +PKGREVISION= 8 +SVR4_PKGNAME= ltoob + +COMMENT= Generic shared library support script (the script itself) + +CONFLICTS+= libtool<=1.3.5nb11 + +# [TRC 20130325: Set for cross-build.] +USE_CROSSBASE= yes + +TEST_TARGET= check +PLIST_VARS+= shlibtool + +OVERRIDE_DIRDEPTH.install-sh= 1 + +.if ${OPSYS} == "AIX" + +# always build libraries and executables that use the runtime linker. +# in addition, disable libtool locking, as the test is broken on AIX, +# and results in files being locked indefinitely. +LDFLAGS+= -Wl,-brtl +CONFIGURE_ARGS+= --disable-libtool-lock + +.elif ${OPSYS} == "IRIX" + +# The MIPSpro compiler doesn't support -c with -o, but the locking +# workaround is itself broken. Disable it unconditionally. +CONFIGURE_ARGS+= --disable-libtool-lock + +.elif ${OPSYS} == "NetBSD" +. if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) +CONFIGURE_ARGS+= --disable-shared +BUILD_SHLIBTOOL= NO +. endif + +.elif ${OPSYS} == "SunOS" +CFLAGS+= ${_COMPILER_ABI_FLAG.${ABI}} +.endif + +BUILD_SHLIBTOOL?= YES + +# We are going to want libtool to find the same versions of the C, C++, +# and Fortran compilers. +# +USE_LANGUAGES= c c++ fortran77 +CONFIGURE_ARGS+= --disable-ltdl-install + +USE_TOOLS+= echo + +.PHONY: fix-libtool +fix-libtool: + cd ${WRKSRC}; for f in libtool; do \ + ${SED} -e "s,-L${BUILDLINK_DIR}/lib,," $$f > $$f.new; \ + if [ -x $$f ]; then ${CHMOD} +x $$f.new; fi; \ + ${MV} -f $$f.new $$f; \ + done + +post-build: fix-libtool + +.if ${BUILD_SHLIBTOOL} != "NO" +PLIST.shlibtool= yes + +# [TRC 20130325: Hack for cross-build.] +FILESDIR= ../../devel/libtool-base/files +post-build: + @${SED} -e "s|@PREFIX@|"${PREFIX:Q}"|g" \ + -e "s|@SH@|"${SH:Q}"|g" \ + ${FILESDIR}/shlibtool.in > ${WRKSRC}/shlibtool + +post-install: + ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${DESTDIR}${PREFIX}/bin/shlibtool +.endif + +BUILDLINK_DEPMETHOD.dlcompat= build + +.include "../../mk/dlopen.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: cross/libtool-base/PLIST =================================================================== RCS file: cross/libtool-base/PLIST diff -N cross/libtool-base/PLIST --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross/libtool-base/PLIST 13 Apr 2013 16:07:49 -0000 @@ -0,0 +1,53 @@ +@comment $NetBSD$ +bin/libtool +bin/libtoolize +${PLIST.shlibtool}bin/shlibtool +share/aclocal/argz.m4 +share/aclocal/libtool.m4 +share/aclocal/ltdl.m4 +share/aclocal/ltoptions.m4 +share/aclocal/ltsugar.m4 +share/aclocal/ltversion.m4 +share/aclocal/lt~obsolete.m4 +share/libtool/config/compile +share/libtool/config/config.guess +share/libtool/config/config.sub +share/libtool/config/depcomp +share/libtool/config/install-sh +share/libtool/config/ltmain.sh +share/libtool/config/missing +share/libtool/libltdl/COPYING.LIB +share/libtool/libltdl/Makefile.am +share/libtool/libltdl/Makefile.in +share/libtool/libltdl/Makefile.inc +share/libtool/libltdl/README +share/libtool/libltdl/aclocal.m4 +share/libtool/libltdl/argz.c +share/libtool/libltdl/argz_.h +share/libtool/libltdl/config-h.in +share/libtool/libltdl/configure +share/libtool/libltdl/configure.ac +share/libtool/libltdl/libltdl/lt__alloc.h +share/libtool/libltdl/libltdl/lt__dirent.h +share/libtool/libltdl/libltdl/lt__glibc.h +share/libtool/libltdl/libltdl/lt__private.h +share/libtool/libltdl/libltdl/lt__strl.h +share/libtool/libltdl/libltdl/lt_dlloader.h +share/libtool/libltdl/libltdl/lt_error.h +share/libtool/libltdl/libltdl/lt_system.h +share/libtool/libltdl/libltdl/slist.h +share/libtool/libltdl/loaders/dld_link.c +share/libtool/libltdl/loaders/dlopen.c +share/libtool/libltdl/loaders/dyld.c +share/libtool/libltdl/loaders/load_add_on.c +share/libtool/libltdl/loaders/loadlibrary.c +share/libtool/libltdl/loaders/preopen.c +share/libtool/libltdl/loaders/shl_load.c +share/libtool/libltdl/lt__alloc.c +share/libtool/libltdl/lt__dirent.c +share/libtool/libltdl/lt__strl.c +share/libtool/libltdl/lt_dlloader.c +share/libtool/libltdl/lt_error.c +share/libtool/libltdl/ltdl.c +share/libtool/libltdl/ltdl.h +share/libtool/libltdl/slist.c Index: devel/gmp/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/devel/gmp/Makefile,v retrieving revision 1.68 diff -p -u -r1.68 Makefile --- devel/gmp/Makefile 12 Feb 2013 09:15:36 -0000 1.68 +++ devel/gmp/Makefile 13 Apr 2013 16:07:49 -0000 @@ -27,6 +27,10 @@ PLIST_VARS+= cxx .include "../../mk/bsd.prefs.mk" +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +.endif + .if empty(PKGSRC_COMPILER:Msunpro) CONFIGURE_ARGS+= --enable-cxx PLIST.cxx= yes Index: devel/libevent/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/devel/libevent/Makefile,v retrieving revision 1.43 diff -p -u -r1.43 Makefile --- devel/libevent/Makefile 6 Feb 2013 23:21:03 -0000 1.43 +++ devel/libevent/Makefile 13 Apr 2013 16:07:49 -0000 @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.43 2013/02/06 23:21:03 jperkin Exp $ -DISTNAME= libevent-2.0.21-stable -PKGNAME= ${DISTNAME:S/-stable//} +.include "../../devel/libevent/Makefile.common" + +PKGNAME= libevent-${LIBEVENT_VERSION} PKGREVISION= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=levent/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://libevent.org/ @@ -18,7 +18,6 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= libevent_openssl.pc.in PKGCONFIG_OVERRIDE+= libevent_pthreads.pc.in PKGCONFIG_OVERRIDE+= libevent.pc.in -REPLACE_PYTHON= event_rpcgen.py TEST_TARGET= verify LIBS.SunOS+= -lnsl -lresolv @@ -34,6 +33,5 @@ CONFIGURE_ENV+= ac_cv_func_strtoll=yes CPPFLAGS+= -Dstrtoll=__strtoll .endif -.include "../../lang/python/application.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: devel/libevent/Makefile.common =================================================================== RCS file: devel/libevent/Makefile.common diff -N devel/libevent/Makefile.common --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/libevent/Makefile.common 13 Apr 2013 16:07:49 -0000 @@ -0,0 +1,9 @@ +# $NetBSD$ + +# used by devel/libevent/Makefile +# used by devel/py-libevent-rpcgen/Makefile + +LIBEVENT_VERSION= 2.0.21 + +DISTNAME= libevent-${LIBEVENT_VERSION}-stable +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=levent/} Index: devel/libevent/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/devel/libevent/PLIST,v retrieving revision 1.6 diff -p -u -r1.6 PLIST --- devel/libevent/PLIST 11 Feb 2011 21:13:47 -0000 1.6 +++ devel/libevent/PLIST 13 Apr 2013 16:07:49 -0000 @@ -1,5 +1,4 @@ @comment $NetBSD: PLIST,v 1.6 2011/02/11 21:13:47 tnn Exp $ -bin/event_rpcgen.py include/evdns.h include/event.h include/event2/buffer.h Index: devel/libevent/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/devel/libevent/distinfo,v retrieving revision 1.28 diff -p -u -r1.28 distinfo --- devel/libevent/distinfo 16 Dec 2012 11:26:07 -0000 1.28 +++ devel/libevent/distinfo 13 Apr 2013 16:07:49 -0000 @@ -3,3 +3,5 @@ $NetBSD: distinfo,v 1.28 2012/12/16 11:2 SHA1 (libevent-2.0.21-stable.tar.gz) = 3e6674772eb77de24908c6267c698146420ab699 RMD160 (libevent-2.0.21-stable.tar.gz) = 7345c8fa2d70ee3e5555b5911d9d8cb97614d644 Size (libevent-2.0.21-stable.tar.gz) = 850772 bytes +SHA1 (patch-Makefile.am) = 2518403715eabaeef5e7edfccf3732607cba6309 +SHA1 (patch-Makefile.in) = 23b6f6ce916d5c04af9aa75ba40f007b4358aae0 Index: devel/libevent/patches/patch-Makefile.am =================================================================== RCS file: devel/libevent/patches/patch-Makefile.am diff -N devel/libevent/patches/patch-Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/libevent/patches/patch-Makefile.am 13 Apr 2013 16:07:49 -0000 @@ -0,0 +1,15 @@ +$NetBSD$ + +Don't install event_rpcgen.py. + +--- Makefile.am.orig 2012-11-18 06:38:50.000000000 +0000 ++++ Makefile.am +@@ -86,7 +86,7 @@ VERSION_INFO = 6:9:1 + # series won't be binary-compatible. + + if INSTALL_LIBEVENT +-dist_bin_SCRIPTS = event_rpcgen.py ++dist_bin_SCRIPTS = + endif + + pkgconfigdir=$(libdir)/pkgconfig Index: devel/libevent/patches/patch-Makefile.in =================================================================== RCS file: devel/libevent/patches/patch-Makefile.in diff -N devel/libevent/patches/patch-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/libevent/patches/patch-Makefile.in 13 Apr 2013 16:07:49 -0000 @@ -0,0 +1,24 @@ +$NetBSD$ + +Don't install event_rpcgen.py. + +--- Makefile.in.orig 2012-11-19 15:13:17.000000000 +0000 ++++ Makefile.in +@@ -210,7 +210,7 @@ libevent_pthreads_la_LINK = $(LIBTOOL) - + @INSTALL_LIBEVENT_FALSE@@PTHREADS_TRUE@am_libevent_pthreads_la_rpath = + @INSTALL_LIBEVENT_TRUE@@PTHREADS_TRUE@am_libevent_pthreads_la_rpath = \ + @INSTALL_LIBEVENT_TRUE@@PTHREADS_TRUE@ -rpath $(libdir) +-am__dist_bin_SCRIPTS_DIST = event_rpcgen.py ++am__dist_bin_SCRIPTS_DIST = + SCRIPTS = $(dist_bin_SCRIPTS) + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -508,7 +508,7 @@ VERSION_INFO = 6:9:1 + # nice and rare. For the next couple of years, though, 'struct event' + # is user-visible, and so we can pretty much guarantee that release + # series won't be binary-compatible. +-@INSTALL_LIBEVENT_TRUE@dist_bin_SCRIPTS = event_rpcgen.py ++@INSTALL_LIBEVENT_TRUE@dist_bin_SCRIPTS = + pkgconfigdir = $(libdir)/pkgconfig + LIBEVENT_PKGCONFIG = libevent.pc $(am__append_2) $(am__append_4) + Index: devel/libtool/Makefile.common =================================================================== RCS file: /cvsroot/pkgsrc/devel/libtool/Makefile.common,v retrieving revision 1.78 diff -p -u -r1.78 Makefile.common --- devel/libtool/Makefile.common 31 Oct 2012 11:17:23 -0000 1.78 +++ devel/libtool/Makefile.common 13 Apr 2013 16:07:50 -0000 @@ -41,8 +41,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgvie GNU_CONFIGURE= yes -DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo -PATCHDIR= ${.CURDIR}/../libtool/patches +DISTINFO_FILE= ${.CURDIR}/../../devel/libtool/distinfo +PATCHDIR= ${.CURDIR}/../../devel/libtool/patches AUTOMAKE_OVERRIDE= NO @@ -60,12 +60,15 @@ CONFIGURE_ENV+= lt_cv_path_LD=${LD:Q} CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} # The configure script doesn't seem to be working out the need for -p -# or -B, so tell it +# or -B, so tell it. For cross-compilation, force it to use the normal +# NM and not the one in ${BUILDLINK_DIR}. # .if ${OPSYS} == "SunOS" || ${OPSYS} == "HPUX" CONFIGURE_ENV+= lt_cv_path_NM="nm -p" .elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" CONFIGURE_ENV+= lt_cv_path_NM="nm -B" +.else +CONFIGURE_ENV+= lt_cv_path_NM=${NM:Q} .endif CONFIGURE_ENV+= RANLIB=${RANLIB:Q} Index: devel/ncurses/Makefile.common =================================================================== RCS file: /cvsroot/pkgsrc/devel/ncurses/Makefile.common,v retrieving revision 1.18 diff -p -u -r1.18 Makefile.common --- devel/ncurses/Makefile.common 31 Oct 2012 11:17:31 -0000 1.18 +++ devel/ncurses/Makefile.common 13 Apr 2013 16:07:50 -0000 @@ -33,6 +33,13 @@ CONFIGURE_ARGS+= --includedir=${PREFIX}/ MAKE_JOBS_SAFE= no .include "../../mk/bsd.prefs.mk" + +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +TOOL_DEPENDS+= ncurses-${NC_VERS}:../../devel/ncurses +CONFIGURE_ENV+= BUILD_CC=${NATIVE_CC:Q} +CONFIGURE_ENV+= ac_cv_path_TIC_PATH=${LOCALBASE}/bin/tic +.endif + .if !defined(TOOLS_TBL) # This means that groff needs to be built to get tbl(1). # We can only build groff if there is a builtin implementation of curses, Index: devel/py-libevent-rpcgen/DESCR =================================================================== RCS file: devel/py-libevent-rpcgen/DESCR diff -N devel/py-libevent-rpcgen/DESCR --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/py-libevent-rpcgen/DESCR 13 Apr 2013 16:07:51 -0000 @@ -0,0 +1 @@ +Python script to generate C code for RPC marshalling with libevent. Index: devel/py-libevent-rpcgen/Makefile =================================================================== RCS file: devel/py-libevent-rpcgen/Makefile diff -N devel/py-libevent-rpcgen/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/py-libevent-rpcgen/Makefile 13 Apr 2013 16:07:51 -0000 @@ -0,0 +1,22 @@ +# $NetBSD$ + +.include "../../libevent/devel/Makefile.common" + +DISTNAME= py-libevent-rpcgen-${LIBEVENT_VERSION} +CATEGORIES= devel + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://libevent.org/ +COMMENT= Python libevent rpcgen script +LICENSE= modified-bsd + +REPLACE_PYTHON= event_rpcgen.py + +do-configure: +do-build: + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/event_rpcgen.py ${DESTDIR}${PREFIX}/bin + +.include "../../lang/python/application.mk" +.include "../../mk/bsd.pkg.mk" Index: devel/py-libevent-rpcgen/PLIST =================================================================== RCS file: devel/py-libevent-rpcgen/PLIST diff -N devel/py-libevent-rpcgen/PLIST --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/py-libevent-rpcgen/PLIST 13 Apr 2013 16:07:51 -0000 @@ -0,0 +1,2 @@ +@comment $NetBSD$ +bin/event_rpcgen.py Index: devel/py-libevent-rpcgen/distinfo =================================================================== RCS file: devel/py-libevent-rpcgen/distinfo diff -N devel/py-libevent-rpcgen/distinfo --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/py-libevent-rpcgen/distinfo 13 Apr 2013 16:07:51 -0000 @@ -0,0 +1,5 @@ +$NetBSD$ + +SHA1 (libevent-2.0.21-stable.tar.gz) = 3e6674772eb77de24908c6267c698146420ab699 +RMD160 (libevent-2.0.21-stable.tar.gz) = 7345c8fa2d70ee3e5555b5911d9d8cb97614d644 +Size (libevent-2.0.21-stable.tar.gz) = 850772 bytes Index: devel/yasm/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/devel/yasm/Makefile,v retrieving revision 1.32 diff -p -u -r1.32 Makefile --- devel/yasm/Makefile 31 Oct 2012 11:19:55 -0000 1.32 +++ devel/yasm/Makefile 13 Apr 2013 16:07:51 -0000 @@ -10,6 +10,11 @@ HOMEPAGE= http://www.tortall.net/project COMMENT= Complete rewrite of the NASM assembler with BSD license LICENSE= modified-bsd AND (artistic OR gnu-gpl-v2 OR gnu-lgpl-v2) +# [TRC 20111214: Observed a build failure which looks like a job +# ordering problem.] +# [TRC 20121126: Let's see whether this is still here.] +#MAKE_JOBS_SAFE= no + USE_TOOLS+= msgfmt GNU_CONFIGURE= YES USE_LIBTOOL= YES Index: lang/gcc46/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/lang/gcc46/Makefile,v retrieving revision 1.22 diff -p -u -r1.22 Makefile --- lang/gcc46/Makefile 3 Oct 2012 21:56:18 -0000 1.22 +++ lang/gcc46/Makefile 13 Apr 2013 16:07:53 -0000 @@ -12,7 +12,7 @@ HOMEPAGE= http://gcc.gnu.org/ COMMENT= GNU Compiler Collection 4.6 LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 -USE_TOOLS+= awk:run bash:run chmod gmake:run makeinfo sed:run +USE_TOOLS+= awk:run bash chmod gmake:run makeinfo sed:run GCC_VERSION= 4.6.3 @@ -64,6 +64,28 @@ REPLACE_BASH+= gcc/dbgcnt.def REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen +# This is necessary because we don't set GNU_CONFIGURE (XXX why not?). +CONFIGURE_ARGS+= --build=${NATIVE_MACHINE_GNU_PLATFORM:Q} +CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} + +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +CONFIGURE_ENV+= CXX_FOR_BUILD=${NATIVE_CXX:Q} + +SUBST_CLASSES+= gccinc +SUBST_FILES.gccinc+= libgcc/Makefile.in +SUBST_MESSAGE.gccinc= Add -I$$(gcc_objdir)/include to INCLUDES in libgcc. +SUBST_STAGE.gccinc= pre-configure +SUBST_SED.gccinc+= \ + -e 's,^INCLUDES = .* -I$$(gcc_objdir) ,&-I$$(gcc_objdir)/include ,1' +.endif + +SUBST_CLASSES+= subhack +SUBST_FILES.subhack+= gcc/Makefile.in +SUBST_MESSAGE.subhack= Mega-kludgerosity for GCC SHLIB_LINK substibustication! +SUBST_STAGE.subhack= pre-configure +SUBST_SED.subhack+= \ + -e 's:subst $$(GCC_FOR_TARGET),$$$$(GCC_FOR_TARGET),:subst $$(GCC_FOR_TARGET) $$(LIBGCC2_FLAGS),$$$$(GCC_FOR_TARGET) $$(LIBGCC2_FLAGS),:1' CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} Index: lang/perl5/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/lang/perl5/Makefile,v retrieving revision 1.199 diff -p -u -r1.199 Makefile --- lang/perl5/Makefile 3 Apr 2013 09:28:55 -0000 1.199 +++ lang/perl5/Makefile 13 Apr 2013 16:07:53 -0000 @@ -164,7 +164,7 @@ SUBST_MESSAGE.mirbsd-paths= Do not use n # Remove a spurious workdir reference SUBST_CLASSES+= rm SUBST_STAGE.rm= pre-install -SUBST_FILES.rm= lib/Config_heavy.pl +SUBST_FILES.rm= config.sh SUBST_MESSAGE.rm= Do not use tools version of rm. SUBST_SED.rm= -e "s!^rm_try='/.*/\\.tools/bin/rm -f!rm_try='/bin/rm -f!" Index: lang/python/pyversion.mk =================================================================== RCS file: /cvsroot/pkgsrc/lang/python/pyversion.mk,v retrieving revision 1.105 diff -p -u -r1.105 pyversion.mk --- lang/python/pyversion.mk 10 Dec 2012 03:15:48 -0000 1.105 +++ lang/python/pyversion.mk 13 Apr 2013 16:07:53 -0000 @@ -203,8 +203,9 @@ PYPKGPREFIX= PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" +# XXX BUILD_DEPENDS/TOOL_DEPENDS split makes this variable name confusing. .if defined(PYTHON_FOR_BUILD_ONLY) -BUILDLINK_DEPMETHOD.python?= build +BUILDLINK_DEPMETHOD.python?= tool .endif .if defined(PYPKGSRCDIR) .include "${PYPKGSRCDIR}/buildlink3.mk" Index: lang/python27/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/lang/python27/Makefile,v retrieving revision 1.22 diff -p -u -r1.22 Makefile --- lang/python27/Makefile 8 Feb 2013 12:23:24 -0000 1.22 +++ lang/python27/Makefile 13 Apr 2013 16:07:53 -0000 @@ -174,7 +174,18 @@ post-install: .endif USE_GNU_READLINE= yes -BUILDLINK_DEPMETHOD.readline= build +# [TRC 20130326: Hack for cross-compilation. bl3 build dependencies +# don't seem to work. But I'm not sure what this is here for anyway, +# so...] +#BUILDLINK_DEPMETHOD.readline= build + +# [TRC 20130326: Hack for cross-compilation.] +.if ${OPSYS} == "NetBSD" +CONFIGURE_ENV+= ac_cv_have_long_long_format=yes +CONFIGURE_ENV+= ac_cv_have_long_long_format=yes +CONFIGURE_ENV+= ac_cv_func_tempnam=no +CONFIGURE_ENV+= ac_cv_func_tmpnam=no +.endif .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" Index: mail/mutt-devel/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/mail/mutt-devel/Makefile,v retrieving revision 1.93 diff -p -u -r1.93 Makefile --- mail/mutt-devel/Makefile 9 Mar 2013 22:15:08 -0000 1.93 +++ mail/mutt-devel/Makefile 13 Apr 2013 16:07:54 -0000 @@ -47,6 +47,11 @@ CONFIGURE_ARGS+= --without-wc-funcs CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh .endif +# Work around a stupid botch whereby mutt checks whether the *build* +# host's /var/mail or /var/spool/mail exists in order to statically +# decide where to read mail from. Seriously? +CONFIGURE_ARGS+= --with-homespool=yes + .include "options.mk" LDFLAGS+= ${_STRIPFLAG_CC} Index: mbone/vic-devel/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/mbone/vic-devel/options.mk,v retrieving revision 1.3 diff -p -u -r1.3 options.mk --- mbone/vic-devel/options.mk 27 Jan 2013 00:15:03 -0000 1.3 +++ mbone/vic-devel/options.mk 13 Apr 2013 16:07:54 -0000 @@ -17,9 +17,9 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --enable-gpl CONFIGURE_ARGS+= --disable-ffmpeg-co CONFIGURE_ARGS+= --disable-x264-co -CONFIGURE_ARGS+= --with-ffmpeginc=${BUILDLINK_PREFIX.ffmpeg}/include -CONFIGURE_ARGS+= --with-ffmpeglib=${BUILDLINK_PREFIX.ffmpeg}/lib -.include "../../multimedia/ffmpeg/buildlink3.mk" +CONFIGURE_ARGS+= --with-ffmpeginc=${BUILDLINK_PREFIX.ffmpeg010}/include +CONFIGURE_ARGS+= --with-ffmpeglib=${BUILDLINK_PREFIX.ffmpeg010}/lib +.include "../../multimedia/ffmpeg010/buildlink3.mk" CONFIGURE_ARGS+= --with-x264inc=${BUILDLINK_PREFIX.x264-devel}/include CONFIGURE_ARGS+= --with-x264lib=${BUILDLINK_PREFIX.x264-devel}/lib Index: mk/bsd.options.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/bsd.options.mk,v retrieving revision 1.67 diff -p -u -r1.67 bsd.options.mk --- mk/bsd.options.mk 18 Feb 2008 14:30:40 -0000 1.67 +++ mk/bsd.options.mk 13 Apr 2013 16:07:55 -0000 @@ -284,7 +284,7 @@ _opt_:= ${_popt_} _opt_:= -${_popt_} . endif . endif -. if empty(PKG_SUPPORTED_OPTIONS:M${_popt_}) +. if empty(_opt_:M-*) && empty(PKG_SUPPORTED_OPTIONS:M${_popt_}) _OPTIONS_UNSUPPORTED:=${_OPTIONS_UNSUPPORTED} ${_opt_} . else . if defined(_PKG_OPTIONS_GROUP_MAP.${_popt_}) Index: mk/bsd.pkg.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.mk,v retrieving revision 1.1987 diff -p -u -r1.1987 bsd.pkg.mk --- mk/bsd.pkg.mk 22 Feb 2013 13:35:27 -0000 1.1987 +++ mk/bsd.pkg.mk 13 Apr 2013 16:07:55 -0000 @@ -96,6 +96,7 @@ MAINTAINER?= pkgsrc-users@NetBSD.org .endif PKGWILDCARD?= ${PKGBASE}-[0-9]* SVR4_PKGNAME?= ${PKGNAME} +TOOL_DEPENDS?= # empty WRKSRC?= ${WRKDIR}/${DISTNAME} # Override for SU_CMD user check @@ -417,10 +418,11 @@ ${FAKEHOMEDIR}: .include "wrapper/bsd.wrapper.mk" -.if defined(ABI_DEPENDS) || defined(BUILD_ABI_DEPENDS) +.if defined(ABI_DEPENDS) || defined(BUILD_ABI_DEPENDS) || defined(TOOL_ABI_DEPENDS) . if !empty(USE_ABI_DEPENDS:M[yY][eE][sS]) DEPENDS+= ${ABI_DEPENDS} BUILD_DEPENDS+= ${BUILD_ABI_DEPENDS} +TOOL_DEPENDS+= ${TOOL_ABI_DEPENDS} # XXX Does this make sense? . else _BUILD_DEFS+= USE_ABI_DEPENDS . endif Index: mk/bsd.pkg.readme.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.readme.mk,v retrieving revision 1.25 diff -p -u -r1.25 bsd.pkg.readme.mk --- mk/bsd.pkg.readme.mk 8 Sep 2011 20:17:15 -0000 1.25 +++ mk/bsd.pkg.readme.mk 13 Apr 2013 16:07:55 -0000 @@ -153,6 +153,8 @@ binpkg-list: # description-file|maintainer|categories|build deps|run deps|for arch| \ # not for opsys # +# XXX Need to handle BUILD_DEPENDS/TOOL_DEPENDS split. +# .PHONY: describe .if !target(describe) describe: Index: mk/bsd.pkg.use.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.use.mk,v retrieving revision 1.51 diff -p -u -r1.51 bsd.pkg.use.mk --- mk/bsd.pkg.use.mk 19 Mar 2012 12:34:14 -0000 1.51 +++ mk/bsd.pkg.use.mk 13 Apr 2013 16:07:55 -0000 @@ -90,15 +90,24 @@ BUILD_DEFS+= KERBEROS # LIBTOOL is the publicly-readable variable that should be used by # Makefiles to invoke the proper libtool. # +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +PKG_LIBTOOL?= ${CROSSBASE}/bin/libtool +PKG_SHLIBTOOL?= ${CROSSBASE}/bin/shlibtool +.else PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool +.endif _LIBTOOL?= ${PKG_LIBTOOL} _SHLIBTOOL?= ${PKG_SHLIBTOOL} LIBTOOL?= ${PKG_LIBTOOL} SHLIBTOOL?= ${PKG_SHLIBTOOL} .if defined(USE_LIBTOOL) LIBTOOL_REQD?= 2.2.6bnb3 -BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +TOOL_DEPENDS+= cross-libtool-base-${MACHINE_ARCH}>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../cross/libtool-base +.else +TOOL_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base +.endif CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" .endif Index: mk/bsd.utils.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/bsd.utils.mk,v retrieving revision 1.9 diff -p -u -r1.9 bsd.utils.mk --- mk/bsd.utils.mk 8 Sep 2011 20:17:15 -0000 1.9 +++ mk/bsd.utils.mk 13 Apr 2013 16:07:55 -0000 @@ -10,7 +10,7 @@ # DEPENDS_TYPE?= all .if !empty(DEPENDS_TYPE:Mbuild) || !empty(DEPENDS_TYPE:Mall) -_ALL_DEPENDS+= ${BOOTSTRAP_DEPENDS} ${BUILD_DEPENDS} +_ALL_DEPENDS+= ${BOOTSTRAP_DEPENDS} ${BUILD_DEPENDS} ${TOOL_DEPENDS} .endif .if !empty(DEPENDS_TYPE:Minstall) || !empty(DEPENDS_TYPE:Mpackage) || \ !empty(DEPENDS_TYPE:Mall) @@ -32,6 +32,8 @@ show-depends-dirs show-depends-pkgpaths: # _DEPENDS_WALK_CMD holds the command (sans arguments) to walk the # dependency graph for a package. # +# XXX Need to handle TOOL_DEPENDS/BUILD_DEPENDS split and cross-compilation. +# _DEPENDS_WALK_MAKEFLAGS?= ${MAKEFLAGS} _DEPENDS_WALK_CMD= \ ${PKGSRC_SETENV} ECHO=${TOOLS_ECHO:Q} MAKE=${MAKE:Q} \ Index: mk/buildlink3/bsd.buildlink3.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v retrieving revision 1.218 diff -p -u -r1.218 bsd.buildlink3.mk --- mk/buildlink3/bsd.buildlink3.mk 2 Feb 2013 01:04:59 -0000 1.218 +++ mk/buildlink3/bsd.buildlink3.mk 13 Apr 2013 16:07:55 -0000 @@ -202,6 +202,9 @@ _BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.A . elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mbuild) _BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS _BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_ABI_DEPENDS +. elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mtool) +_BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.TOOL_DEPENDS +#_BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.TOOL_ABI_DEPENDS # XXX? . endif . if defined(BUILDLINK_API_DEPENDS.${_pkg_}) && \ defined(BUILDLINK_PKGSRCDIR.${_pkg_}) @@ -220,7 +223,7 @@ ${_BLNK_ABIMETHOD.${_pkg_}}+= ${_abi_}:$ . endfor . endif .endfor -.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS BUILD_ABI_DEPENDS +.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS BUILD_ABI_DEPENDS TOOL_DEPENDS # TOOL_ABI_DEPENDS XXX? . if !empty(_BLNK_ADD_TO.${_depmethod_}) ${_depmethod_}+= ${_BLNK_ADD_TO.${_depmethod_}} . endif @@ -307,13 +310,20 @@ BUILDLINK_LIBDIRS.${_pkg_}?= lib${LIBABI # . if !defined(_BLNK_PKG_DBDIR.${_pkg_}) _BLNK_PKG_DBDIR.${_pkg_}?= # empty +. if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mtool) +_BLNK_XXX_PKG_INFO= ${HOST_PKG_INFO} +_BLNK_XXX_PKG_DBDIR= ${_HOST_PKG_DBDIR} +.else +_BLNK_XXX_PKG_INFO= ${PKG_INFO} +_BLNK_XXX_PKG_DBDIR= ${_PKG_DBDIR} +.endif . for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}} . if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found) _BLNK_PKG_DBDIR.${_pkg_}!= \ - pkg=`${PKG_INFO} -E "${_depend_}" || ${TRUE}`; \ + pkg=`${_BLNK_XXX_PKG_INFO} -E "${_depend_}" || ${TRUE}`; \ case "$$pkg" in \ "") dir="_BLNK_PKG_DBDIR.${_pkg_}_not_found" ;; \ - *) dir="${_PKG_DBDIR}/$$pkg"; \ + *) dir="${_BLNK_XXX_PKG_DBDIR}/$$pkg"; \ if [ -f $$dir/+DEPOT ]; then \ dir=`${HEAD} -1 $$dir/+DEPOT`; \ fi ;; \ @@ -329,7 +339,7 @@ MAKEVARS+= _BLNK_PKG_DBDIR.${_pkg_} . if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found) _BLNK_PKG_INFO.${_pkg_}?= ${PKG_INFO_CMD} -K ${_BLNK_PKG_DBDIR.${_pkg_}:H} . else -_BLNK_PKG_INFO.${_pkg_}?= ${PKG_INFO_CMD} -K ${_PKG_DBDIR} +_BLNK_PKG_INFO.${_pkg_}?= ${PKG_INFO_CMD} -K ${_BLNK_XXX_PKG_DBDIR} . endif BUILDLINK_PKGNAME.${_pkg_}?= ${_BLNK_PKG_DBDIR.${_pkg_}:T} Index: mk/check/check-perms.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/check/check-perms.mk,v retrieving revision 1.13 diff -p -u -r1.13 check-perms.mk --- mk/check/check-perms.mk 24 Aug 2010 19:08:29 -0000 1.13 +++ mk/check/check-perms.mk 13 Apr 2013 16:07:55 -0000 @@ -55,7 +55,7 @@ _CHECK_PERMS_FLAGS= -c .endif .if !empty(CHECK_PERMS:M[Yy][Ee][Ss]) -BUILD_DEPENDS+= checkperms>=1.1:../../sysutils/checkperms +TOOL_DEPENDS+= checkperms>=1.1:../../sysutils/checkperms privileged-install-hook: _check-perms .endif @@ -75,7 +75,7 @@ _CHECK_PERMS_GETDIRS_AWK= \ _check-perms: .PHONY @${STEP_MSG} "Checking file permissions in ${PKGNAME}" - ${RUN} ${PKG_INFO} -qe "checkperms>=1.1" \ + ${RUN} ${HOST_PKG_INFO} -qe "checkperms>=1.1" \ || { \ ${WARNING_MSG} "[check-perms.mk] Skipping file permissions check."; \ ${WARNING_MSG} "[check-perms.mk] Install sysutils/checkperms to enable this check."; \ Index: mk/compiler/ccache.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/compiler/ccache.mk,v retrieving revision 1.33 diff -p -u -r1.33 ccache.mk --- mk/compiler/ccache.mk 6 Mar 2012 02:44:54 -0000 1.33 +++ mk/compiler/ccache.mk 13 Apr 2013 16:07:55 -0000 @@ -115,7 +115,7 @@ PREPEND_PATH+= ${_CCACHE_DIR}/bin # Add the dependency on ccache. . if ${CCACHE_BASE} == ${LOCALBASE} -BUILD_DEPENDS+= ccache-[0-9]*:../../devel/ccache +TOOL_DEPENDS+= ccache-[0-9]*:../../devel/ccache . endif # Override the compiler-specific hash with the version string for the Index: mk/compiler/clang.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/compiler/clang.mk,v retrieving revision 1.8 diff -p -u -r1.8 clang.mk --- mk/compiler/clang.mk 21 Feb 2013 07:57:19 -0000 1.8 +++ mk/compiler/clang.mk 13 Apr 2013 16:07:55 -0000 @@ -13,7 +13,7 @@ COMPILER_CLANG_MK= defined # Add the dependency on clang # TODO: may be installed already, check for this -#BUILD_DEPENDS+= clang-[0-9]*:../../lang/clang +#TOOL_DEPENDS+= clang-[0-9]*:../../lang/clang .include "../../mk/bsd.prefs.mk" Index: mk/compiler/distcc.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/compiler/distcc.mk,v retrieving revision 1.30 diff -p -u -r1.30 distcc.mk --- mk/compiler/distcc.mk 7 Feb 2008 20:59:05 -0000 1.30 +++ mk/compiler/distcc.mk 13 Apr 2013 16:07:55 -0000 @@ -93,7 +93,7 @@ PREPEND_PATH+= ${_DISTCC_DIR}/bin . endif # Add the dependency on distcc. -BUILD_DEPENDS+= distcc-[0-9]*:../../devel/distcc +TOOL_DEPENDS+= distcc-[0-9]*:../../devel/distcc . if defined(DISTCC_HOSTS) && !empty(DISTCC_HOSTS) PKGSRC_MAKE_ENV+= DISTCC_HOSTS=${DISTCC_HOSTS:Q} Index: mk/compiler/f2c.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/compiler/f2c.mk,v retrieving revision 1.15 diff -p -u -r1.15 f2c.mk --- mk/compiler/f2c.mk 30 Jul 2010 07:58:59 -0000 1.15 +++ mk/compiler/f2c.mk 13 Apr 2013 16:07:55 -0000 @@ -88,9 +88,9 @@ PREPEND_PATH+= ${_F2C_DIR}/bin . endif # Dependencies: -BUILD_DEPENDS+= f2c>=20090411nb2:../../lang/f2c # translator +TOOL_DEPENDS+= f2c>=20090411nb2:../../lang/f2c # translator -.if empty(PKGPATH:Mdevel/libtool-base) # See below +.if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mcross/libtool-base) # See below . include "../../devel/libf2c/buildlink3.mk" # library .endif @@ -99,7 +99,7 @@ PKGSRC_MAKE_ENV+= F2C_DIR=${F2C_DIR:Q} . endif # libtool-base is special as it only needs f77 to extract linker flags etc. -.if !empty(PKGPATH:Mdevel/libtool-base) +.if !empty(PKGPATH:Mdevel/libtool-base) || !empty(PKGPATH:Mcross/libtool-base) pre-configure: fake-f2c-libs _WRAP_EXTRA_ARGS.FC+= -L${WRKDIR}/.f2c/lib -I${WRKDIR}/.f2c/include Index: mk/compiler/pcc.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/compiler/pcc.mk,v retrieving revision 1.5 diff -p -u -r1.5 pcc.mk --- mk/compiler/pcc.mk 26 Dec 2010 14:23:47 -0000 1.5 +++ mk/compiler/pcc.mk 13 Apr 2013 16:07:55 -0000 @@ -14,7 +14,7 @@ COMPILER_PCC_MK= defined # Add the dependency on pcc # NOTE: not enabled by default as may be installed already # TODO: check for this? -#BUILD_DEPENDS+= pcc-[0-9]*:../../lang/pcc +#TOOL_DEPENDS+= pcc-[0-9]*:../../lang/pcc .include "../../mk/bsd.prefs.mk" Index: mk/depends/bsd.depends.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/depends/bsd.depends.mk,v retrieving revision 1.23 diff -p -u -r1.23 bsd.depends.mk --- mk/depends/bsd.depends.mk 1 Oct 2012 09:54:18 -0000 1.23 +++ mk/depends/bsd.depends.mk 13 Apr 2013 16:07:55 -0000 @@ -109,6 +109,6 @@ depends-cookie: # Command line variables: # # VARNAME -# Either DEPENDS or BUILD_DEPENDS. +# DEPENDS, BUILD_DEPENDS, or TOOL_DEPENDS. # show-depends: .PHONY _pkgformat-show-depends Index: mk/emulator/pkg-rpm.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/emulator/pkg-rpm.mk,v retrieving revision 1.4 diff -p -u -r1.4 pkg-rpm.mk --- mk/emulator/pkg-rpm.mk 7 Sep 2010 17:33:40 -0000 1.4 +++ mk/emulator/pkg-rpm.mk 13 Apr 2013 16:07:55 -0000 @@ -56,7 +56,7 @@ # files listed in RPMFILES. # -BUILD_DEPENDS+= rpm2pkg>=3.1.4:../../pkgtools/rpm2pkg +TOOL_DEPENDS+= rpm2pkg>=3.1.4:../../pkgtools/rpm2pkg EVAL_PREFIX+= _RPM2PKG_PREFIX=rpm2pkg RPM2PKG= ${_RPM2PKG_PREFIX}/sbin/rpm2pkg Index: mk/pkgformat/pkg/deinstall.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/pkgformat/pkg/deinstall.mk,v retrieving revision 1.1 diff -p -u -r1.1 deinstall.mk --- mk/pkgformat/pkg/deinstall.mk 15 Oct 2011 00:23:09 -0000 1.1 +++ mk/pkgformat/pkg/deinstall.mk 13 Apr 2013 16:07:55 -0000 @@ -46,6 +46,7 @@ _pkgformat-deinstall: .PHONY ${PKG_DELETE} ${_PKG_ARGS_DEINSTALL} "$$found" || ${TRUE} ; \ fi .if defined(DEINSTALLDEPENDS) && !empty(DEINSTALLDEPENDS:M[yY][eE][sS]) +# XXX Need to handle BUILD_DEPENDS/TOOL_DEPENDS split. . for _pkg_ in ${BUILD_DEPENDS:C/:.*$//} ${RUN} \ found=`${_PKG_BEST_EXISTS} ${_pkg_:Q} || ${TRUE}`; \ Index: mk/pkgformat/pkg/depends.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/pkgformat/pkg/depends.mk,v retrieving revision 1.2 diff -p -u -r1.2 depends.mk --- mk/pkgformat/pkg/depends.mk 2 Jul 2012 14:53:13 -0000 1.2 +++ mk/pkgformat/pkg/depends.mk 13 Apr 2013 16:07:55 -0000 @@ -33,18 +33,26 @@ _FULL_DEPENDS_CMD= \ ${AWK} '$$1 == "full" { print $$3; }' < ${_RDEPENDS_FILE} _REDUCE_DEPENDS_CMD= ${PKGSRC_SETENV} CAT=${CAT:Q} \ - PKG_ADMIN=${PKG_ADMIN_CMD:Q} \ + PKG_ADMIN=${PKG_ADMIN:Q} \ + PWD_CMD=${PWD_CMD:Q} TEST=${TEST:Q} \ + ${AWK} -f ${PKGSRCDIR}/mk/pkgformat/pkg/reduce-depends.awk + +_HOST_REDUCE_DEPENDS_CMD= \ + ${PKGSRC_SETENV} CAT=${CAT:Q} \ + PKG_ADMIN=${HOST_PKG_ADMIN:Q} \ PWD_CMD=${PWD_CMD:Q} TEST=${TEST:Q} \ ${AWK} -f ${PKGSRCDIR}/mk/pkgformat/pkg/reduce-depends.awk _REDUCE_RESOLVED_DEPENDS_CMD=${PKGSRC_SETENV} CAT=${CAT:Q} \ - PKG_INFO=${PKG_INFO_CMD:Q} \ + PKG_INFO=${PKG_INFO:Q} \ + HOST_PKG_INFO=${HOST_PKG_INFO:Q} \ ${AWK} -f ${PKGSRCDIR}/mk/pkgformat/pkg/reduce-resolved-depends.awk \ < ${_RDEPENDS_FILE} _pkgformat-show-depends: .PHONY @case ${VARNAME:Q}"" in \ BUILD_DEPENDS) ${_REDUCE_DEPENDS_CMD} ${BUILD_DEPENDS:Q} ;; \ + TOOL_DEPENDS) ${_HOST_REDUCE_DEPENDS_CMD} ${TOOL_DEPENDS:Q} ;;\ DEPENDS|*) ${_REDUCE_DEPENDS_CMD} ${DEPENDS:Q} ;; \ esac @@ -53,6 +61,7 @@ _LIST_DEPENDS_CMD= \ PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \ ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \ " "${BOOTSTRAP_DEPENDS:Q} \ + " "${TOOL_DEPENDS:Q} \ " "${BUILD_DEPENDS:Q} \ " "${DEPENDS:Q} @@ -60,13 +69,15 @@ _LIST_DEPENDS_CMD.bootstrap= \ ${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \ PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \ ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \ - " "${BOOTSTRAP_DEPENDS:Q} " " " " + " "${BOOTSTRAP_DEPENDS:Q} " " " " " " _RESOLVE_DEPENDS_CMD= \ ${PKGSRC_SETENV} _PKG_DBDIR=${_PKG_DBDIR:Q} PKG_INFO=${PKG_INFO:Q} \ + HOST_PKG_INFO=${HOST_PKG_INFO:Q} \ _DEPENDS_FILE=${_DEPENDS_FILE:Q} \ ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/resolve-dependencies \ " "${BOOTSTRAP_DEPENDS:Q} \ + " "${TOOL_DEPENDS:Q} \ " "${BUILD_DEPENDS:Q} \ " "${DEPENDS:Q} @@ -76,12 +87,29 @@ _RESOLVE_DEPENDS_CMD= \ # @param $pattern The pattern of the package to be installed. # @param $dir The pkgsrc directory from which the package can be # built. -# @param $type The dependency type. Can be one of bootstrap, +# @param $type The dependency type. Can be one of bootstrap, tool, # build, full. # _DEPENDS_INSTALL_CMD= \ - pkg=`${_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`; \ - case $$type in bootstrap) Type=Bootstrap;; build) Type=Build;; full) Type=Full;; esac; \ + case $$type in bootstrap) Type=Bootstrap;; tool) Type=Tool;; build) Type=Build;; full) Type=Full;; esac; \ + case $$type in \ + bootstrap|tool) \ + if expr "${USE_CROSS_COMPILE:Uno}" : '[yY][eE][sS]' >/dev/null; then \ + extradep=""; \ + else \ + extradep=" ${PKGNAME}"; \ + fi; \ + cross=no; \ + archopt=TARGET_ARCH=${MACHINE_ARCH}; \ + pkg=`${_HOST_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`; \ + ;; \ + build|full) \ + extradep=" ${PKGNAME}"; \ + cross=${USE_CROSS_COMPILE:Uno}; \ + archopt=; \ + pkg=`${_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`; \ + ;; \ + esac; \ case "$$pkg" in \ "") \ ${STEP_MSG} "$$Type dependency $$pattern: NOT found"; \ @@ -89,8 +117,18 @@ _DEPENDS_INSTALL_CMD= \ ${STEP_MSG} "Verifying $$target for $$dir"; \ [ -d "$$dir" ] || ${FAIL_MSG} "[depends.mk] The directory \`\`$$dir'' does not exist."; \ cd $$dir; \ - ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} _PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" PKGNAME_REQD="$$pattern" ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes $$target; \ - pkg=`${_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`; \ + ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} \ + _PKGSRC_DEPS="$$extradep${_PKGSRC_DEPS}" \ + PKGNAME_REQD="$$pattern" \ + USE_CROSS_COMPILE=$$cross \ + $$archopt \ + ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes $$target; \ + case $$type in \ + bootstrap|tool) \ + pkg=`${_HOST_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`;; \ + build|full) \ + pkg=`${_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`;; \ + esac; \ case "$$pkg" in \ "") ${ERROR_MSG} "[depends.mk] A package matching \`\`$$pattern'' should"; \ ${ERROR_MSG} " be installed, but one cannot be found. Perhaps there is a"; \ @@ -100,7 +138,12 @@ _DEPENDS_INSTALL_CMD= \ ${STEP_MSG} "Returning to build of ${PKGNAME}"; \ ;; \ *) \ - objfmt=`${PKG_INFO} -Q OBJECT_FMT "$$pkg"`; \ + case $$type in \ + bootstrap|tool) \ + objfmt=`${HOST_PKG_INFO} -Q OBJECT_FMT "$$pkg"`;; \ + build|full) \ + objfmt=`${PKG_INFO} -Q OBJECT_FMT "$$pkg"`;; \ + esac; \ case "$$objfmt" in \ "") ${WARNING_MSG} "[depends.mk] Unknown object format for installed package $$pkg" ;; \ ${OBJECT_FMT}) ;; \ Index: mk/pkgformat/pkg/list-dependencies =================================================================== RCS file: /cvsroot/pkgsrc/mk/pkgformat/pkg/list-dependencies,v retrieving revision 1.1 diff -p -u -r1.1 list-dependencies --- mk/pkgformat/pkg/list-dependencies 15 Oct 2011 00:23:09 -0000 1.1 +++ mk/pkgformat/pkg/list-dependencies 13 Apr 2013 16:07:55 -0000 @@ -57,11 +57,12 @@ print_entries() { done } -if [ $# != 3 ]; then - echo "usage: list-dependencies bootstrap_depends build_depends depends" 1>&2 +if [ $# != 4 ]; then + echo "usage: list-dependencies bootstrap_depends tool_depends build_depends depends" 1>&2 exit 1 fi print_entries bootstrap "$1" -print_entries build "$2" -print_entries full "$3" +print_entries tool "$2" +print_entries build "$3" +print_entries full "$4" Index: mk/pkgformat/pkg/pkgformat-vars.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk,v retrieving revision 1.2 diff -p -u -r1.2 pkgformat-vars.mk --- mk/pkgformat/pkg/pkgformat-vars.mk 13 Dec 2011 16:35:48 -0000 1.2 +++ mk/pkgformat/pkg/pkgformat-vars.mk 13 Apr 2013 16:07:55 -0000 @@ -23,8 +23,10 @@ PKG_DBDIR?= /var/db/pkg # .if ${PKG_INSTALLATION_TYPE} == "overwrite" _PKG_DBDIR= ${_CROSS_DESTDIR}${PKG_DBDIR} +_HOST_PKG_DBDIR= ${HOST_PKG_DBDIR:U${PKG_DBDIR}} .elif ${PKG_INSTALLATION_TYPE} == "pkgviews" _PKG_DBDIR= ${_CROSS_DESTDIR}${DEPOTBASE} +_HOST_PKG_DBDIR= ${HOST_DEPOTBASE:U${DEPOTBASE}} .endif PKG_ADD_CMD?= ${PKG_TOOLS_BIN}/pkg_add @@ -67,12 +69,14 @@ _AUDIT_CONFIG_OPTION= IGNORE_URL # correct package database directory. # PKGTOOLS_ARGS?= -K ${_PKG_DBDIR} +HOST_PKGTOOLS_ARGS?= -K ${_HOST_PKG_DBDIR} # Views are rooted in ${LOCALBASE}, all packages are depoted in # ${DEPOTBASE}, and the package database directory for the default view # is in ${PKG_DBDIR}. # -PKG_VIEW_ARGS?= -W ${LOCALBASE} -d ${DEPOTBASE} -k ${PKG_DBDIR} +PKG_VIEW_ARGS?= -W ${LOCALBASE} -d ${DEPOTBASE} -k ${_CROSS_DESTDIR}${PKG_DBDIR} +HOST_PKG_VIEW_ARGS?= -W ${LOCALBASE} -d ${DEPOTBASE} -k ${PKG_DBDIR} PKG_ADD?= ${PKG_ADD_CMD} ${PKGTOOLS_ARGS} PKG_ADMIN?= ${PKG_ADMIN_CMD} ${PKGTOOLS_ARGS} @@ -82,12 +86,21 @@ PKG_INFO?= ${PKG_INFO_CMD} ${PKGTOOLS_AR PKG_VIEW?= ${PKG_VIEW_CMD} ${PKG_VIEW_ARGS} LINKFARM?= ${LINKFARM_CMD} +HOST_PKG_ADD?= ${PKG_ADD_CMD} ${HOST-PKGTOOLS_ARGS} +HOST_PKG_ADMIN?= ${PKG_ADMIN_CMD} ${HOST_PKGTOOLS_ARGS} +HOST_PKG_CREATE?= ${PKG_CREATE_CMD} ${HOST_PKGTOOLS_ARGS} +HOST_PKG_DELETE?= ${PKG_DELETE_CMD} ${HOST_PKGTOOLS_ARGS} +HOST_PKG_INFO?= ${PKG_INFO_CMD} ${HOST_PKGTOOLS_ARGS} +HOST_PKG_VIEW?= ${PKG_VIEW_CMD} ${HOST_PKG_VIEW_ARGS} +HOST_LINKFARM?= ${LINKFARM_CMD} + # "${_PKG_BEST_EXISTS} pkgpattern" prints out the name of the installed # package that best matches pkgpattern. Use this instead of # "${PKG_INFO} -e pkgpattern" if the latter would return more than one # package name. # _PKG_BEST_EXISTS?= ${PKG_INFO} -E +_HOST_PKG_BEST_EXISTS?= ${HOST_PKG_INFO} -E # XXX Leave this here until all uses of this have been purged from the # XXX public parts of pkgsrc. Index: mk/pkgformat/pkg/reduce-resolved-depends.awk =================================================================== RCS file: /cvsroot/pkgsrc/mk/pkgformat/pkg/reduce-resolved-depends.awk,v retrieving revision 1.1 diff -p -u -r1.1 reduce-resolved-depends.awk --- mk/pkgformat/pkg/reduce-resolved-depends.awk 2 Jul 2012 14:53:13 -0000 1.1 +++ mk/pkgformat/pkg/reduce-resolved-depends.awk 13 Apr 2013 16:07:55 -0000 @@ -46,12 +46,14 @@ # ENVIRONMENT # CAT # PKG_INFO +# HOST_PKG_INFO (for cross-compilation) # ###################################################################### BEGIN { CAT = ENVIRON["CAT"] ? ENVIRON["CAT"] : "cat" PKG_INFO = ENVIRON["PKG_INFO"] ? ENVIRON["PKG_INFO"] : "pkg_info" + HOST_PKG_INFO = ENVIRON["HOST_PKG_INFO"] ? ENVIRON["HOST_PKG_INFO"] : "pkg_info" PROGNAME = "reduce-resolved-depends.awk" ERRCAT = CAT " 1>&2" @@ -61,7 +63,10 @@ BEGIN { print "ERROR: [" PROGNAME "] invalid dependency line " $0 | ERRCAT exit 1 } - if ($1 != "full" && $1 != "build" && $1 != "bootstrap") { + if ($1 != "full" && + $1 != "build" && + $1 != "tool" && + $1 != "bootstrap") { print "ERROR: [" PROGNAME "] invalid dependency line " $0 | ERRCAT exit 1 } @@ -77,6 +82,7 @@ BEGIN { if (type[i] == "full" && checked_full[pkg[i]] != 1) { checked_full[pkg[i]] = 1 checked_build[pkg[i]] = 1 + checked_tool[pkg[i]] = 1 checked_bootstrap[pkg[i]] = 1 print_line[i] = 1 } @@ -86,23 +92,45 @@ BEGIN { if (type[i] == "bootstrap" && checked_bootstrap[pkg[i]] != 1) { checked_bootstrap[pkg[i]] = 1 found = 0 - cmd = PKG_INFO " -qr " pkg[i] - while (cmd | getline dpkg) { - if (checked_full[dpkg] == 1) - found = 1 + if (PKG_INFO == HOST_PKG_INFO) { + cmd = PKG_INFO " -qr " pkg[i] + while (cmd | getline dpkg) { + if (checked_full[dpkg] == 1) + found = 1 + } + close(cmd) } - close(cmd) if (found == 0) print_line[i] = 1 } } for (i = 0; i < lines; ++i) { - if (type[i] == "build" && checked_build[pkg[i]] != 1) { - checked_build[pkg[i]] = 1 + if (type[i] == "tool" && checked_tool[pkg[i]] != 1) { + checked_tool[pkg[i]] = 1 if (checked_bootstrap[pkg[i]] == 1) continue found = 0 + if (PKG_INFO == HOST_PKG_INFO) { + cmd = PKG_INFO " -qr " pkg[i] + while (cmd | getline dpkg) { + if (checked_full[dpkg] == 1) + found = 1 + } + close(cmd) + } + if (found == 0) + print_line[i] = 1 + } + } + + for (i = 0; i < lines; ++i) { + if (type[i] == "build" && checked_build[pkg[i]] != 1) { + checked_build[pkg[i]] = 1 + if (PKG_INFO == HOST_PKG_INFO) + if (checked_bootstrap[pkg[i]] == 1) + continue + found = 0 cmd = PKG_INFO " -qr " pkg[i] while (cmd | getline dpkg) { if (checked_full[dpkg] == 1) Index: mk/pkgformat/pkg/resolve-dependencies =================================================================== RCS file: /cvsroot/pkgsrc/mk/pkgformat/pkg/resolve-dependencies,v retrieving revision 1.1 diff -p -u -r1.1 resolve-dependencies --- mk/pkgformat/pkg/resolve-dependencies 15 Oct 2011 00:23:09 -0000 1.1 +++ mk/pkgformat/pkg/resolve-dependencies 13 Apr 2013 16:07:55 -0000 @@ -30,11 +30,16 @@ error_msg() { } find_best() { - ${PKG_INFO} -E "$1" || ${TRUE} + case $1 in + bootstrap|tool) + ${HOST_PKG_INFO} -E "$2" || ${TRUE};; + build|full) + ${PKG_INFO} -E "$2" || ${TRUE};; + esac } ${CAT} ${DEPENDS_FILE} | while read type pattern dir; do - pkg=`find_best "$pattern"` + pkg=`find_best "$type" "$pattern"` case "$pkg" in "") error_msg "[resolve-dependencies] A package matching \`\`$pattern'' should" Index: mk/scripts/genindex.awk =================================================================== RCS file: /cvsroot/pkgsrc/mk/scripts/genindex.awk,v retrieving revision 1.7 diff -p -u -r1.7 genindex.awk --- mk/scripts/genindex.awk 7 Sep 2008 11:13:51 -0000 1.7 +++ mk/scripts/genindex.awk 13 Apr 2013 16:07:55 -0000 @@ -61,6 +61,7 @@ BEGIN { #depends /usr/pkgsrc/math/scilab xless-[0-9]*:../../x11/xless pvm-3.4.3:../../parallel/pvm3 # +# XXX Need to handle BUILD_DEPENDS/TOOL_DEPENDS split. /^(build_)?depends / { # # Read in the entire depends tree Index: mk/scripts/genreadme.awk =================================================================== RCS file: /cvsroot/pkgsrc/mk/scripts/genreadme.awk,v retrieving revision 1.34 diff -p -u -r1.34 genreadme.awk --- mk/scripts/genreadme.awk 21 Jul 2010 12:29:46 -0000 1.34 +++ mk/scripts/genreadme.awk 13 Apr 2013 16:07:55 -0000 @@ -406,6 +406,8 @@ END { close( binpkgs_file ); } + # XXX Need to handle BUILD_DEPENDS/TOOL_DEPENDS + # split. if( line ~/%%BUILD_DEPENDS%%/ ) { gsub(/%%BUILD_DEPENDS%%/, "", line); while((getline < htmldeps_file) > 0) { Index: mk/tools/autoconf.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/tools/autoconf.mk,v retrieving revision 1.15 diff -p -u -r1.15 autoconf.mk --- mk/tools/autoconf.mk 17 Mar 2009 22:13:36 -0000 1.15 +++ mk/tools/autoconf.mk 13 Apr 2013 16:07:55 -0000 @@ -95,7 +95,7 @@ AUTOCONF_REQD?= 2.50 . if !empty(USE_TOOLS:Mautoconf\:run) _TOOLS_DEPMETHOD.autoconf= DEPENDS . else -_TOOLS_DEPMETHOD.autoconf= BUILD_DEPENDS +_TOOLS_DEPMETHOD.autoconf= TOOL_DEPENDS . endif TOOLS_DEPENDS.autoconf?= autoconf>=${AUTOCONF_REQD}:../../devel/autoconf . if empty(${_TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf}) @@ -135,7 +135,7 @@ AUTOCONF_REQD?= 2.13 . if !empty(USE_TOOLS:Mautoconf213\:run) _TOOLS_DEPMETHOD.autoconf213= DEPENDS . else -_TOOLS_DEPMETHOD.autoconf213= BUILD_DEPENDS +_TOOLS_DEPMETHOD.autoconf213= TOOL_DEPENDS . endif TOOLS_DEPENDS.autoconf213?= autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213 . if empty(${_TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213}) Index: mk/tools/automake.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/tools/automake.mk,v retrieving revision 1.19 diff -p -u -r1.19 automake.mk --- mk/tools/automake.mk 10 Jun 2009 15:31:45 -0000 1.19 +++ mk/tools/automake.mk 13 Apr 2013 16:07:55 -0000 @@ -111,7 +111,7 @@ AUTOCONF_REQD?= 2.58 . if !empty(USE_TOOLS:Mautomake\:run) _TOOLS_DEPMETHOD.automake= DEPENDS . else -_TOOLS_DEPMETHOD.automake= BUILD_DEPENDS +_TOOLS_DEPMETHOD.automake= TOOL_DEPENDS . endif TOOLS_DEPENDS.automake?= automake>=${AUTOMAKE_REQD}:../../devel/automake . if empty(${_TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake}) @@ -137,7 +137,7 @@ AUTOCONF_REQD?= 2.13 . if !empty(USE_TOOLS:Mautomake14\:run) _TOOLS_DEPMETHOD.automake14= DEPENDS . else -_TOOLS_DEPMETHOD.automake14= BUILD_DEPENDS +_TOOLS_DEPMETHOD.automake14= TOOL_DEPENDS . endif TOOLS_DEPENDS.automake14?= automake14>=${AUTOMAKE_REQD}:../../devel/automake14 . if empty(${_TOOLS_DEPMETHOD.automake14}:M${TOOLS_DEPENDS.automake14}) @@ -183,5 +183,5 @@ ${_TOOLS_AM_TYPE.${_t_}}+= ${_t_} .endif .if !empty(USE_TOOLS:Mgettext-m4) -BUILD_DEPENDS+= {gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4 +TOOL_DEPENDS+= {gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4 .endif Index: mk/tools/intltool.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/tools/intltool.mk,v retrieving revision 1.5 diff -p -u -r1.5 intltool.mk --- mk/tools/intltool.mk 17 Mar 2009 22:13:36 -0000 1.5 +++ mk/tools/intltool.mk 13 Apr 2013 16:07:55 -0000 @@ -50,7 +50,7 @@ TOOLS_DEPENDS.intltool?= intltool>=0.40. . if !empty(USE_TOOLS:Mintltool\:run) DEPENDS+= ${TOOLS_DEPENDS.intltool} . else -BUILD_DEPENDS+= ${TOOLS_DEPENDS.intltool} +TOOL_DEPENDS+= ${TOOLS_DEPENDS.intltool} . endif EVAL_PREFIX+= TOOLS_PREFIX.intltool=intltool . for _t_ in ${_TOOLS.intltool} Index: mk/tools/replace.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/tools/replace.mk,v retrieving revision 1.255 diff -p -u -r1.255 replace.mk --- mk/tools/replace.mk 16 Mar 2013 23:03:33 -0000 1.255 +++ mk/tools/replace.mk 13 Apr 2013 16:07:55 -0000 @@ -128,14 +128,14 @@ PKG_FAIL_REASON+= "\`\`bison'' and \`\`b # dependency is determined by the modifier specified for each tool: # # BOOTSTRAP_DEPENDS: :bootstrap -# BUILD_DEPENDS: :build (default), :pkgsrc +# TOOL_DEPENDS: :build (default), :pkgsrc # DEPENDS: :run # .for _t_ in ${USE_TOOLS:N*\:*} ${USE_TOOLS:M*\:bootstrap} _TOOLS_DEPMETHOD.${_t_:C/:.*//}= BOOTSTRAP_DEPENDS .endfor .for _t_ in ${USE_TOOLS:N*\:*} ${USE_TOOLS:M*\:build} ${USE_TOOLS:M*\:pkgsrc} -_TOOLS_DEPMETHOD.${_t_:C/:.*//}= BUILD_DEPENDS +_TOOLS_DEPMETHOD.${_t_:C/:.*//}= TOOL_DEPENDS .endfor .for _t_ in ${USE_TOOLS:M*\:run} _TOOLS_DEPMETHOD.${_t_:C/:.*//}= DEPENDS @@ -143,37 +143,37 @@ _TOOLS_DEPMETHOD.${_t_:C/:.*//}= DEPENDS .if !empty(_USE_TOOLS:Mbison-yacc) # bison-yacc > yacc . if defined(_TOOLS_DEPMETHOD.bison-yacc) && \ - (${_TOOLS_DEPMETHOD.bison-yacc} == "BUILD_DEPENDS") && \ + (${_TOOLS_DEPMETHOD.bison-yacc} == "TOOL_DEPENDS") && \ defined(_TOOLS_DEPMETHOD.yacc) _TOOLS_DEPMETHOD.bison-yacc= ${_TOOLS_DEPMETHOD.yacc} . endif .endif .if !empty(_USE_TOOLS:Mflex) # flex > lex -. if (${_TOOLS_DEPMETHOD.flex} == "BUILD_DEPENDS") && \ +. if (${_TOOLS_DEPMETHOD.flex} == "TOOL_DEPENDS") && \ defined(_TOOLS_DEPMETHOD.lex) _TOOLS_DEPMETHOD.flex= ${_TOOLS_DEPMETHOD.lex} . endif .endif .if !empty(_USE_TOOLS:Mgawk) # gawk > awk -. if (${_TOOLS_DEPMETHOD.gawk} == "BUILD_DEPENDS") && \ +. if (${_TOOLS_DEPMETHOD.gawk} == "TOOL_DEPENDS") && \ defined(_TOOLS_DEPMETHOD.awk) _TOOLS_DEPMETHOD.gawk= ${_TOOLS_DEPMETHOD.awk} . endif .endif .if !empty(_USE_TOOLS:Mgm4) # gm4 > m4 -. if (${_TOOLS_DEPMETHOD.gm4} == "BUILD_DEPENDS") && \ +. if (${_TOOLS_DEPMETHOD.gm4} == "TOOL_DEPENDS") && \ defined(_TOOLS_DEPMETHOD.m4) _TOOLS_DEPMETHOD.gm4= ${_TOOLS_DEPMETHOD.m4} . endif .endif .if !empty(_USE_TOOLS:Mgsed) # gsed > sed -. if (${_TOOLS_DEPMETHOD.gsed} == "BUILD_DEPENDS") && \ +. if (${_TOOLS_DEPMETHOD.gsed} == "TOOL_DEPENDS") && \ defined(_TOOLS_DEPMETHOD.sed) _TOOLS_DEPMETHOD.gsed= ${_TOOLS_DEPMETHOD.sed} . endif .endif .if !empty(_USE_TOOLS:Mgsoelim) # gsoelim > soelim -. if (${_TOOLS_DEPMETHOD.gsoelim} == "BUILD_DEPENDS") && \ +. if (${_TOOLS_DEPMETHOD.gsoelim} == "TOOL_DEPENDS") && \ defined(_TOOLS_DEPMETHOD.soelim) _TOOLS_DEPMETHOD.gsoelim= ${_TOOLS_DEPMETHOD.soelim} . endif Index: mk/tools/tools.NetBSD.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/tools/tools.NetBSD.mk,v retrieving revision 1.46 diff -p -u -r1.46 tools.NetBSD.mk --- mk/tools/tools.NetBSD.mk 26 May 2012 13:09:54 -0000 1.46 +++ mk/tools/tools.NetBSD.mk 13 Apr 2013 16:07:55 -0000 @@ -137,7 +137,13 @@ TOOLS_CREATE+= ar TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib TOOLS_CREATE+= ranlib -NATIVE_CC:= /usr/bin/cc +NATIVE_CC:= /usr/bin/cc -B /usr/libexec -B /usr/bin CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc +NATIVE_CXX:= /usr/bin/c++ -B /usr/libexec -B /usr/bin +CXX= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-g++ + +NATIVE_LD:= /usr/bin/ld +LD= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ld + .endif Index: mk/wrapper/cmd-sink-cross-cpp =================================================================== RCS file: /cvsroot/pkgsrc/mk/wrapper/cmd-sink-cross-cpp,v retrieving revision 1.1 diff -p -u -r1.1 cmd-sink-cross-cpp --- mk/wrapper/cmd-sink-cross-cpp 2 Aug 2007 18:19:32 -0000 1.1 +++ mk/wrapper/cmd-sink-cross-cpp 13 Apr 2013 16:07:55 -0000 @@ -29,17 +29,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# Don't use standard include path. -arg="-nostdinc" -$debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" -. $buildcmd - -# Compiler searches for headers in /usr/include, emulate. -arg="-isystem" -$debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" -. $buildcmd - -arg="@CROSS_DESTDIR@/usr/include" +# Use include files and libraries from the target system image. +arg="--sysroot=@CROSS_DESTDIR@" $debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" . $buildcmd Index: mk/wrapper/cmd-sink-cross-gcc =================================================================== RCS file: /cvsroot/pkgsrc/mk/wrapper/cmd-sink-cross-gcc,v retrieving revision 1.2 diff -p -u -r1.2 cmd-sink-cross-gcc --- mk/wrapper/cmd-sink-cross-gcc 9 Oct 2007 19:19:13 -0000 1.2 +++ mk/wrapper/cmd-sink-cross-gcc 13 Apr 2013 16:07:55 -0000 @@ -29,41 +29,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -if [ "${dont_link}" != yes ]; then - # Don't use standard search paths - arg="-Wl,-nostdlib" - $debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" - . $buildcmd - - # All normal library locations should be checked for - for libdir in /usr/lib @PREFIX@/lib; do - arg="-Wl,-rpath-link,@CROSS_DESTDIR@${libdir}" - $debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" - . $buildcmd - done - - # Compiler searches for libraries in /usr/lib, emulate. - arg="-L@CROSS_DESTDIR@/usr/lib" - $debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" - . $buildcmd - - # crt1.o and friends needs to be found as well. - arg="-B@CROSS_DESTDIR@/usr/lib" - $debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" - . $buildcmd -fi - -# Don't use standard include path. -arg="-nostdinc" -$debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" -. $buildcmd - -# Compiler searches for headers in /usr/include, emulate. -arg="-isystem" -$debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" -. $buildcmd - -arg="@CROSS_DESTDIR@/usr/include" +# Use include files and libraries from the target system image. +arg="--sysroot=@CROSS_DESTDIR@" $debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" . $buildcmd Index: mk/wrapper/cmd-sink-cross-gxx =================================================================== RCS file: /cvsroot/pkgsrc/mk/wrapper/cmd-sink-cross-gxx,v retrieving revision 1.1 diff -p -u -r1.1 cmd-sink-cross-gxx --- mk/wrapper/cmd-sink-cross-gxx 4 Aug 2011 13:32:05 -0000 1.1 +++ mk/wrapper/cmd-sink-cross-gxx 13 Apr 2013 16:07:55 -0000 @@ -29,63 +29,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -if [ "${dont_link}" != yes ]; then - # Don't use standard search paths - arg="-Wl,-nostdlib" - $debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" - . $buildcmd - - # All normal library locations should be checked for - for libdir in /usr/lib @PREFIX@/lib; do - arg="-Wl,-rpath-link,@CROSS_DESTDIR@${libdir}" - $debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" - . $buildcmd - done - - # Compiler searches for libraries in /usr/lib, emulate. - arg="-L@CROSS_DESTDIR@/usr/lib" - $debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" - . $buildcmd - - # crt1.o and friends needs to be found as well. - arg="-B@CROSS_DESTDIR@/usr/lib" - $debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" - . $buildcmd -fi - -# Don't use standard include path. -arg="-nostdinc" -$debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" -. $buildcmd - -# Compiler searches for headers in /usr/include, emulate. -arg="-isystem" -$debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" -. $buildcmd - -arg="@CROSS_DESTDIR@/usr/include" -$debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" -. $buildcmd - -# Don't use standard include path. -arg="-nostdinc++" -$debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" -. $buildcmd - -# Compiler searches for headers in /usr/include/g++, emulate. -arg="-isystem" -$debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" -. $buildcmd - -arg="@CROSS_DESTDIR@/usr/include/g++" -$debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" -. $buildcmd - -arg="-isystem" -$debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" -. $buildcmd - -arg="@CROSS_DESTDIR@/usr/include/g++/backward" +# Use include files and libraries from the target system image. +arg="--sysroot=@CROSS_DESTDIR@" $debug_log $wrapperlog " (cmd-sink-native-cxx) pop: $arg" . $buildcmd Index: multimedia/gst-plugins0.10-good/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.10-good/Makefile,v retrieving revision 1.30 diff -p -u -r1.30 Makefile --- multimedia/gst-plugins0.10-good/Makefile 6 Apr 2013 03:45:19 -0000 1.30 +++ multimedia/gst-plugins0.10-good/Makefile 13 Apr 2013 16:07:55 -0000 @@ -2,21 +2,17 @@ # .include "Makefile.common" -PKGREVISION= 3 +PKGREVISION= 4 COMMENT+= Good plugins # some plugins were moved from bad to good CONFLICTS+= gst-plugins0.10-bad<0.10.18 -CONFIGURE_ARGS+= --enable-gconf -CONFIGURE_ARGS+= --enable-gconftool -CONFIGURE_ARGS+= --enable-zlib +.include "options.mk" -# We depend on libxml anyway (indirectly through GConf), so this -# doesn't hurt. Just make it explicite. +CONFIGURE_ARGS+= --enable-zlib CONFIGURE_ARGS+= --enable-annodex -.include "../../textproc/libxml2/buildlink3.mk" GCONF_SCHEMAS= gstreamer-0.10.schemas @@ -24,10 +20,12 @@ GCONF_SCHEMAS= gstreamer-0.10.schemas TEST_TARGET= check-torture post-install: +.if !empty(PKG_OPTIONS:Mgconf) ${INSTALL_DATA} ${WRKSRC}/gconf/gstreamer-0.10.schemas \ ${DESTDIR}${GCONF_SCHEMAS_DIR} +.endif .include "../../archivers/bzip2/buildlink3.mk" -.include "../../devel/GConf/schemas.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: multimedia/gst-plugins0.10-good/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.10-good/PLIST,v retrieving revision 1.25 diff -p -u -r1.25 PLIST --- multimedia/gst-plugins0.10-good/PLIST 28 Feb 2012 18:31:00 -0000 1.25 +++ multimedia/gst-plugins0.10-good/PLIST 13 Apr 2013 16:07:55 -0000 @@ -17,7 +17,7 @@ lib/gstreamer-0.10/libgsteffectv.la lib/gstreamer-0.10/libgstequalizer.la lib/gstreamer-0.10/libgstflv.la lib/gstreamer-0.10/libgstflxdec.la -lib/gstreamer-0.10/libgstgconfelements.la +${PLIST.gconf}lib/gstreamer-0.10/libgstgconfelements.la lib/gstreamer-0.10/libgstgoom.la lib/gstreamer-0.10/libgstgoom2k1.la lib/gstreamer-0.10/libgsticydemux.la @@ -46,7 +46,7 @@ lib/gstreamer-0.10/libgstvideomixer.la lib/gstreamer-0.10/libgstwavenc.la lib/gstreamer-0.10/libgstwavparse.la lib/gstreamer-0.10/libgsty4menc.la -share/gconf/schemas/gstreamer-0.10.schemas +${PLIST.gconf}share/gconf/schemas/gstreamer-0.10.schemas share/gstreamer-0.10/presets/GstIirEqualizer10Bands.prs share/gstreamer-0.10/presets/GstIirEqualizer3Bands.prs share/locale/af/LC_MESSAGES/gst-plugins-good-0.10.mo Index: multimedia/gst-plugins0.10-good/options.mk =================================================================== RCS file: multimedia/gst-plugins0.10-good/options.mk diff -N multimedia/gst-plugins0.10-good/options.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multimedia/gst-plugins0.10-good/options.mk 13 Apr 2013 16:07:55 -0000 @@ -0,0 +1,15 @@ +# $NetBSD$ + +PKG_OPTIONS_VAR= PKG_OPTIONS.gst-plugins0.10-good +PKG_SUPPORTED_OPTIONS= gconf + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= gconf + +.if !empty(PKG_OPTIONS:Mgconf) +PLIST.gconf= yes +CONFIGURE_ARGS+= --enable-gconf +CONFIGURE_ARGS+= --enable-gconftool +.include "../../devel/GConf/schemas.mk" +.endif Index: net/ekiga/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/ekiga/Makefile,v retrieving revision 1.45 diff -p -u -r1.45 Makefile --- net/ekiga/Makefile 28 Mar 2013 21:34:50 -0000 1.45 +++ net/ekiga/Makefile 13 Apr 2013 16:07:55 -0000 @@ -23,8 +23,6 @@ CONFIGURE_ARGS+= --enable-gstreamer .include "options.mk" -GCONF_SCHEMAS= ekiga.schemas - GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ @@ -37,25 +35,18 @@ BUILDLINK_TRANSFORM+= rm:-fno-exceptions .include "../../audio/esound/buildlink3.mk" .include "../../databases/openldap-client/buildlink3.mk" -.include "../../devel/GConf/schemas.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libgnome/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libsigc++/buildlink3.mk" .include "../../devel/opal/buildlink3.mk" .include "../../devel/ptlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libv4l/buildlink3.mk" -.include "../../mail/evolution-data-server/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../security/cyrus-sasl/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/libnotify/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../mk/omf-scrollkeeper.mk" .include "../../x11/gtk2/buildlink3.mk" Index: net/ekiga/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/net/ekiga/PLIST,v retrieving revision 1.5 diff -p -u -r1.5 PLIST --- net/ekiga/PLIST 17 Nov 2009 19:50:57 -0000 1.5 +++ net/ekiga/PLIST 13 Apr 2013 16:07:55 -0000 @@ -1,12 +1,13 @@ @comment $NetBSD: PLIST,v 1.5 2009/11/17 19:50:57 wiz Exp $ bin/ekiga bin/ekiga-config-tool -bin/ekiga-helper +${PLIST.dbus}bin/ekiga-helper +${PLIST.not-gconf}etc/ekiga/ekiga.schemas man/man1/ekiga.1 share/applications/ekiga.desktop -share/dbus-1/services/org.ekiga.Ekiga.service -share/dbus-1/services/org.ekiga.Helper.service -share/gconf/schemas/ekiga.schemas +${PLIST.dbus}share/dbus-1/services/org.ekiga.Ekiga.service +${PLIST.dbus}share/dbus-1/services/org.ekiga.Helper.service +${PLIST.gconf}share/gconf/schemas/ekiga.schemas share/gnome/help/ekiga/C/ekiga.xml share/gnome/help/ekiga/C/figures/accounts_d1.png share/gnome/help/ekiga/C/figures/accounts_h323.png Index: net/ekiga/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/net/ekiga/options.mk,v retrieving revision 1.1 diff -p -u -r1.1 options.mk --- net/ekiga/options.mk 22 Mar 2009 08:51:24 -0000 1.1 +++ net/ekiga/options.mk 13 Apr 2013 16:07:55 -0000 @@ -1,13 +1,56 @@ # $NetBSD: options.mk,v 1.1 2009/03/22 08:51:24 wiz Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga -PKG_SUPPORTED_OPTIONS+= avahi -PKG_SUGGESTED_OPTIONS+= avahi +PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga +PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify +#PKG_SUGGESTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify .include "../../mk/bsd.options.mk" +PLIST_VARS+= dbus gconf not-gconf + .if !empty(PKG_OPTIONS:Mavahi) .include "../../net/avahi/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-avahi .endif + +.if !empty(PKG_OPTIONS:Mdbus) +CONFIGURE_ARGS+= --enable-dbus --enable-dbus-service +PLIST.dbus= yes +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-dbus --disable-dbus-service +.endif + +.if !empty(PKG_OPTIONS:Mevolution-data-server) +CONFIGURE_ARGS+= --enable-eds +.include "../../mail/evolution-data-server/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-eds +.endif + +.if !empty(PKG_OPTIONS:Mgconf) +PLIST.gconf= yes +GCONF_SCHEMAS= ekiga.schemas +CONFIGURE_ARGS+= --enable-gconf +.include "../../devel/GConf/schemas.mk" +.else +PLIST.not-gconf= yes +CONFIGURE_ARGS+= --disable-gconf +.endif + +.if !empty(PKG_OPTIONS:Mgnome) +CONFIGURE_ARGS+= --enable-gnome +.include "../../devel/libgnome/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-gnome +.endif + +.if !empty(PKG_OPTIONS:Mnotify) +CONFIGURE_ARGS+= --enable-notify +.include "../../sysutils/libnotify/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-notify +.endif Index: net/isc-dhcp4/Makefile.common =================================================================== RCS file: /cvsroot/pkgsrc/net/isc-dhcp4/Makefile.common,v retrieving revision 1.19 diff -p -u -r1.19 Makefile.common --- net/isc-dhcp4/Makefile.common 26 Mar 2013 16:25:06 -0000 1.19 +++ net/isc-dhcp4/Makefile.common 13 Apr 2013 16:07:55 -0000 @@ -26,7 +26,7 @@ DHCP_HOME?= ${VARBASE}/db/isc-dhcp DHCP_PID?= ${VARBASE}/run/isc-dhcp PKG_SYSCONFSUBDIR= dhcp -USE_TOOLS+= gmake +USE_TOOLS+= gmake gzip tar USE_LANGUAGES+= c c++ PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches @@ -42,6 +42,10 @@ CONFIGURE_ARGS+= --with-srv-pid-file=${D CONFIGURE_ARGS+= --with-cli-pid-file=${DHCP_PID}/isc-dhclient.pid CONFIGURE_ARGS+= --with-relay-pid-file=${DHCP_PID}/isc-dhcrelay.pid +# [TRC 20130325: Kludge for cross-compilation.] +CONFIGURE_ENV+= ac_cv_file__dev_random=yes +CONFIGURE_ENV+= BUILD_CC=${NATIVE_CC:Q} + SUBST_CLASSES+= config SUBST_STAGE.config= post-patch SUBST_FILES.config= includes/dhcpd.h @@ -52,4 +56,31 @@ SUBST_MESSAGE.config= Fixing configura BUILD_DIRS= ${BUILD_SUBDIR} INSTALL_DIRS= ${SUBDIR} +# [TRC 20130326: This crap should replaced by a dependency on +# net/libbind, but that seems to be a different version of libbind.] +post-extract: + (cd ${WRKSRC}/bind && gunzip -c bind.tar.gz | tar xf -) + +BIND_CONFIGURE_ARGS+= --disable-kqueue +BIND_CONFIGURE_ARGS+= --disable-epoll +BIND_CONFIGURE_ARGS+= --disable-devpoll +BIND_CONFIGURE_ARGS+= --without-openssl +BIND_CONFIGURE_ARGS+= --without-libxml2 +BIND_CONFIGURE_ARGS+= --enable-exportlib +BIND_CONFIGURE_ARGS+= --enable-threads=no +BIND_CONFIGURE_ARGS+= --with-export-includedir=${WRKSRC}/bind/include +BIND_CONFIGURE_ARGS+= --with-export-libdir=${WRKSRC}/bind/lib +BIND_CONFIGURE_ARGS+= --with-gssapi=no + +BIND_WRKSRC= ${WRKSRC}/bind/bind-9.8.4-P1 + +post-configure: + ${RUN}${_ULIMIT_CMD} \ + cd ${BIND_WRKSRC} && \ + ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \ + ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ + ${CONFIGURE_SCRIPT} \ + ${CONFIGURE_ARGS} \ + ${BIND_CONFIGURE_ARGS} + .include "../../security/openssl/buildlink3.mk" Index: net/isc-dhcp4/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/net/isc-dhcp4/distinfo,v retrieving revision 1.15 diff -p -u -r1.15 distinfo --- net/isc-dhcp4/distinfo 26 Mar 2013 16:25:06 -0000 1.15 +++ net/isc-dhcp4/distinfo 13 Apr 2013 16:07:55 -0000 @@ -6,4 +6,5 @@ Size (dhcp-4.2.5-P1.tar.gz) = 8255960 by SHA1 (patch-aa) = cdb64616f16ee79bf14f496518a2958352ce1fc9 SHA1 (patch-ab) = 3a36eb65c6b0a865f2d8a350fa083fa2fe549efd SHA1 (patch-ac) = 97af5dd9e787c63ca387fb05df20f42d90b985fb +SHA1 (patch-bind_bind-9.8.4-P1_lib_export_dns_Makefile.in) = a6bd7c861ec83897609b0aba9c4abc86037c826e SHA1 (patch-includes_Makefile.in) = 6004f66e28cd53c0acd09746a284eefe70a3aef2 Index: net/isc-dhcp4/patches/patch-bind_bind-9.8.4-P1_lib_export_dns_Makefile.in =================================================================== RCS file: net/isc-dhcp4/patches/patch-bind_bind-9.8.4-P1_lib_export_dns_Makefile.in diff -N net/isc-dhcp4/patches/patch-bind_bind-9.8.4-P1_lib_export_dns_Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/isc-dhcp4/patches/patch-bind_bind-9.8.4-P1_lib_export_dns_Makefile.in 13 Apr 2013 16:07:55 -0000 @@ -0,0 +1,17 @@ +$NetBSD$ + +Build gen with BUILD_CC and the associated BUILD_* flags so it can run +on the build platform when cross-compiling. + +--- bind/bind-9.8.4-P1/lib/export/dns/Makefile.in.orig 2012-10-26 04:52:55.000000000 +0000 ++++ bind/bind-9.8.4-P1/lib/export/dns/Makefile.in +@@ -166,7 +166,8 @@ code.h: gen + ./gen -s ${srcdir} > code.h + + gen: ${srcdir}/gen.c +- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} ++ ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ ++ ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS} + + #We don't need rbtdb64 for this library + #rbtdb64.@O@: rbtdb.c Index: net/libbind/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/libbind/Makefile,v retrieving revision 1.5 diff -p -u -r1.5 Makefile --- net/libbind/Makefile 23 Oct 2012 17:18:33 -0000 1.5 +++ net/libbind/Makefile 13 Apr 2013 16:07:55 -0000 @@ -16,6 +16,9 @@ CONFLICTS= man-pages-[0-9]* GNU_CONFIGURE= yes USE_LIBTOOL= yes +# [TRC 20130326: Kludge for cross-compilation.] +CONFIGURE_ENV+= ac_cv_file__dev_random=yes + CONFIGURE_ARGS+= --with-libtool=yes MAKE_JOBS_SAFE= no Index: net/nload/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/net/nload/distinfo,v retrieving revision 1.5 diff -p -u -r1.5 distinfo --- net/nload/distinfo 15 Feb 2012 12:30:06 -0000 1.5 +++ net/nload/distinfo 13 Apr 2013 16:07:55 -0000 @@ -4,4 +4,5 @@ SHA1 (nload-0.7.4.tar.gz) = bb0a168c93c5 RMD160 (nload-0.7.4.tar.gz) = 77eb199ee73fdc45b25b0e246c2ba73fa6efe779 Size (nload-0.7.4.tar.gz) = 151005 bytes SHA1 (patch-aa) = 1551e7059eb0ebde05ed8cdc561099192d048503 -SHA1 (patch-ac) = 6d26b865eeea4f8ae18db7f1ad6703694d63f514 +SHA1 (patch-ac) = bbc117e6801fc7918eeff56ce2a467402bf2a903 +SHA1 (patch-configure.in) = e8858851c2514c1708d36d01e85ff83cdbf099b7 Index: net/nload/patches/patch-ac =================================================================== RCS file: /cvsroot/pkgsrc/net/nload/patches/patch-ac,v retrieving revision 1.4 diff -p -u -r1.4 patch-ac --- net/nload/patches/patch-ac 15 Feb 2012 12:30:06 -0000 1.4 +++ net/nload/patches/patch-ac 13 Apr 2013 16:07:55 -0000 @@ -1,4 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2012/02/15 12:30:06 obache Exp $ +$NetBSD$ + +Match Darwin and DragonflyBSD as BSD too. + +Skip broken AC_FUNC_MALLOC. --- configure.orig 2012-02-06 09:53:58.000000000 +0000 +++ configure @@ -11,3 +15,65 @@ $NetBSD: patch-ac,v 1.4 2012/02/15 12:30 $as_echo "#define HAVE_BSD 1" >>confdefs.h +@@ -4707,61 +4707,6 @@ fi + + done + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 +-$as_echo_n "checking for GNU libc compatible malloc... " >&6; } +-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then : +- ac_cv_func_malloc_0_nonnull=no +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#if defined STDC_HEADERS || defined HAVE_STDLIB_H +-# include +-#else +-char *malloc (); +-#endif +- +-int +-main () +-{ +-return ! malloc (0); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- ac_cv_func_malloc_0_nonnull=yes +-else +- ac_cv_func_malloc_0_nonnull=no +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } +-if test $ac_cv_func_malloc_0_nonnull = yes; then : +- +-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h +- +-else +- $as_echo "#define HAVE_MALLOC 0" >>confdefs.h +- +- case " $LIBOBJS " in +- *" malloc.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS malloc.$ac_objext" +- ;; +-esac +- +- +-$as_echo "#define malloc rpl_malloc" >>confdefs.h +- +-fi +- +- + ;; + *solaris*) + Index: net/nload/patches/patch-configure.in =================================================================== RCS file: net/nload/patches/patch-configure.in diff -N net/nload/patches/patch-configure.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/nload/patches/patch-configure.in 13 Apr 2013 16:07:55 -0000 @@ -0,0 +1,21 @@ +$NetBSD$ + +Match Darwin and DragonflyBSD as BSD too. + +Skip broken AC_FUNC_MALLOC. + +--- configure.in.orig 2012-02-06 09:39:14.000000000 +0000 ++++ configure.in +@@ -38,11 +38,9 @@ case $host_os in + + AC_CHECK_FUNCS([memset]) + ;; +- *bsd*) ++ *bsd* | *darwin* | *dragonfly*) + AC_DEFINE(HAVE_BSD, 1, [Define to 1 if your build target is BSD.]) + AM_CONDITIONAL(HAVE_BSD, true) +- +- AC_FUNC_MALLOC + ;; + *solaris*) + AC_DEFINE(HAVE_SOLARIS, 1, [Define to 1 if your build target is Solaris.]) Index: net/socat/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/socat/Makefile,v retrieving revision 1.26 diff -p -u -r1.26 Makefile --- net/socat/Makefile 6 Feb 2013 23:23:24 -0000 1.26 +++ net/socat/Makefile 13 Apr 2013 16:07:56 -0000 @@ -14,9 +14,19 @@ GNU_CONFIGURE= YES USE_GNU_READLINE= YES ONLY_FOR_COMPILER= gcc # uses -Werror in the configure script +.include "../../mk/bsd.prefs.mk" + CONFIGURE_ARGS+= --disable-libwrap CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} +# [TRC 20130325: Kludge for cross-builds! This is nonsense...] +.if ${OPSYS} == "NetBSD" +CONFIGURE_ENV+= sc_cv_sys_crdly_shift=-1 +CONFIGURE_ENV+= sc_cv_sys_tabdly_shift=-1 +CONFIGURE_ENV+= sc_cv_sys_csize_shift=8 +CONFIGURE_ENV+= ac_cv_ispeed_offset=9 +.endif + SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing hardcoded paths. SUBST_STAGE.paths= post-patch Index: pkgtools/pkg_install/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/Makefile,v retrieving revision 1.193 diff -p -u -r1.193 Makefile --- pkgtools/pkg_install/Makefile 21 Feb 2013 22:41:37 -0000 1.193 +++ pkgtools/pkg_install/Makefile 13 Apr 2013 16:07:56 -0000 @@ -42,7 +42,10 @@ CHECK_PERMS= no # pkg_install. # # We also use the newly built pkg_{add,create,delete} since upgrading -# from an older pkg_install might required features of the new program. +# from an older pkg_install might required features of the new +# program, provided that we are not cross-compiling. (XXX If we are +# cross-compiling, we should maybe have a host build dependency on +# ourselves...) # # Note that the definitions are only overriden for the phases that are # supposed to use them. pkg_admin pmatch might be used when looking for @@ -50,7 +53,7 @@ CHECK_PERMS= no # be rethought. USE_NATIVE_GCC= yes -.if defined(_PKGSRC_BARRIER) +.if defined(_PKGSRC_BARRIER) && empty(USE_CROSS_COMPILE:M[yY][eE][sS]) PKG_ADD_CMD= ${WRKSRC}/add/pkg_add PKG_CREATE_CMD= ${WRKSRC}/create/pkg_create PKG_DELETE_CMD= ${WRKSRC}/delete/pkg_delete Index: print/evince3/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/print/evince3/Makefile,v retrieving revision 1.14 diff -p -u -r1.14 Makefile --- print/evince3/Makefile 31 Mar 2013 08:13:31 -0000 1.14 +++ print/evince3/Makefile 13 Apr 2013 16:07:56 -0000 @@ -3,6 +3,7 @@ .include "../../print/evince3/Makefile.common" +PKGREVISION= 1 COMMENT= Document viewer PKGREVISION= 3 @@ -15,10 +16,6 @@ USE_TOOLS+= gsed .include "../../devel/glib2/schemas.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../security/libgnome-keyring/buildlink3.mk" -.include "../../sysutils/dbus/buildlink3.mk" -BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70 -.include "../../sysutils/dbus-glib/buildlink3.mk" BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" Index: print/evince3/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/print/evince3/PLIST,v retrieving revision 1.3 diff -p -u -r1.3 PLIST --- print/evince3/PLIST 19 Oct 2012 18:39:05 -0000 1.3 +++ print/evince3/PLIST 13 Apr 2013 16:07:56 -0000 @@ -67,11 +67,11 @@ lib/libevdocument3.la lib/libevview3.la lib/pkgconfig/evince-document-3.0.pc lib/pkgconfig/evince-view-3.0.pc -libexec/evinced +${PLIST.dbus}libexec/evinced man/man1/evince.1 share/GConf/gsettings/evince.convert share/applications/evince.desktop -share/dbus-1/services/org.gnome.evince.Daemon.service +${PLIST.dbus}share/dbus-1/services/org.gnome.evince.Daemon.service share/evince/hand-open.png share/evince/icons/hicolor/16x16/actions/object-rotate-left.png share/evince/icons/hicolor/16x16/actions/object-rotate-right.png Index: print/evince3/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/print/evince3/options.mk,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 options.mk --- print/evince3/options.mk 21 Mar 2012 17:40:20 -0000 1.1.1.1 +++ print/evince3/options.mk 13 Apr 2013 16:07:56 -0000 @@ -1,12 +1,26 @@ # $NetBSD: options.mk,v 1.1.1.1 2012/03/21 17:40:20 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.evince -PKG_SUPPORTED_OPTIONS= dvi djvu xps +PKG_SUPPORTED_OPTIONS= dbus djvu dvi gnome-keyring xps .include "../../mk/bsd.options.mk" PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} +.if !empty(PKG_OPTIONS:Mdbus) +.include "../../sysutils/dbus/buildlink3.mk" +BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70 +.include "../../sysutils/dbus-glib/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-dbus +.endif + +.if !empty(PKG_OPTIONS:Mgnome-keyring) +.include "../../security/libgnome-keyring/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-keyring +.endif + .if !empty(PKG_OPTIONS:Mdvi) PLIST.dvi= yes .include "../../print/kpathsea/buildlink3.mk" Index: security/libgcrypt/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/security/libgcrypt/Makefile,v retrieving revision 1.54 diff -p -u -r1.54 Makefile --- security/libgcrypt/Makefile 23 Oct 2012 18:16:32 -0000 1.54 +++ security/libgcrypt/Makefile 13 Apr 2013 16:07:57 -0000 @@ -40,6 +40,9 @@ CFLAGS+= -fheinous-gnu-extensions .include "options.mk" +# [TRC 20130328: XXX This is an uncommitable monstrous kludge. +TOOL_DEPENDS+= libgpg-error-[0-9]*:../../security/libgpg-error + .include "../../security/libgpg-error/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: security/libgpg-error/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/security/libgpg-error/Makefile,v retrieving revision 1.36 diff -p -u -r1.36 Makefile --- security/libgpg-error/Makefile 15 Mar 2013 22:06:01 -0000 1.36 +++ security/libgpg-error/Makefile 13 Apr 2013 16:07:57 -0000 @@ -19,12 +19,17 @@ PKG_INSTALLATION_TYPES= overwrite pkgvie USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CC_FOR_BUILD=${CC:Q}\ ${CFLAGS:M*:Q} MAKE_ENV+= LC_ALL="C" MAKE_JOBS_SAFE= no .include "../../mk/bsd.prefs.mk" +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +.else +CONFIGURE_ENV+= CC_FOR_BUILD=${CC:Q}\ ${CFLAGS:M*:Q} +.endif + # XXX See HACKS .if ${OPSYS} == "IRIX" || !empty(MACHINE_PLATFORM:MNetBSD-[3-9]*) USE_TOOLS+= nawk Index: shells/bash/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/shells/bash/Makefile,v retrieving revision 1.56 diff -p -u -r1.56 Makefile --- shells/bash/Makefile 12 Feb 2013 23:31:40 -0000 1.56 +++ shells/bash/Makefile 13 Apr 2013 16:07:57 -0000 @@ -85,6 +85,21 @@ BUILDLINK_API_DEPENDS.readline+= readlin .include "../../devel/readline/buildlink3.mk" .endif +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD" +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +CONFIGURE_ENV+= ac_cv_c_long_long=yes +CONFIGURE_ENV+= ac_cv_c_long_double=yes +CONFIGURE_ENV+= bash_cv_type_rlimit=yes +CONFIGURE_ENV+= bash_cv_getcwd_malloc=yes +CONFIGURE_ENV+= bash_cv_func_sigsetjmp=yes +CONFIGURE_ENV+= bash_cv_printf_a_format=yes +CONFIGURE_ENV+= bash_cv_job_control_missing=present +CONFIGURE_ENV+= bash_cv_sys_named_pipes=present +CONFIGURE_ENV+= bash_cv_unusable_rtsigs=no +CONFIGURE_ENV+= bash_cv_func_ctype_nonascii=yes +CONFIGURE_ENV+= bash_cv_wexitstatus_offset=8 +.endif + post-install: ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 Index: shells/fish/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/shells/fish/Makefile,v retrieving revision 1.1 diff -p -u -r1.1 Makefile --- shells/fish/Makefile 12 Dec 2012 13:21:42 -0000 1.1 +++ shells/fish/Makefile 13 Apr 2013 16:07:57 -0000 @@ -25,7 +25,7 @@ PKG_SHELL= bin/fish .include "../../mk/bsd.prefs.mk" # backtrace() and backtrace_symbols were added in NetBSD-6.99.8 -.if !empty(MACHINE_PLATFORM:MNetBSD-*) && empty(MACHINE_PLATFORM:MNetBSD-[0-5].*) && empty(MACHINE_PLATFORM:MNetBSD-6.99.[0-7].*) +.if !empty(MACHINE_PLATFORM:MNetBSD-*) && (empty(MACHINE_PLATFORM:MNetBSD-[0-6].*) || (!empty(MACHINE_PLATFORM:MNetBS-6.99.*) && empty(MACHINE_PLATFORM:MNetBSD-6.99.[0-7]))) CPPFLAGS+= -DHAVE_BACKTRACE CPPFLAGS+= -DHAVE_BACKTRACE_SYMBOLS LDFLAGS+= -lexecinfo Index: shells/zsh/Makefile.common =================================================================== RCS file: /cvsroot/pkgsrc/shells/zsh/Makefile.common,v retrieving revision 1.70 diff -p -u -r1.70 Makefile.common --- shells/zsh/Makefile.common 28 Mar 2013 22:26:13 -0000 1.70 +++ shells/zsh/Makefile.common 13 Apr 2013 16:07:57 -0000 @@ -31,6 +31,14 @@ PKG_INSTALLATION_TYPES= overwrite pkgvie INSTALL_UNSTRIPPED= yes .endif +.if ${OPSYS} == "NetBSD" +# These can't be detected automagically in cross-builds. +CONFIGURE_ENV+= zsh_cv_shared_environ=yes +CONFIGURE_ENV+= zsh_cv_shared_tgetent=yes +CONFIGURE_ENV+= zsh_cv_shared_tigetstr=yes +CONFIGURE_ENV+= zsh_cv_sys_dynamic_execsyms=yes +.endif + PLIST_VARS+= xattr .if exists(/usr/include/sys/xattr.h) PLIST.xattr= yes Index: shells/zsh/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/shells/zsh/distinfo,v retrieving revision 1.42 diff -p -u -r1.42 distinfo --- shells/zsh/distinfo 22 Feb 2013 13:40:30 -0000 1.42 +++ shells/zsh/distinfo 13 Apr 2013 16:07:57 -0000 @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.42 2013/02/22 13:40:30 jperkin Exp $ +$NetBSD: distinfo,v 1.41 2013/01/03 15:37:23 ryoon Exp $ SHA1 (zsh-5.0.2.tar.bz2) = 9f55ecaaae7cdc1495f91237ba2ec087777a4ad9 RMD160 (zsh-5.0.2.tar.bz2) = eea2328a28e9f022ab9f49583622a9c3bd6114a7 Size (zsh-5.0.2.tar.bz2) = 3025767 bytes -SHA1 (patch-ac) = dab5b2181f9a09d31cd20ef8e4b175401f323dc9 +SHA1 (patch-ac) = f83e5f38c262c779f32e0368815ce02308bc3fff +SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2 +SHA1 (patch-configure.ac) = a8bcb291482fb1eead071439597662f07020e554 Index: shells/zsh/patches/patch-ac =================================================================== RCS file: /cvsroot/pkgsrc/shells/zsh/patches/patch-ac,v retrieving revision 1.28 diff -p -u -r1.28 patch-ac --- shells/zsh/patches/patch-ac 22 Feb 2013 13:40:30 -0000 1.28 +++ shells/zsh/patches/patch-ac 13 Apr 2013 16:07:57 -0000 @@ -3,15 +3,21 @@ $NetBSD: patch-ac,v 1.28 2013/02/22 13:4 First chunk: Add support for thread limits. From Peter Stephenson on zsh-workers. +Accepted by Peter Stephenson on +zsh-workers on 2012-08-16. + +Middle chunks: +Use a compile test, not a run test, for whether various rlimit values +are equivalent. A compile test is sufficient because zsh uses these +values in switch cases, so they must be compile-time, if not +preprocessor-time, constants. -All other chunks: +Last chunk: Make this package build on Interix. Patches provided by Hiramatsu Yoshifumi in PR pkg/25946. Last chunk only: Don't force -Wl,--whole-archive for NetBSD, it breaks the build with clang, which doesn't have a reason to disable it again. - -All chunks: Accepted by Peter Stephenson on zsh-workers on 2012-08-16. @@ -60,7 +66,155 @@ zsh-workers on 2012-08-16. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NOFILE" >&5 $as_echo_n "checking for limit RLIMIT_NOFILE... " >&6; } if ${zsh_cv_have_RLIMIT_NOFILE+:} false; then : -@@ -11630,6 +11666,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; } +@@ -10011,9 +10047,6 @@ $as_echo_n "checking if RLIMIT_VMEM and + if ${zsh_cv_rlimit_vmem_is_rss+:} false; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then : +- zsh_cv_rlimit_vmem_is_rss=no +-else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -10022,43 +10055,33 @@ else + #include + #endif + #include +-int main() ++int ++main () + { +-int ret = 1; +-#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_RSS) +-if (RLIMIT_RSS == RLIMIT_VMEM) ret = 0; +-#endif +-return ret; ++static char x[(RLIMIT_VMEM == RLIMIT_RSS)? 1 : -1] ++ ; ++ return 0; + } + _ACEOF +-if ac_fn_c_try_run "$LINENO"; then : ++if ac_fn_c_try_compile "$LINENO"; then : + zsh_cv_rlimit_vmem_is_rss=yes + else + zsh_cv_rlimit_vmem_is_rss=no + fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_vmem_is_rss" >&5 + $as_echo "$zsh_cv_rlimit_vmem_is_rss" >&6; } +- + if test x$zsh_cv_rlimit_vmem_is_rss = xyes; then + $as_echo "#define RLIMIT_VMEM_IS_RSS 1" >>confdefs.h + + fi + +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RLIMIT_VMEM and RLIMIT_AS are the same" >&5 + $as_echo_n "checking if RLIMIT_VMEM and RLIMIT_AS are the same... " >&6; } + if ${zsh_cv_rlimit_vmem_is_as+:} false; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then : +- zsh_cv_rlimit_vmem_is_as=no +-else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -10067,43 +10090,33 @@ else + #include + #endif + #include +-int main() ++int ++main () + { +-int ret = 1; +-#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_AS) +-if (RLIMIT_AS == RLIMIT_VMEM) ret = 0; +-#endif +-return ret; ++static char x[(RLIMIT_VMEM == RLIMIT_AS)? 1 : -1] ++ ; ++ return 0; + } + _ACEOF +-if ac_fn_c_try_run "$LINENO"; then : ++if ac_fn_c_try_compile "$LINENO"; then : + zsh_cv_rlimit_vmem_is_as=yes + else + zsh_cv_rlimit_vmem_is_as=no + fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_vmem_is_as" >&5 + $as_echo "$zsh_cv_rlimit_vmem_is_as" >&6; } +- + if test x$zsh_cv_rlimit_vmem_is_as = xyes; then + $as_echo "#define RLIMIT_VMEM_IS_AS 1" >>confdefs.h + + fi + +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RLIMIT_RSS and RLIMIT_AS are the same" >&5 + $as_echo_n "checking if RLIMIT_RSS and RLIMIT_AS are the same... " >&6; } + if ${zsh_cv_rlimit_rss_is_as+:} false; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then : +- zsh_cv_rlimit_rss_is_as=no +-else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -10112,28 +10125,23 @@ else + #include + #endif + #include +-int main() ++int ++main () + { +-int ret = 1; +-#if defined(HAVE_RLIMIT_RSS) && defined(HAVE_RLIMIT_AS) +-if (RLIMIT_AS == RLIMIT_RSS) ret = 0; +-#endif +-return ret; ++static char x[(RLIMIT_RSS == RLIMIT_AS)? 1 : -1] ++ ; ++ return 0; + } + _ACEOF +-if ac_fn_c_try_run "$LINENO"; then : ++if ac_fn_c_try_compile "$LINENO"; then : + zsh_cv_rlimit_rss_is_as=yes + else + zsh_cv_rlimit_rss_is_as=no + fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_rss_is_as" >&5 + $as_echo "$zsh_cv_rlimit_rss_is_as" >&6; } +- + if test x$zsh_cv_rlimit_rss_is_as = xyes; then + $as_echo "#define RLIMIT_RSS_IS_AS 1" >>confdefs.h + +@@ -11630,6 +11638,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; } DLLD="${DLLD=$CC}" DLLDARG="" ;; Index: shells/zsh/patches/patch-aczsh.m4 =================================================================== RCS file: shells/zsh/patches/patch-aczsh.m4 diff -N shells/zsh/patches/patch-aczsh.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ shells/zsh/patches/patch-aczsh.m4 13 Apr 2013 16:07:57 -0000 @@ -0,0 +1,29 @@ +$NetBSD$ + +Add a utility for compile tests to compare rlimit keys. + +--- aczsh.m4.orig 2009-05-16 12:08:44.000000000 +0000 ++++ aczsh.m4 +@@ -688,3 +688,22 @@ if test $zsh_cv_have_$1 = yes; then + AC_DEFINE(HAVE_$1) + fi]) + ++dnl Check whether rlimit $1, e.g. AS, is the same as rlmit $3, e.g. VMEM. ++dnl $2 is lowercase $1, $4 is lowercase $3. ++AC_DEFUN(zsh_LIMITS_EQUAL, ++[AH_TEMPLATE([RLIMIT_]$1[_IS_]$3, ++[Define to 1 if RLIMIT_]$1[ and RLIMIT_]$3[ both exist and are equal.]) ++AC_CACHE_CHECK([if RLIMIT_]$1[ and RLIMIT_]$3[ are the same], ++zsh_cv_rlimit_$2_is_$4, ++[AC_TRY_COMPILE([ ++#include ++#ifdef HAVE_SYS_TIME_H ++#include ++#endif ++#include ], ++[static char x[(RLIMIT_$1 == RLIMIT_$3)? 1 : -1]], ++ zsh_cv_rlimit_$2_is_$4=yes, ++ zsh_cv_rlimit_$2_is_$4=no)]) ++if test x$zsh_cv_rlimit_$2_is_$4 = xyes; then ++ AC_DEFINE(RLIMIT_$1_IS_$3) ++fi]) Index: shells/zsh/patches/patch-configure.ac =================================================================== RCS file: shells/zsh/patches/patch-configure.ac diff -N shells/zsh/patches/patch-configure.ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ shells/zsh/patches/patch-configure.ac 13 Apr 2013 16:07:57 -0000 @@ -0,0 +1,98 @@ +$NetBSD$ + +Use a compile test, not a run test, for whether various rlimit values +are equivalent. A compile test is sufficient because zsh uses these +values in switch cases, so they must be compile-time, if not +preprocessor-time, constants. + +--- configure.ac.orig 2012-09-09 18:26:47.000000000 +0000 ++++ configure.ac +@@ -1812,85 +1812,9 @@ zsh_LIMIT_PRESENT(RLIMIT_MSGQUEUE) + zsh_LIMIT_PRESENT(RLIMIT_NICE) + zsh_LIMIT_PRESENT(RLIMIT_RTPRIO) + +-AH_TEMPLATE([RLIMIT_VMEM_IS_RSS], +-[Define to 1 if RLIMIT_VMEM and RLIMIT_RSS both exist and are equal.]) +-AC_CACHE_CHECK(if RLIMIT_VMEM and RLIMIT_RSS are the same, +-zsh_cv_rlimit_vmem_is_rss, +-[AC_TRY_RUN([ +-#include +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#include +-int main() +-{ +-int ret = 1; +-#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_RSS) +-if (RLIMIT_RSS == RLIMIT_VMEM) ret = 0; +-#endif +-return ret; +-}], +- zsh_cv_rlimit_vmem_is_rss=yes, +- zsh_cv_rlimit_vmem_is_rss=no, +- zsh_cv_rlimit_vmem_is_rss=no)]) +- +-if test x$zsh_cv_rlimit_vmem_is_rss = xyes; then +- AC_DEFINE(RLIMIT_VMEM_IS_RSS) +-fi +- +- +-AH_TEMPLATE([RLIMIT_VMEM_IS_AS], +-[Define to 1 if RLIMIT_VMEM and RLIMIT_AS both exist and are equal.]) +-AC_CACHE_CHECK(if RLIMIT_VMEM and RLIMIT_AS are the same, +-zsh_cv_rlimit_vmem_is_as, +-[AC_TRY_RUN([ +-#include +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#include +-int main() +-{ +-int ret = 1; +-#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_AS) +-if (RLIMIT_AS == RLIMIT_VMEM) ret = 0; +-#endif +-return ret; +-}], +- zsh_cv_rlimit_vmem_is_as=yes, +- zsh_cv_rlimit_vmem_is_as=no, +- zsh_cv_rlimit_vmem_is_as=no)]) +- +-if test x$zsh_cv_rlimit_vmem_is_as = xyes; then +- AC_DEFINE(RLIMIT_VMEM_IS_AS) +-fi +- +- +-AH_TEMPLATE([RLIMIT_RSS_IS_AS], +-[Define to 1 if RLIMIT_RSS and RLIMIT_AS both exist and are equal.]) +-AC_CACHE_CHECK(if RLIMIT_RSS and RLIMIT_AS are the same, +-zsh_cv_rlimit_rss_is_as, +-[AC_TRY_RUN([ +-#include +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#include +-int main() +-{ +-int ret = 1; +-#if defined(HAVE_RLIMIT_RSS) && defined(HAVE_RLIMIT_AS) +-if (RLIMIT_AS == RLIMIT_RSS) ret = 0; +-#endif +-return ret; +-}], +- zsh_cv_rlimit_rss_is_as=yes, +- zsh_cv_rlimit_rss_is_as=no, +- zsh_cv_rlimit_rss_is_as=no)]) +- +-if test x$zsh_cv_rlimit_rss_is_as = xyes; then +- AC_DEFINE(RLIMIT_RSS_IS_AS) +-fi ++zsh_LIMITS_EQUAL(VMEM, vmem, RSS, rss) ++zsh_LIMITS_EQUAL(VMEM, vmem, AS, as) ++zsh_LIMITS_EQUAL(RSS, rss, AS, as) + + + dnl -------------------------------------------- Index: textproc/xmlcatmgr/catalogs.mk =================================================================== RCS file: /cvsroot/pkgsrc/textproc/xmlcatmgr/catalogs.mk,v retrieving revision 1.19 diff -p -u -r1.19 catalogs.mk --- textproc/xmlcatmgr/catalogs.mk 14 Jun 2009 22:58:09 -0000 1.19 +++ textproc/xmlcatmgr/catalogs.mk 13 Apr 2013 16:07:59 -0000 @@ -59,6 +59,7 @@ DEINSTALL_TEMPLATES+= ../../textproc/xml PRINT_PLIST_AWK+= /^share\/(sgml|xml)\/catalog$$/ \ { print "@comment in xmlcatmgr: " $$0; next; } +BUILDLINK_DEPMETHOD.xmlcatmgr?= tool .include "../../textproc/xmlcatmgr/buildlink3.mk" .endif # XMLCATMGR_CATALOGS_MK Index: x11/gtk3/buildlink3.mk =================================================================== RCS file: /cvsroot/pkgsrc/x11/gtk3/buildlink3.mk,v retrieving revision 1.14 diff -p -u -r1.14 buildlink3.mk --- x11/gtk3/buildlink3.mk 16 Feb 2013 11:18:17 -0000 1.14 +++ x11/gtk3/buildlink3.mk 13 Apr 2013 16:08:01 -0000 @@ -14,7 +14,9 @@ BUILDLINK_PKGSRCDIR.gtk3?= ../../x11/gtk pkgbase := gtk3 .include "../../mk/pkg-build-options.mk" +.if !empty(PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge) .include "../../devel/at-spi2-atk/buildlink3.mk" +.endif .include "../../devel/atk/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" Index: x11/gtk3/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/x11/gtk3/distinfo,v retrieving revision 1.16 diff -p -u -r1.16 distinfo --- x11/gtk3/distinfo 12 Mar 2013 11:40:25 -0000 1.16 +++ x11/gtk3/distinfo 13 Apr 2013 16:08:01 -0000 @@ -4,4 +4,8 @@ SHA1 (gtk+-3.6.4.tar.xz) = 2f592b78c32c2 RMD160 (gtk+-3.6.4.tar.xz) = 8dd671f443b3956e6b0a215dde94d5f481ac538a Size (gtk+-3.6.4.tar.xz) = 13275488 bytes SHA1 (patch-aj) = 88d5a5c25bcc005bce8597d1262e68a9e67b5f93 +SHA1 (patch-config.h.in) = 479ebf5a5cf5ca6855fcda94063638a919bbf548 +SHA1 (patch-configure) = 0bf253073a8799082f83fbd37b5424e9adf9b9d3 +SHA1 (patch-configure.ac) = 4a2144abddc3468500515511cd934fd35f573952 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 +SHA1 (patch-gtk_a11y_gail.c) = a7545222e55f1b38ddbcfb094609cc232df071f1 Index: x11/gtk3/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/x11/gtk3/options.mk,v retrieving revision 1.4 diff -p -u -r1.4 options.mk --- x11/gtk3/options.mk 13 Nov 2012 21:55:27 -0000 1.4 +++ x11/gtk3/options.mk 13 Apr 2013 16:08:01 -0000 @@ -1,13 +1,13 @@ # $NetBSD: options.mk,v 1.4 2012/11/13 21:55:27 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3 -PKG_SUPPORTED_OPTIONS= cups debug +PKG_SUPPORTED_OPTIONS= gtk3-atk-bridge cups debug PKG_OPTIONS_REQUIRED_GROUPS= gdk-target PKG_OPTIONS_GROUP.gdk-target= x11 .if exists(/System/Library/Frameworks/Quartz.framework) PKG_OPTIONS_GROUP.gdk-target+= quartz .endif -PKG_SUGGESTED_OPTIONS= x11 +PKG_SUGGESTED_OPTIONS= gtk3-atk-bridge x11 .include "../../mk/bsd.options.mk" @@ -37,10 +37,15 @@ CONFIGURE_ENV+= ac_cv_header_X11_extens CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no PLIST.x11= yes +. if !empty(PKG_OPTIONS:Mgtk3-atk-bridge) BUILDLINK_API_DEPENDS.at-spi2-atk+= at-spi2-atk>=2.6.1 +. include "../../devel/at-spi2-atk/buildlink3.mk" +. else +CONFIGURE_ARGS+= --without-atk-bridge +. endif + BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 -.include "../../devel/at-spi2-atk/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" Index: x11/gtk3/patches/patch-config.h.in =================================================================== RCS file: x11/gtk3/patches/patch-config.h.in diff -N x11/gtk3/patches/patch-config.h.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/gtk3/patches/patch-config.h.in 13 Apr 2013 16:08:01 -0000 @@ -0,0 +1,14 @@ +$NetBSD$ + +--- config.h.in.orig 2013-01-07 10:56:29.000000000 +0000 ++++ config.h.in +@@ -21,6 +21,9 @@ + /* Define the location where the catalogs will be installed */ + #undef GTK_LOCALEDIR + ++/* Define if we're using atk-bridge-2.0 */ ++#undef HAVE_ATK_BRIDGE ++ + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ + #undef HAVE_BIND_TEXTDOMAIN_CODESET + Index: x11/gtk3/patches/patch-configure =================================================================== RCS file: x11/gtk3/patches/patch-configure diff -N x11/gtk3/patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/gtk3/patches/patch-configure 13 Apr 2013 16:08:01 -0000 @@ -0,0 +1,42 @@ +$NetBSD$ + +--- configure.orig 2013-01-20 03:10:46.000000000 +0000 ++++ configure +@@ -1010,6 +1010,7 @@ enable_glibtest + enable_modules + with_included_immodules + with_x ++with_atk_bridge + enable_cups + enable_papi + enable_test_print_backend +@@ -1754,6 +1755,7 @@ Optional Packages: + --with-included-immodules=MODULE1,MODULE2,... + build the specified input methods into gtk + --with-x use the X Window System ++ --without-atk-bridge Do not use atk-bridge-2.0 + --with-html-dir=PATH path to installed docs + --with-xml-catalog=CATALOG + path to xml catalog to use +@@ -23450,8 +23452,20 @@ fi + # Check for Accessibility Toolkit flags + ######################################## + +-if test x$enable_x11_backend = xyes; then ++ ++# Check whether --with-atk-bridge was given. ++if test "${with_atk_bridge+set}" = set; then : ++ withval=$with_atk_bridge; : ++else ++ with_atk_bridge=yes ++fi ++ ++ ++if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then + ATK_PACKAGES="atk atk-bridge-2.0" ++ ++$as_echo "#define HAVE_ATK_BRIDGE 1" >>confdefs.h ++ + else + ATK_PACKAGES="atk" + fi Index: x11/gtk3/patches/patch-configure.ac =================================================================== RCS file: x11/gtk3/patches/patch-configure.ac diff -N x11/gtk3/patches/patch-configure.ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/gtk3/patches/patch-configure.ac 13 Apr 2013 16:08:01 -0000 @@ -0,0 +1,19 @@ +$NetBSD$ + +--- configure.ac.orig 2013-01-07 10:50:02.000000000 +0000 ++++ configure.ac +@@ -1295,8 +1295,13 @@ AC_SUBST(GDK_DEP_CFLAGS) + # Check for Accessibility Toolkit flags + ######################################## + +-if test x$enable_x11_backend = xyes; then ++AC_ARG_WITH(atk-bridge, ++ AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]), ++ :, with_atk_bridge=yes) ++ ++if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then + ATK_PACKAGES="atk atk-bridge-2.0" ++ AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0]) + else + ATK_PACKAGES="atk" + fi Index: x11/gtk3/patches/patch-gtk_a11y_gail.c =================================================================== RCS file: x11/gtk3/patches/patch-gtk_a11y_gail.c diff -N x11/gtk3/patches/patch-gtk_a11y_gail.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/gtk3/patches/patch-gtk_a11y_gail.c 13 Apr 2013 16:08:01 -0000 @@ -0,0 +1,37 @@ +$NetBSD$ + +--- gtk/a11y/gail.c.orig 2013-01-07 10:50:02.000000000 +0000 ++++ gtk/a11y/gail.c +@@ -36,8 +36,10 @@ + #include "gailmisc.h" + + #ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + #include + #endif ++#endif + + static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, + guint n_param_values, +@@ -808,8 +810,10 @@ _gtk_accessibility_shutdown (void) + g_clear_object (&atk_misc_instance); + + #ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + atk_bridge_adaptor_cleanup (); + #endif ++#endif + _gail_util_uninstall (); + } + +@@ -828,8 +832,10 @@ _gtk_accessibility_init (void) + + _gail_util_install (); + #ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + atk_bridge_adaptor_init (NULL, NULL); + #endif ++#endif + + atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL); + } Index: x11/libX11/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/x11/libX11/Makefile,v retrieving revision 1.29 diff -p -u -r1.29 Makefile --- x11/libX11/Makefile 29 Oct 2012 05:06:33 -0000 1.29 +++ x11/libX11/Makefile 13 Apr 2013 16:08:01 -0000 @@ -50,6 +50,21 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PR CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" .endif +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} + +SUBST_CLASSES+= keysymdef +SUBST_FILES.keysymdef+= configure +SUBST_FILES.keysymdef+= src/Makefile.in +SUBST_MESSAGE.keysymdef+= Use keysymdef.h in the cross destdir. +SUBST_STAGE.keysymdef+= pre-configure +SUBST_SED.keysymdef+= -e s,'$$KEYSYMDEFDIR',${CROSS_DESTDIR:Q}'&',g + +# [TRC 20130328: Mega-kludgerific! We need a better way to do this! +# Also, does this obviate the need for the above substitution?] +TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto +.endif + .include "../../x11/bigreqsproto/buildlink3.mk" .include "../../x11/inputproto/buildlink3.mk" .include "../../x11/kbproto/buildlink3.mk" Index: x11/libXt/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/x11/libXt/Makefile,v retrieving revision 1.17 diff -p -u -r1.17 Makefile --- x11/libXt/Makefile 29 Oct 2012 05:06:36 -0000 1.17 +++ x11/libXt/Makefile 13 Apr 2013 16:08:01 -0000 @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --disable-malloc0return .endif .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) -MAKE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include .endif CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h Index: x11/libxcb/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/x11/libxcb/Makefile,v retrieving revision 1.20 diff -p -u -r1.20 Makefile --- x11/libxcb/Makefile 1 Feb 2013 14:40:29 -0000 1.20 +++ x11/libxcb/Makefile 13 Apr 2013 16:08:01 -0000 @@ -11,8 +11,8 @@ HOMEPAGE= http://xcb.freedesktop.org/ COMMENT= X protocol C-language Binding LICENSE= mit # with no-advertising clause -BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt -BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.7:../../x11/py-xcbgen +TOOL_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt +TOOL_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.7:../../x11/py-xcbgen GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -21,6 +21,19 @@ USE_TOOLS+= gmake pkg-config CONFIGURE_ARGS+= --disable-build-docs # or needs doxygen CONFIGURE_ARGS+= --disable-doxygen +.include "../../mk/bsd.prefs.mk" + +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +# [TRC 20130328: XXX This is kludgerific! We need to use the full +# pathname in the host to the target's xcbincludedir, but libxcb gets +# that from pkg-config, which reports the pathname in the target.] +SUBST_CLASSES+= xcbincludedir +SUBST_FILES.xcbincludedir+= src/Makefile.in +SUBST_MESSAGE.xcbincludedir= Use the xcbincludedir in the cross destdir. +SUBST_STAGE.xcbincludedir= pre-configure +SUBST_SED.xcbincludedir= -e s,'$$(XCBPROTO_XCBINCLUDEDIR)',${CROSS_DESTDIR:Q}'&',g +.endif + # Adds -Wl,-R to pkgconfig files automatically PKGCONFIG_OVERRIDE+= xcb-composite.pc.in PKGCONFIG_OVERRIDE+= xcb-damage.pc.in Index: x11/xterm/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/x11/xterm/Makefile,v retrieving revision 1.72 diff -p -u -r1.72 Makefile --- x11/xterm/Makefile 27 Feb 2013 09:19:09 -0000 1.72 +++ x11/xterm/Makefile 13 Apr 2013 16:08:02 -0000 @@ -48,6 +48,9 @@ CONFIGURE_ARGS+= --enable-wide-chars BUILDLINK_DEPMETHOD.libxkbfile?= build .include "../../x11/libxkbfile/buildlink3.mk" +# [TRC 20130328: Nuke the desktop utils crap because it depends on +# glib2 which brings in Perl.] +.if "0" == "1" post-install: ${INSTALL_DATA} ${WRKSRC}/xterm.desktop \ ${DESTDIR}${PREFIX}/share/applications && \ @@ -55,10 +58,12 @@ post-install: ${DESTDIR}${PREFIX}/share/applications cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && tbl xterm.1 \ > xterm.1.tbl && mv xterm.1.tbl xterm.1 +.endif .include "options.mk" -.include "../../sysutils/desktop-file-utils/desktopdb.mk" +# [TRC 20130328: See above about desktop utils.] +#.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/termcap.buildlink3.mk" .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: x11/xterm/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/x11/xterm/PLIST,v retrieving revision 1.9 diff -p -u -r1.9 PLIST --- x11/xterm/PLIST 10 Oct 2012 13:50:56 -0000 1.9 +++ x11/xterm/PLIST 13 Apr 2013 16:08:02 -0000 @@ -13,8 +13,6 @@ man/man1/koi8rxterm.1 man/man1/resize.1 man/man1/uxterm.1 man/man1/xterm.1 -share/applications/uxterm.desktop -share/applications/xterm.desktop share/pixmaps/filled-xterm_32x32.xpm share/pixmaps/filled-xterm_48x48.xpm share/pixmaps/mini.xterm_32x32.xpm