? wip ? wip-cvs ? wip-git ? bootstrap/work ? cad/eagle/PLIST.new ? devel/p5-Regexp-Assemble/:q ? devel/rapidsvn/patches/patch-configure ? editors/emacs24/work ? ham/gnuradio-core/COMMIT ? ham/gnuradio-ctrlport/PLIST.new ? ham/gnuradio-wxgui/Makefile.new ? ham/uhd/:q ? ham/uhd/PLIST.doxygen-diff ? ham/uhd/PLIST.still ? mail/sendmail/work ? pkgtools/pbulk/work ? pkgtools/pbulk-base/work ? shells/zsh/work ? sysutils/xentools33/patches/patch-tools_xenstore_xenstored__core.c ? www/lighttpd/emacs-25.0.50.core ? x11/wxGTK28/: ? x11/wxGTK28/buildlink3.mk.new Index: audio/audacity/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/audio/audacity/Makefile,v retrieving revision 1.100 diff -u -r1.100 Makefile --- audio/audacity/Makefile 18 Nov 2015 14:19:47 -0000 1.100 +++ audio/audacity/Makefile 27 Dec 2015 12:27:17 -0000 @@ -73,7 +73,10 @@ .include "../../audio/flac/buildlink3.mk" .include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" -.include "../../x11/wxGTK30/buildlink3.mk" +WXGTK_ACCEPTED= WXGTK30 WXGTK28 +.include "../../mk/wxGTK.mk" +# force to 3.0 only +#WXGTK_TYPE= WXGTK30 .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" Index: audio/spek/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/audio/spek/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- audio/spek/Makefile 18 Nov 2015 14:19:48 -0000 1.4 +++ audio/spek/Makefile 27 Dec 2015 12:27:21 -0000 @@ -19,5 +19,7 @@ .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../multimedia/ffmpeg2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../x11/wxGTK30/buildlink3.mk" +.include "../../mk/wxGTK.mk" +WXGTK_TYPE= WXGTK30 + .include "../../mk/bsd.pkg.mk" Index: biology/openbabel/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/biology/openbabel/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- biology/openbabel/Makefile 25 Apr 2015 14:20:26 -0000 1.25 +++ biology/openbabel/Makefile 27 Dec 2015 12:27:23 -0000 @@ -1,5 +1,4 @@ # $NetBSD: Makefile,v 1.25 2015/04/25 14:20:26 tnn Exp $ -# DISTNAME= openbabel-2.3.2 PKGREVISION= 1 Index: biology/openbabel/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/biology/openbabel/options.mk,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 options.mk --- biology/openbabel/options.mk 5 Oct 2011 22:15:49 -0000 1.1.1.1 +++ biology/openbabel/options.mk 27 Dec 2015 12:27:24 -0000 @@ -9,7 +9,7 @@ .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mwx-gui) -. include "../../x11/wxGTK28/buildlink3.mk" +. include "../../mk/wxGTK.mk" CMAKE_ARGS+= -DBUILD_GUI=ON PLIST.wx-gui= yes .else Index: cad/boolean/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/cad/boolean/Makefile,v retrieving revision 1.68 diff -u -r1.68 Makefile --- cad/boolean/Makefile 25 Apr 2015 14:20:26 -0000 1.68 +++ cad/boolean/Makefile 27 Dec 2015 12:27:25 -0000 @@ -40,6 +40,6 @@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/edit ${DESTDIR}${PREFIX}/bin/edit .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../x11/wxGTK28-contrib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: cad/kicad/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/cad/kicad/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- cad/kicad/Makefile 25 Apr 2015 14:20:27 -0000 1.7 +++ cad/kicad/Makefile 27 Dec 2015 12:27:26 -0000 @@ -53,7 +53,7 @@ .include "../../devel/cmake/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.prefs.mk" Index: cross/bossa/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/cross/bossa/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- cross/bossa/Makefile 25 Apr 2015 14:20:30 -0000 1.8 +++ cross/bossa/Makefile 27 Dec 2015 12:27:41 -0000 @@ -33,5 +33,5 @@ .endif .include "../../devel/readline/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../mk/bsd.pkg.mk" Index: databases/pgadmin3/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/databases/pgadmin3/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- databases/pgadmin3/Makefile 5 Aug 2015 15:29:00 -0000 1.49 +++ databases/pgadmin3/Makefile 27 Dec 2015 12:27:52 -0000 @@ -25,6 +25,8 @@ .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" -.include "../../x11/wxGTK30/buildlink3.mk" +WXGTK_ACCEPTED= WXGTK30 +WXGTK_DEFAULT= WXGTK30 +.include "../../mk/wxGTK.mk" .include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: devel/flim/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/devel/flim/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- devel/flim/Makefile 25 Nov 2015 12:49:46 -0000 1.37 +++ devel/flim/Makefile 27 Dec 2015 12:27:55 -0000 @@ -58,8 +58,8 @@ ${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX}; \ done -.include "../../editors/emacs/modules.mk" +.include "../../wip/emacs-current/modules.mk" BUILDLINK_API_DEPENDS.apel+= apel>=10.7 -.include "../../devel/apel/buildlink3.mk" +.include "../../wip/apel-git/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: devel/rapidsvn/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/devel/rapidsvn/distinfo,v retrieving revision 1.18 diff -u -r1.18 distinfo --- devel/rapidsvn/distinfo 3 Nov 2015 03:29:19 -0000 1.18 +++ devel/rapidsvn/distinfo 27 Dec 2015 12:27:58 -0000 @@ -4,4 +4,5 @@ RMD160 (rapidsvn-0.12.1.tar.gz) = dde655f385245ba9346a5fc4a051ef01c5551501 SHA512 (rapidsvn-0.12.1.tar.gz) = 892dab56e8ec19c5f26a0ddfab378187bc0325275f9fcf759c12beead70aab17876f7e5920bcf214fc86354faef58244ce25926ba010158f7354cd144e1c4c07 Size (rapidsvn-0.12.1.tar.gz) = 1087511 bytes +SHA1 (patch-configure) = eb9070c8dabfc53c19d7d2d3fbedb1942ec7dc26 SHA1 (patch-src_locale_Makefile.in) = fe0fe3a74e03ef6f1f9c50cf4ae4db393aa21f9f Index: devel/semi/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/devel/semi/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- devel/semi/Makefile 25 Nov 2015 12:49:46 -0000 1.36 +++ devel/semi/Makefile 27 Dec 2015 12:27:59 -0000 @@ -64,7 +64,7 @@ .include "options.mk" -.include "../../editors/emacs/modules.mk" +.include "../../wip/emacs-current/modules.mk" .include "../../devel/apel/buildlink3.mk" .include "../../devel/flim/buildlink3.mk" Index: editors/poedit/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/editors/poedit/Makefile,v retrieving revision 1.54 diff -u -r1.54 Makefile --- editors/poedit/Makefile 25 Apr 2015 14:20:43 -0000 1.54 +++ editors/poedit/Makefile 27 Dec 2015 12:28:06 -0000 @@ -19,7 +19,7 @@ CONFIGURE_ENV+= WX_CONFIG_NAME=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config .include "../../textproc/gtkspell/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bdb.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" Index: games/atque/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/games/atque/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- games/atque/Makefile 25 Apr 2015 14:22:52 -0000 1.2 +++ games/atque/Makefile 27 Dec 2015 12:28:08 -0000 @@ -28,6 +28,6 @@ .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: games/holtz/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/games/holtz/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- games/holtz/Makefile 26 Aug 2015 21:38:33 -0000 1.24 +++ games/holtz/Makefile 27 Dec 2015 12:28:09 -0000 @@ -15,5 +15,5 @@ USE_TOOLS+= gmake .include "../../devel/boost-libs/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../mk/bsd.pkg.mk" Index: games/scummvm-tools/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/games/scummvm-tools/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- games/scummvm-tools/Makefile 25 Apr 2015 14:23:03 -0000 1.32 +++ games/scummvm-tools/Makefile 27 Dec 2015 12:28:09 -0000 @@ -29,5 +29,5 @@ .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../mk/bsd.pkg.mk" Index: geography/opencpn/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/geography/opencpn/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- geography/opencpn/Makefile 25 Apr 2015 14:23:06 -0000 1.4 +++ geography/opencpn/Makefile 27 Dec 2015 12:28:09 -0000 @@ -40,7 +40,7 @@ .include "../../devel/cmake/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" Index: geography/opencpn-plugin-weather_routing/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/geography/opencpn-plugin-weather_routing/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- geography/opencpn-plugin-weather_routing/Makefile 9 Sep 2015 11:07:07 -0000 1.3 +++ geography/opencpn-plugin-weather_routing/Makefile 27 Dec 2015 12:28:09 -0000 @@ -28,7 +28,7 @@ .include "../../devel/cmake/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../textproc/tinyxml/buildlink3.mk" Index: graphics/extrema/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/graphics/extrema/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- graphics/extrema/Makefile 25 Apr 2015 14:23:09 -0000 1.26 +++ graphics/extrema/Makefile 27 Dec 2015 12:28:09 -0000 @@ -16,5 +16,5 @@ USE_TOOLS+= gmake CONFIGURE_ARGS+= --with-wxGTK -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../mk/bsd.pkg.mk" Index: graphics/gnuplot/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/graphics/gnuplot/options.mk,v retrieving revision 1.11 diff -u -r1.11 options.mk --- graphics/gnuplot/options.mk 28 Oct 2015 19:03:17 -0000 1.11 +++ graphics/gnuplot/options.mk 27 Dec 2015 12:28:09 -0000 @@ -69,7 +69,7 @@ # force wxt terminal into single threaded mode to avoid crashes # c.f. http://sourceforge.net/p/gnuplot/mailman/message/31928881/ CONFIGURE_ARGS+= --enable-wxwidgets --with-wx-single-threaded -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .else CONFIGURE_ARGS+= --disable-wxwidgets .endif Index: graphics/hugin/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/graphics/hugin/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- graphics/hugin/Makefile 18 Oct 2015 15:56:56 -0000 1.56 +++ graphics/hugin/Makefile 27 Dec 2015 12:28:09 -0000 @@ -44,5 +44,6 @@ #.include "../../lang/python/extension.mk" .include "../../math/fftw/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../x11/wxGTK30/buildlink3.mk" +WXGTK_ACCEPTED= WXGTK30 +.include "../../mk/wxGTK.mk" .include "../../mk/bsd.pkg.mk" Index: graphics/wxsvg/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/graphics/wxsvg/Makefile,v retrieving revision 1.52 diff -u -r1.52 Makefile --- graphics/wxsvg/Makefile 18 Nov 2015 14:19:50 -0000 1.52 +++ graphics/wxsvg/Makefile 27 Dec 2015 12:28:11 -0000 @@ -19,6 +19,6 @@ .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../multimedia/ffmpeg1/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: graphics/wxsvg/buildlink3.mk =================================================================== RCS file: /cvsroot/pkgsrc/graphics/wxsvg/buildlink3.mk,v retrieving revision 1.35 diff -u -r1.35 buildlink3.mk --- graphics/wxsvg/buildlink3.mk 25 Apr 2015 14:23:20 -0000 1.35 +++ graphics/wxsvg/buildlink3.mk 27 Dec 2015 12:28:11 -0000 @@ -11,7 +11,7 @@ .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .endif # WXSVG_BUILDLINK3_MK BUILDLINK_TREE+= -wxsvg Index: math/fityk/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/math/fityk/Makefile,v retrieving revision 1.31 diff -u -r1.31 Makefile --- math/fityk/Makefile 25 Apr 2015 14:23:29 -0000 1.31 +++ math/fityk/Makefile 27 Dec 2015 12:28:19 -0000 @@ -23,6 +23,6 @@ .include "../../devel/boost-headers/buildlink3.mk" .include "../../mk/readline.buildlink3.mk" .include "../../math/xylib/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: math/wxmaxima/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/math/wxmaxima/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- math/wxmaxima/Makefile 25 Apr 2015 14:23:31 -0000 1.2 +++ math/wxmaxima/Makefile 27 Dec 2015 12:28:19 -0000 @@ -19,6 +19,8 @@ CONFLICTS+= wxMaxima-[0-9]* -.include "../../x11/wxGTK30/buildlink3.mk" +#WXGTK_ACCEPTED= WXGTK30 (seems both compliant) +.include "../../mk/wxGTK.mk" + .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: misc/elscreen/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/misc/elscreen/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- misc/elscreen/Makefile 13 Feb 2015 14:05:07 -0000 1.22 +++ misc/elscreen/Makefile 27 Dec 2015 12:28:22 -0000 @@ -32,6 +32,7 @@ # Emacs 24 or later is not supported. Try wip/elscreen-current # instead. EMACS_VERSIONS_ACCEPTED= \ + emacs25 \ emacs23 emacs23nox \ emacs22 emacs22nox \ emacs21 emacs21nox \ Index: misc/usbprog/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/misc/usbprog/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- misc/usbprog/Makefile 25 Apr 2015 14:23:37 -0000 1.27 +++ misc/usbprog/Makefile 27 Dec 2015 12:28:23 -0000 @@ -20,6 +20,6 @@ .include "../../textproc/libxml2/buildlink3.mk" .include "../../devel/libusb/buildlink3.mk" .include "../../mk/readline.buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: misc/xchm/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/misc/xchm/Makefile,v retrieving revision 1.70 diff -u -r1.70 Makefile --- misc/xchm/Makefile 25 Apr 2015 14:23:37 -0000 1.70 +++ misc/xchm/Makefile 27 Dec 2015 12:28:23 -0000 @@ -15,5 +15,5 @@ GNU_CONFIGURE= yes .include "../../devel/chmlib/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../mk/bsd.pkg.mk" Index: multimedia/dvdstyler/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/dvdstyler/Makefile,v retrieving revision 1.67 diff -u -r1.67 Makefile --- multimedia/dvdstyler/Makefile 18 Nov 2015 14:19:51 -0000 1.67 +++ multimedia/dvdstyler/Makefile 27 Dec 2015 12:28:23 -0000 @@ -38,6 +38,6 @@ .include "../../multimedia/ffmpeg1/buildlink3.mk" # needs mediactrl BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.10nb14 -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: multimedia/mkvtoolnix/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/mkvtoolnix/options.mk,v retrieving revision 1.1 diff -u -r1.1 options.mk --- multimedia/mkvtoolnix/options.mk 20 Mar 2011 13:19:44 -0000 1.1 +++ multimedia/mkvtoolnix/options.mk 27 Dec 2015 12:28:24 -0000 @@ -30,7 +30,7 @@ . include "../../databases/shared-mime-info/mimedb.mk" . include "../../graphics/hicolor-icon-theme/buildlink3.mk" . include "../../sysutils/desktop-file-utils/desktopdb.mk" -. include "../../x11/wxGTK28/buildlink3.mk" +. include "../../mk/wxGTK.mk" .else CONFIGURE_ARGS+= --disable-wxwidgets .endif Index: multimedia/mkvtoolnix-old/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/mkvtoolnix-old/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- multimedia/mkvtoolnix-old/Makefile 25 Apr 2015 14:23:40 -0000 1.40 +++ multimedia/mkvtoolnix-old/Makefile 27 Dec 2015 12:28:24 -0000 @@ -31,7 +31,7 @@ PLIST.gui= yes CONFIGURE_ARGS+= --enable-gui CONFIGURE_ARGS+= --enable-wxwidgets -. include "../../x11/wxGTK28/buildlink3.mk" +. include "../../mk/wxGTK.mk" .else CONFIGURE_ARGS+= --disable-gui CONFIGURE_ARGS+= --disable-wxwidgets Index: net/amule/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/amule/Makefile,v retrieving revision 1.74 diff -u -r1.74 Makefile --- net/amule/Makefile 18 Nov 2015 14:19:53 -0000 1.74 +++ net/amule/Makefile 27 Dec 2015 12:28:24 -0000 @@ -40,6 +40,6 @@ .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/crypto++/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: net/filezilla/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/filezilla/Makefile,v retrieving revision 1.65 diff -u -r1.65 Makefile --- net/filezilla/Makefile 10 Oct 2015 01:58:15 -0000 1.65 +++ net/filezilla/Makefile 27 Dec 2015 12:28:24 -0000 @@ -34,5 +34,7 @@ .include "../../sysutils/desktop-file-utils/desktopdb.mk" BUILDLINK_API_DEPENDS.tinyxml+= tinyxml>=2.6.2nb1 .include "../../textproc/tinyxml/buildlink3.mk" -.include "../../x11/wxGTK30/buildlink3.mk" +# force to 3.0 for the moment +WXGTK_DEFAULT= WXGTK30 +.include "../../mk/wxGTK.mk" .include "../../mk/bsd.pkg.mk" Index: sysutils/bacula-wx-console/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/bacula-wx-console/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- sysutils/bacula-wx-console/Makefile 25 Apr 2015 14:24:50 -0000 1.41 +++ sysutils/bacula-wx-console/Makefile 27 Dec 2015 12:28:29 -0000 @@ -16,5 +16,5 @@ .include "../../sysutils/bacula/Makefile.common" .include "../../sysutils/bacula/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../mk/bsd.pkg.mk" Index: www/amaya/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/www/amaya/Makefile,v retrieving revision 1.93 diff -u -r1.93 Makefile --- www/amaya/Makefile 12 Jun 2015 10:51:48 -0000 1.93 +++ www/amaya/Makefile 27 Dec 2015 12:28:34 -0000 @@ -134,7 +134,7 @@ #.include "../../www/libwww/buildlink3.mk" .include "../../textproc/redland/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" Index: x11/py-wxWidgets/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/x11/py-wxWidgets/Makefile,v retrieving revision 1.61 diff -u -r1.61 Makefile --- x11/py-wxWidgets/Makefile 5 Dec 2015 21:26:09 -0000 1.61 +++ x11/py-wxWidgets/Makefile 27 Dec 2015 12:28:36 -0000 @@ -53,6 +53,6 @@ .include "../../graphics/MesaLib/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../x11/wxGTK28-contrib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: x11/wxGTK28-contrib/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/x11/wxGTK28-contrib/Makefile,v retrieving revision 1.31 diff -u -r1.31 Makefile --- x11/wxGTK28-contrib/Makefile 25 Apr 2015 14:25:20 -0000 1.31 +++ x11/wxGTK28-contrib/Makefile 27 Dec 2015 12:28:36 -0000 @@ -15,6 +15,6 @@ BUILDLINK_DEPMETHOD.libXt?= build -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: x11/wxGTK28-contrib/buildlink3.mk =================================================================== RCS file: /cvsroot/pkgsrc/x11/wxGTK28-contrib/buildlink3.mk,v retrieving revision 1.28 diff -u -r1.28 buildlink3.mk --- x11/wxGTK28-contrib/buildlink3.mk 25 Apr 2015 14:25:20 -0000 1.28 +++ x11/wxGTK28-contrib/buildlink3.mk 27 Dec 2015 12:28:36 -0000 @@ -9,7 +9,7 @@ BUILDLINK_ABI_DEPENDS.wxGTK28-contrib+= wxGTK28-contrib>=2.8.12nb4 BUILDLINK_PKGSRCDIR.wxGTK28-contrib?= ../../x11/wxGTK28-contrib -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../mk/wxGTK.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" Index: personal-pkgsrc/config-desktop/Makefile =================================================================== RCS file: /e/u/j/public-repository/personal-pkgsrc/config-desktop/Makefile,v retrieving revision 1.72 diff -u -r1.72 Makefile --- personal-pkgsrc/config-desktop/Makefile 26 Apr 2015 13:50:01 -0000 1.72 +++ personal-pkgsrc/config-desktop/Makefile 26 Dec 2015 10:40:40 -0000 @@ -49,8 +49,8 @@ DEPENDS+= netpbm>=10.0:../../graphics/netpbm #EPENDS+= bind>=9.2.3nb1:../../net/bind9 # -DEPENDS+= postgresql84-server>=8.:../../databases/postgresql84-server -DEPENDS+= php>=5.:../../lang/php54 +DEPENDS+= postgresql94-server>=9.:../../databases/postgresql94-server +DEPENDS+= php>=5.:../../lang/php56 #EPENDS+= ap22-php5>=5:../../www/ap-php #EPENDS+= php5-pgsql>=5.:../../databases/php-pgsql DEPENDS+= mecab-[0-9]*:../../textproc/mecab @@ -67,7 +67,7 @@ DEPENDS+= automake>=1.5:../../devel/automake #EPENDS+= emacs-nox>=21:../../editors/emacs-nox DEPENDS+= compface>=1.5:../../graphics/compface -DEPENDS+= Xaw3d>=1.5:../../x11/Xaw3d +DEPENDS+= libXaw3d>=1.5:../../x11/libXaw3d #EPENDS+= xpm>=3.4k:../../graphics/xpm DEPENDS+= jpeg>=6b:../../graphics/jpeg DEPENDS+= giflib>=1.0:../../graphics/giflib @@ -80,9 +80,9 @@ DEPENDS+= gimp>=2:../../graphics/gimp #DEPENDS+= seamonkey>=1:../../www/seamonkey PKG_OPTIONS.ghostscript+= disable-compile-inits -DEPENDS+= ghostscript-gpl-[0-9]*:../../wip/ghostscript-gpl -#DEPENDS+= ghostscript-cidfonts-[0-9]*:../../wip/ghostscript-cidfonts -DEPENDS+= ghostscript-cidfonts-ryumin-[0-9]*:../../wip/ghostscript-cidfonts-ryumin +DEPENDS+= ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl +#DEPENDS+= ghostscript-cidfonts-[0-9]*:../../fonts/ghostscript-cidfonts +DEPENDS+= ghostscript-cidfonts-ryumin-[0-9]*:../../fonts/ghostscript-cidfonts-ryumin #EPENDS+= teTeX-bin>=2:../../print/tetex-bin DEPENDS+= ja-ptex>=1:../../wip/ja-ptex DEPENDS+= mpeg_play>=2.4:../../multimedia/mpeg_play Index: personal-pkgsrc/emacs-desktop/Makefile =================================================================== RCS file: /e/u/j/public-repository/personal-pkgsrc/emacs-desktop/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- personal-pkgsrc/emacs-desktop/Makefile 4 Jul 2015 23:55:57 -0000 1.19 +++ personal-pkgsrc/emacs-desktop/Makefile 27 Dec 2015 11:35:35 -0000 @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.3 2011/01/28 05:15:04 makoto Exp $ # $Id: Makefile,v 1.19 2015/07/04 23:55:57 makoto Exp $ -DISTNAME= emacs-desktop-${EMACS_TYPE:C/emacs//}em0.991 +DISTNAME= emacs-desktop-${EMACS_TYPE:C/emacs//}em0.992 CATEGORIES= personal-pkgsrc MASTER_SITES= http://cvsweb.ki.nu/mef/personal-pkgsrc DISTFILES= # empty @@ -12,10 +12,10 @@ COMMENT= Emacs for Desktop DEPENDS += compface-[0-9]*:../../graphics/compface -DEPENDS += Xaw3d-[0-9]*:../../x11/Xaw3d +DEPENDS += libXaw3d-[0-9]*:../../x11/libXaw3d #EPENDS += xpm-3.4k:../../graphics/xpm/ -#DEPENDS += emacs25-[0-9]*:../../wip/emacs-current -DEPENDS += emacs25-[0-9]*:../../wip/emacs-snapshot +DEPENDS += emacs25-[0-9]*:../../wip/emacs-current +#DEPENDS += emacs25-[0-9]*:../../wip/emacs-snapshot # To avoid depending to MesaLib-7.4.4 #DEPENDS += MesaLib-[0-9]*:../../wip/MesaLib