diff options
55 files changed, 275 insertions, 110 deletions
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile index 1f801fdbc18..6a05f28899b 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.97 2015/08/18 07:31:02 wiz Exp $ +# $NetBSD: Makefile,v 1.98 2015/10/14 20:17:24 wiz Exp $ DISTNAME= TiMidity++-2.14.0 PKGNAME= ${DISTNAME:S/TiMidity++/timidity/} -PKGREVISION= 15 +PKGREVISION= 16 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=timidity/} EXTRACT_SUFX= .tar.bz2 diff --git a/cad/felt/Makefile b/cad/felt/Makefile index 55511e0adb5..2a2f0b5f0db 100644 --- a/cad/felt/Makefile +++ b/cad/felt/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2015/07/04 16:18:28 joerg Exp $ +# $NetBSD: Makefile,v 1.39 2015/10/14 20:17:24 wiz Exp $ DISTNAME= felt-3.05.src PKGNAME= felt-3.05 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=felt/} DISTFILES= felt-3.05.src.tar.gz felt-3.05.ps.gz @@ -16,6 +16,13 @@ EXTRACT_ONLY= felt-3.05.src.tar.gz WRKSRC= ${WRKDIR}/FElt-3.05 USE_TOOLS+= gzcat XAW_TYPE?= 3d +# does not directly support Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw MAKE_ENV+= CCOPTS=${CFLAGS:M*:Q} MAKE_ENV+= LDOPTS=${LDFLAGS:M*:Q} diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index 16509602819..30d2af07c55 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2015/08/23 14:30:37 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2015/10/14 20:17:24 wiz Exp $ # This section contains variables that might be overridden. PKGNAME?= ${PKGNAME_BASE} @@ -7,7 +7,7 @@ COMMENT?= SQL shell for Sybase and MS-SQL servers # Normal package Makefile contents follow. DISTNAME= sqsh-2.1-src PKGNAME_BASE= ${DISTNAME:S/-src//} -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqsh/} diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile index efa007ca396..ec1d21bfb92 100644 --- a/devel/m17n-lib/Makefile +++ b/devel/m17n-lib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2015/06/30 09:57:35 ryoon Exp $ +# $NetBSD: Makefile,v 1.31 2015/10/14 20:17:24 wiz Exp $ # DISTNAME= m17n-lib-1.7.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel converters editors inputmethod textproc time MASTER_SITES= http://download.savannah.gnu.org/releases/m17n/ diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile index f71de116d2d..b8364380168 100644 --- a/devel/pdcurses/Makefile +++ b/devel/pdcurses/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2015/08/18 07:31:00 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2015/10/14 20:17:24 wiz Exp $ DISTNAME= PDCurses-3.3 PKGNAME= ${DISTNAME:tl} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pdcurses/} diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile index e67d7e45d8d..d13082d79fe 100644 --- a/editors/emacs-snapshot/Makefile +++ b/editors/emacs-snapshot/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2015/10/10 01:58:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.64 2015/10/14 20:17:24 wiz Exp $ #PKGREVISION= 1 -PKGREVISION= 3 +PKGREVISION= 4 .include "../../editors/emacs-snapshot/Makefile.common" .include "options.mk" diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk index c371db0a9b6..a95d4b800d2 100644 --- a/editors/emacs-snapshot/options.mk +++ b/editors/emacs-snapshot/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2015/06/14 15:46:22 mef Exp $ +# $NetBSD: options.mk,v 1.11 2015/10/14 20:17:24 wiz Exp $ # ### Set options @@ -90,7 +90,7 @@ CONFIGURE_ARGS+= --without-gconf ### Support Xaw3d (This is only valid with Lucid Toolkit) ### . if !empty(PKG_OPTIONS:Mxaw3d) -.include "../../x11/Xaw3d/buildlink3.mk" +.include "../../x11/libXaw3d/buildlink3.mk" . else CONFIGURE_ARGS+= --without-xaw3d . endif diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 809a79fdd0e..6caebdd0fee 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.51 2015/01/01 09:54:25 dholland Exp $ +# $NetBSD: Makefile,v 1.52 2015/10/14 20:17:24 wiz Exp $ DISTNAME= emacs-20.7 PKGNAME= ${DISTNAME:S/emacs/emacs20/} -PKGREVISION= 17 +PKGREVISION= 18 CATEGORIES= editors MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ \ ftp://ftp.gnu.org/pub/old-gnu/emacs diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile index ee059d7b84b..9c2866a3736 100644 --- a/editors/emacs21/Makefile +++ b/editors/emacs21/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2015/06/12 10:50:01 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2015/10/14 20:17:24 wiz Exp $ -PKGREVISION= 33 +PKGREVISION= 34 CATEGORIES= editors CONFLICTS+= emacs21-nox11-[0-9]* diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index f3e0546c1c8..179c738a81d 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.50 2015/06/12 10:50:01 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2015/10/14 20:17:25 wiz Exp $ -PKGREVISION= 40 +PKGREVISION= 41 CONFLICTS+= emacs22-nox11-[0-9]* diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index fb6ddc7d1dc..d809b546f74 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2015/10/10 01:58:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.23 2015/10/14 20:17:25 wiz Exp $ CONFLICTS+= emacs23-nox11-[0-9]* .include "../../editors/emacs23/Makefile.common" -PKGREVISION= 33 +PKGREVISION= 34 .include "options.mk" diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile index dfad654d659..967a817a1bf 100644 --- a/editors/emacs24/Makefile +++ b/editors/emacs24/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2015/10/10 01:58:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.41 2015/10/14 20:17:25 wiz Exp $ CONFLICTS+= emacs24-nox11-[0-9]* -PKGREVISION= 5 +PKGREVISION= 6 .include "../../editors/emacs24/Makefile.common" .include "options.mk" diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 7bad3a8c493..f72980358d4 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.56 2013/01/15 16:21:34 morr Exp $ +# $NetBSD: Makefile,v 1.57 2015/10/14 20:17:25 wiz Exp $ PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL} +PKGREVISION= 1 COMMENT= Vim editor (vi clone) with X11 Athena GUI .include "../../editors/vim-share/Makefile.common" diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index 15bdb087deb..8c729c48ae3 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2015/09/29 11:23:28 hauke Exp $ +# $NetBSD: Makefile,v 1.88 2015/10/14 20:17:25 wiz Exp $ PKGNAME?= ${DISTNAME} COMMENT?= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} @@ -6,7 +6,7 @@ COMMENT?= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} DISTNAME= xemacs-21.5.27 EMACSVERSION= 21.5-b27 EMACS_DISTNAME= xemacs-${EMACSVERSION} -PKGREVISION= 21 +PKGREVISION= 22 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/} diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 77bad26998d..b540a90c0a0 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.113 2015/02/15 13:13:24 hauke Exp $ +# $NetBSD: Makefile,v 1.114 2015/10/14 20:17:25 wiz Exp $ PKGNAME?= ${DISTNAME} COMMENT?= XEmacs text editor version 21 DISTNAME= xemacs-21.4.23 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/} diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index 38091c1d97c..949c150fd72 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.68 2015/06/12 10:50:03 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2015/10/14 20:17:25 wiz Exp $ DISTNAME= vile-9.8 PKGNAME= x${DISTNAME} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= editors MASTER_SITES= ftp://invisible-island.net/vile/ EXTRACT_SUFX= .tgz diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index f8327c3955d..1595aba04c7 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.69 2015/10/10 01:58:08 ryoon Exp $ +# $NetBSD: Makefile,v 1.70 2015/10/14 20:17:25 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Freeciv client DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share diff --git a/games/freeciv-client/options.mk b/games/freeciv-client/options.mk index 454bbd677e6..5255861a4a4 100644 --- a/games/freeciv-client/options.mk +++ b/games/freeciv-client/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2015/04/26 19:19:42 spz Exp $ +# $NetBSD: options.mk,v 1.8 2015/10/14 20:17:25 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freeciv-client PKG_OPTIONS_REQUIRED_GROUPS= backend @@ -51,7 +51,7 @@ PLIST_SRC= ${PKGDIR}/PLIST.xaw CONFIGURE_ARGS+= --enable-client=xaw CONFIGURE_ARGS+= --enable-fcmp=cli CONFIGURE_ARGS+= --with-xaw3d -.include "../../x11/Xaw3d/buildlink3.mk" +.include "../../x11/libXaw3d/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" PLIST_SRC= ${PKGDIR}/PLIST.xaw .endif diff --git a/games/xboard/Makefile b/games/xboard/Makefile index 37e8b78a15f..669cca81315 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2015/06/12 10:50:07 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2015/10/14 20:17:25 wiz Exp $ DISTNAME= xboard-4.6.2 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GNU:=xboard/} diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index e4df8354268..e1ca10877ce 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2014/05/11 02:19:04 dholland Exp $ -# +# $NetBSD: Makefile,v 1.32 2015/10/14 20:17:25 wiz Exp $ DISTNAME= xfrisk-1.2 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= games MASTER_SITES= http://www.tuxick.net/xfrisk/files/ @@ -30,6 +29,13 @@ MAKE_ENV+= LIBS=${LIBS:Q} # xfrisk doesn't work with standard Xaw. XAW_TYPE= 3d +# does not directly support Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile index d974d0fecb9..e67555ecf87 100644 --- a/games/xgospel/Makefile +++ b/games/xgospel/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2012/10/06 11:55:01 asau Exp $ -# +# $NetBSD: Makefile,v 1.20 2015/10/14 20:17:26 wiz Exp $ DISTNAME= xgospel-1.12d -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= games x11 MASTER_SITES= http://gailly.net/ @@ -20,6 +19,12 @@ XAW_TYPE= 3d .if defined(XAW_TYPE) . if (${XAW_TYPE} == "3d") || (${XAW_TYPE} == "xpm") CONFIGURE_ARGS+= --with-xaw3d +# does not directly support Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw . endif .endif diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 79830834029..a6c3750f587 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.151 2015/08/07 11:20:34 jaapb Exp $ +# $NetBSD: Makefile,v 1.152 2015/10/14 20:17:26 wiz Exp $ DISTNAME= graphviz-2.38.0 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/ diff --git a/graphics/libotf/Makefile b/graphics/libotf/Makefile index 060da9f1b94..4e1eae566b5 100644 --- a/graphics/libotf/Makefile +++ b/graphics/libotf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2015/03/15 17:56:15 hiramatsu Exp $ +# $NetBSD: Makefile,v 1.15 2015/10/14 20:17:26 wiz Exp $ # DISTNAME= libotf-0.9.13 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://download.savannah.gnu.org/releases/m17n/ diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile index a9bff7da773..3fe83e5c3bc 100644 --- a/graphics/ncview/Makefile +++ b/graphics/ncview/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:36 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2015/10/14 20:17:26 wiz Exp $ DISTNAME= ncview-1.92d -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= ftp://cirrus.ucsd.edu/pub/ncview/ diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 349e9cadedf..d333e082a5c 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.70 2015/07/04 16:18:36 joerg Exp $ +# $NetBSD: Makefile,v 1.71 2015/10/14 20:17:26 wiz Exp $ DISTNAME= xfig.3.2.5b.full PKGNAME= xfig-3.2.5b -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcj/} @@ -40,6 +40,12 @@ SUBST_FILES.xaw= Imakefile .if defined(XAW_TYPE) && ${XAW_TYPE} == "3d" # define XAW3D and XAW3D1_5E SUBST_SED.xaw+= -e 's/.*\(\#define.XAW3D\)/\1/' +# does not directly support Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw .elif defined(XAW_TYPE) && ${XAW_TYPE} == "xpm" # define XAW3D, undef XAW3D1_5E SUBST_SED.xaw+= -e 's/.*\(\#define.XAW3D1_5E\)/XCOMM \1/' diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo index f30fb11688b..9b48dc08112 100644 --- a/graphics/xfig/distinfo +++ b/graphics/xfig/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.26 2012/12/24 21:12:36 joerg Exp $ +$NetBSD: distinfo,v 1.27 2015/10/14 20:17:26 wiz Exp $ SHA1 (xfig.3.2.5b.full.tar.gz) = 0730d7e6bc217c0de02682efb0078821512bb542 RMD160 (xfig.3.2.5b.full.tar.gz) = aad4cfd808c116d34218e9890a898652e4f52ab6 Size (xfig.3.2.5b.full.tar.gz) = 5821049 bytes SHA1 (patch-aa) = c931f4735f7502cc9d7c116378dcd3b420a40c6f -SHA1 (patch-ab) = e3c240cc325804ec466e7ef77754791b18fd4338 +SHA1 (patch-ab) = 549f3795923e984988684f2ba29cafb437d9f83d SHA1 (patch-ac) = b43b811dce9aa3cdb5d18dc7c403a4a2e503fd44 SHA1 (patch-ad) = fc686b6509ff45f6aa8ba235b95eb85e1dbead88 SHA1 (patch-ae) = 8bb5d1c01faae34a6ad2cd1eaddf794cbf39a02e @@ -19,6 +19,7 @@ SHA1 (patch-ap) = 84a453de2badd82eb31d950981f086e48310d66f SHA1 (patch-aq) = 83c15caff521ab857b0a2744590cbd17f678c107 SHA1 (patch-d__text.c) = f57cb3c7d0b68a9d27e87538db17ae106acb0ba5 SHA1 (patch-d__text.h) = 3816e30a21c5c4dfd41a8e43d785babc2c8c7789 +SHA1 (patch-e__edit.c) = 9c3630139f3002a3ea65528e44a3af81af35093f SHA1 (patch-w__export.c) = 2787cb59a692d5e435249fea21d6978877db7ea7 SHA1 (patch-w__print.c) = 1856279ad76a2e71ea896a66d874a0b72330acd0 SHA1 (patch-w__util.c) = 35f2cfe73697c0b6005e3a8c3e46b44b2ed8f721 diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab index 551f161db75..ebcdddf8cad 100644 --- a/graphics/xfig/patches/patch-ab +++ b/graphics/xfig/patches/patch-ab @@ -1,8 +1,14 @@ -$NetBSD: patch-ab,v 1.14 2011/02/17 08:46:50 markd Exp $ +$NetBSD: patch-ab,v 1.15 2015/10/14 20:17:26 wiz Exp $ ---- Imakefile.orig 2009-03-30 17:53:05.000000000 +0200 +--- Imakefile.orig 2009-03-30 15:53:05.000000000 +0000 +++ Imakefile -@@ -65,18 +65,21 @@ XCOMM #define XAW3D1_5E +@@ -60,23 +60,26 @@ XCOMM Uncomment the following if you hav + XCOMM some new features, including "Tips", which replace xfig's "help balloons" + XCOMM NOTE: This is the default for many X systems now. + +-XCOMM #define XAW3D1_5E ++#define XAW3D1_5E + #ifdef XAW3D1_5E DUSEXAW3D = -DXAW3D -DXAW3D1_5E #else @@ -56,6 +62,15 @@ $NetBSD: patch-ab,v 1.14 2011/02/17 08:46:50 markd Exp $ #endif XCOMM Uncomment the following definiton if you want to use the small icons +@@ -150,7 +153,7 @@ XCOMM Comment out the next line if you h + XCOMM If your setlocale() doesn't support the locale, you should + XCOMM add -DSETLOCALE to I18N_DEFS. + +-XCOMM #define I18N ++#define I18N + + XCOMM If using an input tablet uncomment the following + @@ -161,7 +164,7 @@ XCOMM uncomment the following line if yo XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures diff --git a/graphics/xfig/patches/patch-e__edit.c b/graphics/xfig/patches/patch-e__edit.c new file mode 100644 index 00000000000..9d89403fe26 --- /dev/null +++ b/graphics/xfig/patches/patch-e__edit.c @@ -0,0 +1,15 @@ +$NetBSD: patch-e__edit.c,v 1.1 2015/10/14 20:17:26 wiz Exp $ + +--- e_edit.c.orig 2007-04-04 16:18:32.000000000 +0000 ++++ e_edit.c +@@ -4247,10 +4247,6 @@ str_panel(char *string, char *name, Widg + NextArg(XtNbottom, XtChainBottom); + NextArg(XtNleft, XtChainLeft); + NextArg(XtNright, XtChainRight); +-#ifdef I18N +- if (!appres.international || !international) +- NextArg(XtNinternational, False); +-#endif /* I18N */ + *pi_x = XtCreateManagedWidget(textname, asciiTextWidgetClass, form, Args, ArgCount); + + /* make CR do nothing for now */ diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index e24fdfe0aea..da2a232b9bb 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.75 2013/08/14 23:51:08 gsutre Exp $ +# $NetBSD: Makefile,v 1.76 2015/10/14 20:17:27 wiz Exp $ DISTNAME= xpaint-2.7.8.1 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/} EXTRACT_SUFX= .tar.bz2 @@ -19,7 +19,7 @@ SUBST_STAGE.foo= pre-configure SUBST_FILES.foo= Local.config configure SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" SUBST_SED.foo+= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.foo+= -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" +SUBST_SED.foo+= -e "s|@XAWDIR@|${BUILDLINK_PREFIX.libXaw3d}|g" SUBST_SED.foo+= -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g" INSTALLATION_DIRS+= bin lib/X11/app-defaults ${PKGMANDIR}/cat1 @@ -43,5 +43,5 @@ pre-configure: .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/Xaw3d/buildlink3.mk" +.include "../../x11/libXaw3d/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo index 105d677e81e..c425d22e09d 100644 --- a/graphics/xpaint/distinfo +++ b/graphics/xpaint/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2013/08/15 00:05:44 gsutre Exp $ +$NetBSD: distinfo,v 1.25 2015/10/14 20:17:27 wiz Exp $ SHA1 (xpaint-2.7.8.1.tar.bz2) = d225254cc15cbc166c392b112b57104657a33aaa RMD160 (xpaint-2.7.8.1.tar.bz2) = 8efca6ff71df8635b8ed50e0c6db2b81f2e068cf @@ -13,4 +13,5 @@ SHA1 (patch-ag) = a8eba89d7389a3e0b0973bf3a3c25a76ae7e0d84 SHA1 (patch-ai) = 38f3532befe2c58cc11d0e055765b6098bbdd9f5 SHA1 (patch-bitmaps_Imakefile) = c9d566999b13b10e3f7d7d7a60c34ef520597117 SHA1 (patch-image_h) = 5e8afa76bdd58cd747c13662e0a37fcf5a62256e +SHA1 (patch-misc.c) = b4ff0e25621312e7ed4dede9df5f99cca3359e2e SHA1 (patch-rw_readWritePS.c) = f56b512e888821134d2f7548741a33f0f8b886fd diff --git a/graphics/xpaint/patches/patch-misc.c b/graphics/xpaint/patches/patch-misc.c new file mode 100644 index 00000000000..f4826feb70e --- /dev/null +++ b/graphics/xpaint/patches/patch-misc.c @@ -0,0 +1,13 @@ +$NetBSD: patch-misc.c,v 1.1 2015/10/14 20:17:27 wiz Exp $ + +--- misc.c.orig 2005-04-24 11:57:52.000000000 +0000 ++++ misc.c +@@ -671,7 +671,7 @@ mousewheelScroll(Widget w, void * l, XEv + } + else return; + if (sb == None) return; +-#ifdef XAW3DG ++#if defined(XAW3DG) && defined(XAW_ARROW_SCROLLBARS) + if (((ScrollbarWidget)sb)->scrollbar.scroll_mode == 2 /* if scroll continuous */ + || LookAhead (sb, event)) + return; diff --git a/lang/elk/Makefile b/lang/elk/Makefile index c159b867cb9..7b5c3225784 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2015/02/23 18:28:52 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2015/10/14 20:17:27 wiz Exp $ DISTNAME= elk-3.99.8 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= http://sam.zoy.org/elk/ EXTRACT_SUFX= .tar.bz2 diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 2e0c5f0d916..d3096c4fb40 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.98 2015/08/07 11:20:34 jaapb Exp $ +# $NetBSD: Makefile,v 1.99 2015/10/14 20:17:27 wiz Exp $ # DISTNAME= ${SCIBASE}-src -PKGREVISION= 16 +PKGREVISION= 17 PKGNAME= ${SCIBASE} CATEGORIES= math MASTER_SITES= http://www.scilab.org/download/4.1/ @@ -149,5 +149,5 @@ CONFIGURE_ARGS+= --without-ocaml .include "../../parallel/pvm3/buildlink3.mk" .include "../../textproc/sablotron/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" -.include "../../x11/Xaw3d/buildlink3.mk" +.include "../../x11/libXaw3d/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/snns/Makefile b/math/snns/Makefile index 6fe9b60f7ae..c9b1dcb7495 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2012/09/13 21:43:08 asau Exp $ +# $NetBSD: Makefile,v 1.25 2015/10/14 20:17:27 wiz Exp $ DISTNAME= SNNSv4.3 PKGNAME= snns-4.3 +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/ @@ -21,6 +22,13 @@ INSTALL_TARGET= install install-man INSTALL_MAKE_FLAGS+= INSTALLDIR=${DESTDIR}${PREFIX} \ MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} +# does not directly support Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw + post-install: ${INSTALL_DATA} ${WRKSRC}/help.hdoc ${DESTDIR}${XGUILOADPATH} ${INSTALL_DATA} ${WRKSRC}/default.cfg ${DESTDIR}${XGUILOADPATH} @@ -33,7 +41,7 @@ post-install: ${DESTDIR}${PREFIX}/share/examples/snns; \ done -.include "../../x11/Xaw3d/buildlink3.mk" +.include "../../x11/libXaw3d/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/siag/Makefile b/misc/siag/Makefile index 985f8a36cec..d273f6bb2ec 100644 --- a/misc/siag/Makefile +++ b/misc/siag/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.63 2015/08/18 07:31:13 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2015/10/14 20:17:27 wiz Exp $ # DISTNAME= siag-3.6.1 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= misc editors math textproc MASTER_SITES= http://siag.nu/pub/siag/ diff --git a/mk/xaw.buildlink3.mk b/mk/xaw.buildlink3.mk index 193fdf522de..bccf2307468 100644 --- a/mk/xaw.buildlink3.mk +++ b/mk/xaw.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: xaw.buildlink3.mk,v 1.6 2013/01/15 16:21:34 morr Exp $ +# $NetBSD: xaw.buildlink3.mk,v 1.7 2015/10/14 20:17:27 wiz Exp $ # # This file selects the X Athena Widgets (Xaw) implementation. # @@ -22,7 +22,7 @@ BUILD_DEFS+= XAW_TYPE . include "../../x11/Xaw-Xpm/buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw-Xpm} .elif ${XAW_TYPE} == "3d" -. include "../../x11/Xaw3d/buildlink3.mk" +. include "../../x11/libXaw3d/buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw3d} .elif ${XAW_TYPE} == "neXtaw" . include "../../x11/neXtaw/buildlink3.mk" diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index eeaed714be4..48ee73e6367 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2015/08/18 07:31:14 wiz Exp $ -# +# $NetBSD: Makefile,v 1.44 2015/10/14 20:17:27 wiz Exp $ DISTNAME= xawtv-3.95 -PKGREVISION= 17 +PKGREVISION= 18 CATEGORIES= multimedia MASTER_SITES= http://dl.bytesex.org/releases/xawtv/ @@ -29,6 +28,14 @@ SUBST_FILES.devoss+= man/motv.1 man/record.1 man/streamer.1 man/xawtv.1 SUBST_FILES.devoss+= man/es/streamer.1 man/es/xawtv.1 man/fr/xawtv.1 SUBST_SED.devoss= -e 's|/dev/dsp|${DEVOSSAUDIO}|g' +# does not directly support Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw + .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "i386" @@ -48,7 +55,7 @@ MAKE_FLAGS+= SUID_ROOT= FS_LIBS=-lFS .include "../../devel/ncurses/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" -.include "../../x11/Xaw3d/buildlink3.mk" +.include "../../x11/libXaw3d/buildlink3.mk" .include "../../x11/libFS/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/print/gv/Makefile b/print/gv/Makefile index 1ebf9aaafbc..18fac22ac71 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.81 2015/06/12 10:50:58 wiz Exp $ +# $NetBSD: Makefile,v 1.82 2015/10/14 20:17:27 wiz Exp $ DISTNAME= gv-3.7.4 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU:=gv/} diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile index 5011c323c45..7db77b74466 100644 --- a/print/xdvik/Makefile +++ b/print/xdvik/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2015/06/14 12:50:07 markd Exp $ +# $NetBSD: Makefile,v 1.19 2015/10/14 20:17:27 wiz Exp $ DISTNAME= texlive-20150521-source PKGNAME= xdvik-22.87 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ EXTRACT_SUFX= .tar.xz diff --git a/sysutils/xfm/Makefile b/sysutils/xfm/Makefile index 7a1c8735798..04eeb620b59 100644 --- a/sysutils/xfm/Makefile +++ b/sysutils/xfm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 19:51:38 asau Exp $ +# $NetBSD: Makefile,v 1.19 2015/10/14 20:17:28 wiz Exp $ DISTNAME= xfm-1.4.3 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= sysutils x11 MASTER_SITES= http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/ @@ -12,9 +12,15 @@ LICENSE= gnu-gpl-v2 BUILD_TARGET+= all xfm.install.script Xfm.ad -WRKSRC= ${WRKDIR}/xfm-1.4.3 USE_IMAKE= YES +# does not directly support Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack -.include "../../x11/Xaw3d/buildlink3.mk" +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw +#BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d + +.include "../../x11/libXaw3d/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfm/distinfo b/sysutils/xfm/distinfo index 0933b716390..d5313592cdb 100644 --- a/sysutils/xfm/distinfo +++ b/sysutils/xfm/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.6 2013/10/20 17:52:57 joerg Exp $ +$NetBSD: distinfo,v 1.7 2015/10/14 20:17:28 wiz Exp $ SHA1 (xfm-1.4.3.tar.gz) = 8d6235bb63e04491cc99603144b52884866b39e2 RMD160 (xfm-1.4.3.tar.gz) = b06c562b467e5085e5ecdd4273b64d554415ce69 Size (xfm-1.4.3.tar.gz) = 420962 bytes SHA1 (patch-aa) = 24ce4e78b18356db98ed2588f8da48380e1efd20 -SHA1 (patch-ab) = cd16fe1b8f0d2fb0c4c7846c81b0f5e0bfc4137c +SHA1 (patch-ab) = b8c1cff37974fee67272e1f7befe345654ceb819 SHA1 (patch-ac) = 40a32177cc5b64a49a51ea9c77062bfdc77da75d SHA1 (patch-ad) = 64709ecb67e91d8677545a7af54fa205079a77fd SHA1 (patch-ae) = 9e2a79a0a7becdca8bcdb30da457ef7b25ccd22d SHA1 (patch-af) = 075d38b00064ef6a853e62268e07a0432b1a7710 SHA1 (patch-ag) = 5c825371254e0056c5b932901bacc5599dd514d2 +SHA1 (patch-src_TextField.c) = 440ce47a2ba5e8cc2b6a70a5f487da84307df8ab diff --git a/sysutils/xfm/patches/patch-ab b/sysutils/xfm/patches/patch-ab index 5e7bfb8173f..d0db1dba764 100644 --- a/sysutils/xfm/patches/patch-ab +++ b/sysutils/xfm/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2006/03/29 22:39:49 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2015/10/14 20:17:28 wiz Exp $ ---- src/Fm.h.orig Tue Aug 1 09:09:35 2000 -+++ src/Fm.h Tue Aug 1 09:16:04 2000 -@@ -19,10 +19,14 @@ +--- src/Fm.h.orig 2001-09-03 03:15:28.000000000 +0000 ++++ src/Fm.h +@@ -19,11 +19,15 @@ #include <malloc.h> #endif @@ -13,7 +13,8 @@ $NetBSD: patch-ab,v 1.2 2006/03/29 22:39:49 joerg Exp $ #pragma alloca #else #include <alloca.h> -+#endif #endif ++#endif #include <stdio.h> + #include <sys/types.h> /* just in case */ diff --git a/sysutils/xfm/patches/patch-src_TextField.c b/sysutils/xfm/patches/patch-src_TextField.c new file mode 100644 index 00000000000..8db9accfe34 --- /dev/null +++ b/sysutils/xfm/patches/patch-src_TextField.c @@ -0,0 +1,28 @@ +$NetBSD: patch-src_TextField.c,v 1.1 2015/10/14 20:17:28 wiz Exp $ + +--- src/TextField.c.orig 2000-04-04 15:05:36.000000000 +0000 ++++ src/TextField.c +@@ -705,11 +705,6 @@ TextFieldClassRec textFieldClassRec = { + { /* simple fields */ + /* change_sensitive */ XtInheritChangeSensitive + }, +-#ifdef XAW3D +- { /* ThreeD class fields */ +- /* shadowdraw */ (void(*)())TfwDrawShadows +- }, +-#endif + { /* textField fields */ + /* empty */ 0 + } +@@ -2315,11 +2310,6 @@ ReDisplay(tfw,False); + if (TF.label) + DrawLabel(tfw,False); + +-#ifdef XAW3D +- (*((TextFieldWidgetClass)(XtClass((Widget)tfw)))->threeD_class.shadowdraw)(w,ev,reg, +- (Boolean)(! (tfw->core.sensitive && !TF.readonly))); +-#endif +- + } + + #ifdef XAW3D diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile index 38c3e3fa42d..0858b628f1f 100644 --- a/time/emiclock/Makefile +++ b/time/emiclock/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2013/01/15 16:21:35 morr Exp $ +# $NetBSD: Makefile,v 1.27 2015/10/14 20:17:28 wiz Exp $ # DISTNAME= emiclock-2.0.2 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= x11 time MASTER_SITES= ${MASTER_SITE_FREEBSD} diff --git a/time/xalarm/Makefile b/time/xalarm/Makefile index 08cd6c43c2b..8808e3b3605 100644 --- a/time/xalarm/Makefile +++ b/time/xalarm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2013/04/06 13:01:28 rodent Exp $ +# $NetBSD: Makefile,v 1.18 2015/10/14 20:17:28 wiz Exp $ DISTNAME= xalarm-3.06 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= time MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} @@ -17,6 +17,14 @@ FORTUNE= "Sorry, xfortune is unavailable - no fortune!" YOW= "Sorry, xyow is unavailable - no yow!" KILL= /bin/kill # should this be in bsd.pkg.mk ? +# does not directly support Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw + .include "../../mk/bsd.prefs.mk" .if defined(XALARM_USE_YOW) diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile index b6610452e96..5ee7e7ca508 100644 --- a/x11/kterm/Makefile +++ b/x11/kterm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.59 2013/01/15 16:21:35 morr Exp $ +# $NetBSD: Makefile,v 1.60 2015/10/14 20:17:28 wiz Exp $ DISTNAME= kterm-6.2.0 -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} diff --git a/x11/mowitz/Makefile b/x11/mowitz/Makefile index 32e2536fc38..590ffd219a5 100644 --- a/x11/mowitz/Makefile +++ b/x11/mowitz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2012/10/29 05:06:40 asau Exp $ +# $NetBSD: Makefile,v 1.20 2015/10/14 20:17:28 wiz Exp $ DISTNAME= Mowitz-0.3.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://siag.nu/pub/mowitz/ diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index 99145f4fe6d..3148fd9095a 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2013/01/15 16:21:36 morr Exp $ -# +# $NetBSD: Makefile,v 1.24 2015/10/14 20:17:28 wiz Exp $ DISTNAME= xcolorsel-1.1a-src PKGNAME= xcolorsel-1.1a -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} @@ -21,6 +20,13 @@ SUBST_SED.xcolorsel+= -e "s,@X11BASE@,${X11BASE},g" #this requires Xaw3d XAW_TYPE= 3d +# does not directly support Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xcolorsel/distinfo b/x11/xcolorsel/distinfo index d84cc95d323..a6fd5d81240 100644 --- a/x11/xcolorsel/distinfo +++ b/x11/xcolorsel/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.6 2013/01/15 16:21:36 morr Exp $ +$NetBSD: distinfo,v 1.7 2015/10/14 20:17:28 wiz Exp $ SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c RMD160 (xcolorsel-1.1a-src.tar.gz) = 5ae81689bcdc23828778eb5d46f08b7c30b1566c Size (xcolorsel-1.1a-src.tar.gz) = 67359 bytes SHA1 (patch-Imakefile) = 39e087e56f752930a96bd8ae4e9a39bf4a0b0806 -SHA1 (patch-RgbText.c) = ea09371fd88c4a1068f069926097743fd25cfbdc +SHA1 (patch-RgbSink.c) = d39b2498c8015c7451dbc46727b14dc1293b7944 +SHA1 (patch-RgbSrc.c) = c3de7ce86a9eeecd716d0ca95574376a58b22c68 +SHA1 (patch-RgbText.c) = 060873da624cd93069ffcfaca08193b054116557 SHA1 (patch-xcolorsel.c) = a6667fff4372d242cc13c44d2a2fdf53ad5b065d diff --git a/x11/xcolorsel/patches/patch-RgbSink.c b/x11/xcolorsel/patches/patch-RgbSink.c new file mode 100644 index 00000000000..81e227560cc --- /dev/null +++ b/x11/xcolorsel/patches/patch-RgbSink.c @@ -0,0 +1,13 @@ +$NetBSD: patch-RgbSink.c,v 1.1 2015/10/14 20:17:28 wiz Exp $ + +--- RgbSink.c.orig 1994-12-13 21:32:37.000000000 +0000 ++++ RgbSink.c +@@ -147,7 +147,7 @@ RgbSinkClassRec rgbSinkClassRec = { + /* extension */ NULL + }, + { /* text_sink fields */ +- /* DisplayText */ (_XawSinkVoidFunc) mydisp, ++ /* DisplayText */ mydisp, + /* InsertCursor */ XtInheritInsertCursor, + /* ClearToBackground */ XtInheritClearToBackground, + /* FindPosition */ XtInheritFindPosition, diff --git a/x11/xcolorsel/patches/patch-RgbSrc.c b/x11/xcolorsel/patches/patch-RgbSrc.c new file mode 100644 index 00000000000..c9920d1411b --- /dev/null +++ b/x11/xcolorsel/patches/patch-RgbSrc.c @@ -0,0 +1,13 @@ +$NetBSD: patch-RgbSrc.c,v 1.1 2015/10/14 20:17:28 wiz Exp $ + +--- RgbSrc.c.orig 1994-11-13 22:14:31.000000000 +0000 ++++ RgbSrc.c +@@ -134,7 +134,7 @@ RgbSrcClassRec rgbSrcClassRec = { + { /* text_src fields */ + /* Read */ XtInheritRead, + /* Replace */ XtInheritReplace, +- /* Scan */ (_XawTextPositionFunc)myscan, ++ /* Scan */ myscan, + /* Search */ XtInheritSearch, + /* SetSelection */ XtInheritSetSelection, + /* ConvertSelection */ XtInheritConvertSelection, diff --git a/x11/xcolorsel/patches/patch-RgbText.c b/x11/xcolorsel/patches/patch-RgbText.c index 4f040f1e7ee..922563cdd8c 100644 --- a/x11/xcolorsel/patches/patch-RgbText.c +++ b/x11/xcolorsel/patches/patch-RgbText.c @@ -1,4 +1,4 @@ -$NetBSD: patch-RgbText.c,v 1.1 2013/01/15 16:21:36 morr Exp $ +$NetBSD: patch-RgbText.c,v 1.2 2015/10/14 20:17:28 wiz Exp $ --- RgbText.c.orig 1994-12-13 22:13:27.000000000 +0000 +++ RgbText.c @@ -15,7 +15,7 @@ $NetBSD: patch-RgbText.c,v 1.1 2013/01/15 16:21:36 morr Exp $ XtRString, (XtPointer) "30" }, { XtNfile, XtCFile, XtRString, sizeof(String), offset(file), - XtRString, (XtPointer) "/usr/lib/X11/rgb.txt" }, -+ XtRString, (XtPointer) "@X11BASE@/X11/rgb.txt" }, ++ XtRString, (XtPointer) "/usr/pkg/X11/rgb.txt" }, { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width), XtRString, (XtPointer) "3" }, { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red), diff --git a/x11/xdm3d/Makefile b/x11/xdm3d/Makefile index 67f37ccd6fe..4b2a5c8277a 100644 --- a/x11/xdm3d/Makefile +++ b/x11/xdm3d/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2013/06/16 17:32:06 dholland Exp $ +# $NetBSD: Makefile,v 1.29 2015/10/14 20:17:28 wiz Exp $ DISTNAME= xdm3d-1.0 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 23637f5f1ca..764ab5dc8e7 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.104 2015/08/30 14:32:37 wiz Exp $ +# $NetBSD: Makefile,v 1.105 2015/10/14 20:17:28 wiz Exp $ DISTNAME= xterm-320 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ http://www.sfr-fresh.com/unix/misc/ diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile index 569495904ca..35737684b34 100644 --- a/x11/xvkbd/Makefile +++ b/x11/xvkbd/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2013/10/17 16:44:40 shattered Exp $ +# $NetBSD: Makefile,v 1.9 2015/10/14 20:17:28 wiz Exp $ # DISTNAME= xvkbd-3.5 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://homepage3.nifty.com/tsato/xvkbd/ |