From owner-svn-ports-head@FreeBSD.ORG Tue Jul 29 16:09:49 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 58014EDF; Tue, 29 Jul 2014 16:09:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 419972212; Tue, 29 Jul 2014 16:09:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6TG9nmi069160; Tue, 29 Jul 2014 16:09:49 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6TG9gOe069111; Tue, 29 Jul 2014 16:09:42 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407291609.s6TG9gOe069111@svn.freebsd.org> From: Adam Weinberger Date: Tue, 29 Jul 2014 16:09:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363352 - in head/x11: bricons bricons/files dgs/files gmessage/files gnome-applets/files gtk-theme-switch gtk-theme-switch/files imwheel imwheel/files kb2mb2/files libdnd libdnd/files ... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jul 2014 16:09:49 -0000 Author: adamw Date: Tue Jul 29 16:09:41 2014 New Revision: 363352 URL: http://svnweb.freebsd.org/changeset/ports/363352 QAT: https://qat.redports.org/buildarchive/r363352/ Log: Rename x11/ patch-xy patches to reflect the files they modify. Added: head/x11/bricons/files/patch-Imakefile - copied unchanged from r363316, head/x11/bricons/files/patch-aa head/x11/bricons/files/patch-Xbricons - copied unchanged from r363316, head/x11/bricons/files/patch-ac head/x11/dgs/files/patch-configure - copied unchanged from r363316, head/x11/dgs/files/patch-ah head/x11/gmessage/files/patch-Makefile - copied unchanged from r363316, head/x11/gmessage/files/patch-aa head/x11/gnome-applets/files/patch-configure - copied unchanged from r363316, head/x11/gnome-applets/files/patch-aa head/x11/gtk-theme-switch/files/patch-Makefile - copied unchanged from r363316, head/x11/gtk-theme-switch/files/patch-aa head/x11/imwheel/files/patch-imwheel.1 - copied unchanged from r363316, head/x11/imwheel/files/patch-ae head/x11/imwheel/files/patch-imwheelrc - copied unchanged from r363316, head/x11/imwheel/files/patch-af head/x11/kb2mb2/files/patch-Imakefile - copied unchanged from r363316, head/x11/kb2mb2/files/patch-aa head/x11/kb2mb2/files/patch-kb2mb2.c - copied unchanged from r363316, head/x11/kb2mb2/files/patch-ab head/x11/libdnd/files/patch-DragAndDrop.c - copied unchanged from r363316, head/x11/libdnd/files/patch-aa head/x11/libdnd/files/patch-Makefile.in - copied unchanged from r363316, head/x11/libdnd/files/patch-ab head/x11/libsx/files/patch-freq-dirlist.c - copied unchanged from r363316, head/x11/libsx/files/patch-ab head/x11/libsx/files/patch-libsx_defs - copied unchanged from r363316, head/x11/libsx/files/patch-aa head/x11/p5-X11-IdleTime/files/patch-IdleTime.pm - copied unchanged from r363316, head/x11/p5-X11-IdleTime/files/patch-aa head/x11/props/files/patch-l10n_props.h - copied unchanged from r363316, head/x11/props/files/patch-aa head/x11/props/files/patch-l10n_read.c - copied unchanged from r363316, head/x11/props/files/patch-ab head/x11/props/files/patch-props.c - copied unchanged from r363316, head/x11/props/files/patch-ac head/x11/rxvt-devel/files/patch-Makefile.in - copied unchanged from r363316, head/x11/rxvt-devel/files/patch-aa head/x11/rxvt-devel/files/patch-autoconf__config.h.in - copied unchanged from r363316, head/x11/rxvt-devel/files/patch-ad head/x11/rxvt-devel/files/patch-doc__Makefile.in - copied unchanged from r363316, head/x11/rxvt-devel/files/patch-ac head/x11/rxvt-devel/files/patch-src__command.c - copied unchanged from r363316, head/x11/rxvt-devel/files/patch-src::command.c head/x11/rxvt-devel/files/patch-src__init.c - copied unchanged from r363316, head/x11/rxvt-devel/files/patch-src::init.c head/x11/rxvt-devel/files/patch-src__rxvt.h - copied unchanged from r363316, head/x11/rxvt-devel/files/patch-src::rxvt.h head/x11/rxvt-devel/files/patch-src__screen.c - copied unchanged from r363316, head/x11/rxvt-devel/files/patch-src-screen.c head/x11/rxvt/files/patch-Makefile.in - copied unchanged from r363316, head/x11/rxvt/files/patch-aa head/x11/rxvt/files/patch-autoconf__config.h.in - copied unchanged from r363316, head/x11/rxvt/files/patch-ac head/x11/rxvt/files/patch-doc__Makefile.in - copied unchanged from r363316, head/x11/rxvt/files/patch-ab head/x11/rxvt/files/patch-src__command.c - copied unchanged from r363316, head/x11/rxvt/files/patch-ad head/x11/rxvt/files/patch-src__grkelot.c - copied unchanged from r363316, head/x11/rxvt/files/patch-grkelot.c head/x11/rxvt/files/patch-src__logging.c - copied unchanged from r363316, head/x11/rxvt/files/patch-logging.c head/x11/rxvt/files/patch-src__screen.c - copied unchanged from r363316, head/x11/rxvt/files/patch-screen.c head/x11/sxpc/files/patch-sxpc.c - copied unchanged from r363316, head/x11/sxpc/files/patch-aa head/x11/tycoon/files/patch-fclock__Imakefile - copied unchanged from r363316, head/x11/tycoon/files/patch-ae head/x11/tycoon/files/patch-tycoon__Imakefile - copied unchanged from r363316, head/x11/tycoon/files/patch-ab head/x11/tycoon/files/patch-tyman__Imakefile - copied unchanged from r363316, head/x11/tycoon/files/patch-af head/x11/tycoon/files/patch-xbackdrop__Imakefile - copied unchanged from r363316, head/x11/tycoon/files/patch-ac head/x11/tycoon/files/patch-xchooser__Imakefile - copied unchanged from r363316, head/x11/tycoon/files/patch-ad head/x11/tycoon/files/patch-xprompt__Imakefile - copied unchanged from r363316, head/x11/tycoon/files/patch-aa head/x11/wmmatrix/files/patch-Makefile - copied unchanged from r363316, head/x11/wmmatrix/files/patch-aa head/x11/xantfarm/files/patch-xantfarm.c - copied unchanged from r363316, head/x11/xantfarm/files/patch-aa head/x11/xautolock/files/patch-include__options.h - copied unchanged from r363316, head/x11/xautolock/files/patch-ab head/x11/xautolock/files/patch-src__engine.c - copied unchanged from r363316, head/x11/xautolock/files/patch-aa head/x11/xautolock/files/patch-src__message.c - copied unchanged from r363316, head/x11/xautolock/files/patch-ac head/x11/xbanner/files/patch-Makefile - copied unchanged from r363316, head/x11/xbanner/files/patch-aa head/x11/xbanner/files/patch-headers - copied unchanged from r363316, head/x11/xbanner/files/patch-ad head/x11/xbanner/files/patch-samples__XBanner.ad - copied unchanged from r363316, head/x11/xbanner/files/patch-ae head/x11/xbanner/files/patch-xb_check.c - copied unchanged from r363316, head/x11/xbanner/files/patch-ab head/x11/xbanner/files/patch-xres.c - copied unchanged from r363316, head/x11/xbanner/files/patch-ac head/x11/xcolors/files/patch-Imakefile - copied unchanged from r363316, head/x11/xcolors/files/patch-aa head/x11/xcut/files/patch-Imakefile - copied unchanged from r363316, head/x11/xcut/files/patch-aa head/x11/xfishtank/files/patch-Imakefile - copied unchanged from r363316, head/x11/xfishtank/files/patch-ab head/x11/xfishtank/files/patch-xfish.c - copied unchanged from r363316, head/x11/xfishtank/files/patch-aa head/x11/xgrab/files/patch-Imakefile - copied unchanged from r363316, head/x11/xgrab/files/patch-aa head/x11/xgrab/files/patch-xgrabsc.c - copied unchanged from r363316, head/x11/xgrab/files/patch-ab head/x11/xkbctrl/files/patch-Imakefile - copied unchanged from r363316, head/x11/xkbctrl/files/patch-aa head/x11/xkbctrl/files/patch-xkbctrl.c - copied unchanged from r363316, head/x11/xkbctrl/files/patch-ab head/x11/xkeywrap/files/patch-Makefile - copied unchanged from r363316, head/x11/xkeywrap/files/patch-aa head/x11/xlockmore/files/patch-xlock-XLock.ad - copied unchanged from r363316, head/x11/xlockmore/files/patch-aa head/x11/xmascot/files/patch-config.tmpl - copied unchanged from r363316, head/x11/xmascot/files/patch-aa head/x11/xmx/files/patch-Makefile - copied unchanged from r363316, head/x11/xmx/files/patch-aa head/x11/xskyroot/files/patch-Imakefile - copied unchanged from r363316, head/x11/xskyroot/files/patch-ac head/x11/xskyroot/files/patch-astro.c - copied unchanged from r363316, head/x11/xskyroot/files/patch-ab head/x11/xskyroot/files/patch-xsyroot.c - copied unchanged from r363316, head/x11/xskyroot/files/patch-aa head/x11/xtacy/files/patch-Imakefile - copied unchanged from r363316, head/x11/xtacy/files/patch-aa head/x11/xvkbd/files/patch-Imakefile - copied unchanged from r363316, head/x11/xvkbd/files/patch-aa head/x11/xwatchwin/files/patch-xwatchwin.c - copied unchanged from r363316, head/x11/xwatchwin/files/patch-aa head/x11/xwatchwin/files/patch-xwatchwin.man - copied unchanged from r363316, head/x11/xwatchwin/files/patch-ab head/x11/xzoom/files/patch-Imakefile - copied unchanged from r363316, head/x11/xzoom/files/patch-aa head/x11/xzoom/files/patch-scale.h - copied unchanged from r363316, head/x11/xzoom/files/patch-ab head/x11/xzoom/files/patch-xzoom.c - copied unchanged from r363316, head/x11/xzoom/files/patch-ac head/x11/xzoom/files/patch-xzoom.man - copied unchanged from r363316, head/x11/xzoom/files/patch-ad Deleted: head/x11/bricons/files/patch-aa head/x11/bricons/files/patch-ac head/x11/dgs/files/patch-ah head/x11/gmessage/files/patch-aa head/x11/gnome-applets/files/patch-aa head/x11/gtk-theme-switch/files/patch-aa head/x11/imwheel/files/patch-ae head/x11/imwheel/files/patch-af head/x11/kb2mb2/files/patch-aa head/x11/kb2mb2/files/patch-ab head/x11/libdnd/files/patch-aa head/x11/libdnd/files/patch-ab head/x11/libsx/files/patch-aa head/x11/libsx/files/patch-ab head/x11/p5-X11-IdleTime/files/patch-aa head/x11/props/files/patch-aa head/x11/props/files/patch-ab head/x11/props/files/patch-ac head/x11/rxvt-devel/files/patch-aa head/x11/rxvt-devel/files/patch-ac head/x11/rxvt-devel/files/patch-ad head/x11/rxvt-devel/files/patch-src-screen.c head/x11/rxvt-devel/files/patch-src::command.c head/x11/rxvt-devel/files/patch-src::init.c head/x11/rxvt-devel/files/patch-src::rxvt.h head/x11/rxvt/files/patch-aa head/x11/rxvt/files/patch-ab head/x11/rxvt/files/patch-ac head/x11/rxvt/files/patch-ad head/x11/rxvt/files/patch-grkelot.c head/x11/rxvt/files/patch-logging.c head/x11/rxvt/files/patch-screen.c head/x11/sxpc/files/patch-aa head/x11/tycoon/files/patch-aa head/x11/tycoon/files/patch-ab head/x11/tycoon/files/patch-ac head/x11/tycoon/files/patch-ad head/x11/tycoon/files/patch-ae head/x11/tycoon/files/patch-af head/x11/wmmatrix/files/patch-aa head/x11/xantfarm/files/patch-aa head/x11/xautolock/files/patch-aa head/x11/xautolock/files/patch-ab head/x11/xautolock/files/patch-ac head/x11/xbanner/files/patch-aa head/x11/xbanner/files/patch-ab head/x11/xbanner/files/patch-ac head/x11/xbanner/files/patch-ad head/x11/xbanner/files/patch-ae head/x11/xcolors/files/patch-aa head/x11/xcut/files/patch-aa head/x11/xfishtank/files/patch-aa head/x11/xfishtank/files/patch-ab head/x11/xgrab/files/patch-aa head/x11/xgrab/files/patch-ab head/x11/xkbctrl/files/patch-aa head/x11/xkbctrl/files/patch-ab head/x11/xkeywrap/files/patch-aa head/x11/xlockmore/files/patch-aa head/x11/xmascot/files/patch-aa head/x11/xmx/files/patch-aa head/x11/xskyroot/files/patch-aa head/x11/xskyroot/files/patch-ab head/x11/xskyroot/files/patch-ac head/x11/xtacy/files/patch-aa head/x11/xvkbd/files/patch-aa head/x11/xwatchwin/files/patch-aa head/x11/xwatchwin/files/patch-ab head/x11/xzoom/files/patch-aa head/x11/xzoom/files/patch-ab head/x11/xzoom/files/patch-ac head/x11/xzoom/files/patch-ad Modified: head/x11/bricons/Makefile head/x11/gtk-theme-switch/Makefile head/x11/imwheel/Makefile head/x11/libdnd/Makefile head/x11/libsx/Makefile head/x11/xautolock/Makefile head/x11/xcut/Makefile head/x11/xgrab/Makefile head/x11/xmx/Makefile head/x11/xskyroot/Makefile head/x11/xwatchwin/Makefile head/x11/xzoom/Makefile Modified: head/x11/bricons/Makefile ============================================================================== --- head/x11/bricons/Makefile Tue Jul 29 16:01:25 2014 (r363351) +++ head/x11/bricons/Makefile Tue Jul 29 16:09:41 2014 (r363352) @@ -7,14 +7,13 @@ DISTVERSIONPREFIX= athena- PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= XCONTRIB/../R5contrib -EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Quick start up utility for applications on an X display WRKSRC= ${WRKDIR}/${PORTNAME} -USES= imake perl5 +USES= imake perl5 tar:Z USE_PERL5= build USE_XORG= xaw Copied: head/x11/bricons/files/patch-Imakefile (from r363316, head/x11/bricons/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/bricons/files/patch-Imakefile Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/bricons/files/patch-aa) @@ -0,0 +1,49 @@ +*** Imakefile.orig Thu Jan 21 21:27:31 1993 +--- Imakefile Sat Aug 3 14:30:53 1996 +*************** +*** 7,28 **** + /**/# Here's what to change to customize the installation... + /**/# Where do you want this stuff (if the defaults aren't okay)? + +! BINDIR = /home/cur/bri/bin/mbins/${M}bin +! LIBDIR = /home/cur/bri/lib +! MANDIR = /home/cur/bri/Man + + /**/# Where is the Xpm header and library files + /**/# This program needs the Xpm libraries written by Arnaud Le Hors. + /**/# it can be obtained by anonymous ftp to: export.lcs.mit.edu + /**/# and from many other sites. + +! XPM_DIR = /home/cur/bri/Xstuff/Progs/bricons/xpm + XPM_INCLUDE_DIR = $(XPM_DIR) +! XPM_LIB_DIR = $(LIBDIR) + + /**/# This is -g for debugging or -O for optimization (or nothing). + +! CDEBUGFLAGS = -g + + /**/# Nothing to change below here + +--- 7,28 ---- + /**/# Here's what to change to customize the installation... + /**/# Where do you want this stuff (if the defaults aren't okay)? + +! XCOMM BINDIR = /home/cur/bri/bin/mbins/${M}bin +! XCOMM LIBDIR = /home/cur/bri/lib +! XCOMM MANDIR = /home/cur/bri/Man + + /**/# Where is the Xpm header and library files + /**/# This program needs the Xpm libraries written by Arnaud Le Hors. + /**/# it can be obtained by anonymous ftp to: export.lcs.mit.edu + /**/# and from many other sites. + +! XPM_DIR = $(INCROOT)/X11 + XPM_INCLUDE_DIR = $(XPM_DIR) +! XPM_LIB_DIR = $(LIBDIR) + + /**/# This is -g for debugging or -O for optimization (or nothing). + +! XCOMM CDEBUGFLAGS = -g + + /**/# Nothing to change below here + Copied: head/x11/bricons/files/patch-Xbricons (from r363316, head/x11/bricons/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/bricons/files/patch-Xbricons Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/bricons/files/patch-ac) @@ -0,0 +1,22 @@ +*** Xbricons.orig Thu Jan 21 21:27:32 1993 +--- Xbricons Sat Aug 3 15:14:56 1996 +*************** +*** 1,9 **** + ! Application resources file for bricons program + ! B.R. Ingram 9th Sept 1991 + *no_of_cols: 16 +! *icon_file: /home/cur/bri/.briconsrc +! *help_file: /home/cur/bri/Man/bricons.man +! .bitmapFilePath: /usr/local/include/X11/bitmaps:/s/bri/Pics + *borderColor: yellow + *popup_layout*.borderColor: black + *background: #ffd28e +--- 1,8 ---- + ! Application resources file for bricons program + ! B.R. Ingram 9th Sept 1991 + *no_of_cols: 16 +! *help_file: bricons +! *.bitmapFilePath: %%PREFIX%%/include/X11/bitmaps + *borderColor: yellow + *popup_layout*.borderColor: black + *background: #ffd28e Copied: head/x11/dgs/files/patch-configure (from r363316, head/x11/dgs/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/dgs/files/patch-configure Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/dgs/files/patch-ah) @@ -0,0 +1,13 @@ +--- configure.orig Wed Oct 20 15:57:45 1999 ++++ configure Wed Oct 20 15:58:34 1999 +@@ -3499,10 +3500,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. Copied: head/x11/gmessage/files/patch-Makefile (from r363316, head/x11/gmessage/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/gmessage/files/patch-Makefile Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/gmessage/files/patch-aa) @@ -0,0 +1,21 @@ +--- Makefile.orig 1999-05-27 18:58:06.000000000 +0800 ++++ Makefile 2014-01-10 14:20:30.000000000 +0800 +@@ -1,6 +1,6 @@ +-CC = gcc +-CFLAGS = `gtk-config --cflags` +-LDLIBS = `gtk-config --libs` ++CC ?= gcc ++CFLAGS += `$(GTK_CONFIG) --cflags` ++LDLIBS = `$(GTK_CONFIG) --libs` + + all: gmessage + +@@ -8,7 +8,7 @@ gmessage: gmessage.c + $(CC) $(CFLAGS) gmessage.c -o gmessage $(OBJS) $(LDLIBS) + + install: gmessage +- cp ./gmessage /usr/local/bin ++ ${BSD_INSTALL_PROGRAM} gmessage $(DESTDIR)${PREFIX}/bin + + clean: + $(RM) *.o core gmessage Copied: head/x11/gnome-applets/files/patch-configure (from r363316, head/x11/gnome-applets/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/gnome-applets/files/patch-configure Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/gnome-applets/files/patch-aa) @@ -0,0 +1,95 @@ +--- configure.orig 2008-12-20 14:46:11.000000000 -0500 ++++ configure 2008-12-20 14:54:57.000000000 -0500 +@@ -17150,7 +17150,7 @@ _ACEOF + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${datadir}/locale"` ++ ac_define_dir=`eval echo "${datadir}/locale"` + ac_define_dir=`eval echo $ac_define_dir` + GNOMELOCALEDIR="$ac_define_dir" + +@@ -19097,8 +19097,8 @@ fi + + ;; + # list of supported OS cores that do not use libapm +- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu) +- if -n "${OS_SYS}" ; then ++ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu) ++ if test -n "${OS_SYS}" ; then + ACPIINC="-I${OS_SYS}" + else + ACPIINC="-I/usr/src/sys" +@@ -20023,6 +20023,9 @@ if test x$disable_cpufreq = xno; then + *linux*) + build_cpufreq_applet=yes + ;; ++ i386-*-freebsd*|amd64-*-freebsd*) ++ build_cpufreq_applet=yes ++ ;; + *) + { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5 + echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;} +@@ -20591,7 +20594,7 @@ builderdir="${pkgdatadir}/builder" + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${iconsdir}"` ++ ac_define_dir=`eval echo "${iconsdir}"` + ac_define_dir=`eval echo $ac_define_dir` + GNOME_ICONDIR="$ac_define_dir" + +@@ -20604,7 +20607,7 @@ _ACEOF + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${pixmapsdir}"` ++ ac_define_dir=`eval echo "${pixmapsdir}"` + ac_define_dir=`eval echo $ac_define_dir` + GNOME_PIXMAPSDIR="$ac_define_dir" + +@@ -20617,7 +20620,7 @@ _ACEOF + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${builderdir}"` ++ ac_define_dir=`eval echo "${builderdir}"` + ac_define_dir=`eval echo $ac_define_dir` + GTK_BUILDERDIR="$ac_define_dir" + +@@ -20630,7 +20633,7 @@ _ACEOF + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${datadir}"` ++ ac_define_dir=`eval echo "${datadir}"` + ac_define_dir=`eval echo $ac_define_dir` + DATADIR="$ac_define_dir" + +@@ -20643,7 +20646,7 @@ _ACEOF + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${sysconfdir}"` ++ ac_define_dir=`eval echo "${sysconfdir}"` + ac_define_dir=`eval echo $ac_define_dir` + SYSCONFDIR="$ac_define_dir" + +@@ -20656,7 +20659,7 @@ _ACEOF + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${libdir}"` ++ ac_define_dir=`eval echo "${libdir}"` + ac_define_dir=`eval echo $ac_define_dir` + LIBDIR="$ac_define_dir" + +@@ -20669,7 +20672,7 @@ _ACEOF + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"$prefix"` ++ ac_define_dir=`eval echo "$prefix"` + ac_define_dir=`eval echo $ac_define_dir` + PREFIX="$ac_define_dir" + Modified: head/x11/gtk-theme-switch/Makefile ============================================================================== --- head/x11/gtk-theme-switch/Makefile Tue Jul 29 16:01:25 2014 (r363351) +++ head/x11/gtk-theme-switch/Makefile Tue Jul 29 16:09:41 2014 (r363352) @@ -16,12 +16,8 @@ USES= gmake OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR}/README -.endif .include Copied: head/x11/gtk-theme-switch/files/patch-Makefile (from r363316, head/x11/gtk-theme-switch/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/gtk-theme-switch/files/patch-Makefile Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/gtk-theme-switch/files/patch-aa) @@ -0,0 +1,31 @@ +--- Makefile.orig 2003-06-11 14:02:59.000000000 +0800 ++++ Makefile 2014-01-10 14:11:54.000000000 +0800 +@@ -1,7 +1,8 @@ +-GCC = cc +-PREFIX=/usr/local +-CFLAGS = -O2 -Wall $(shell gtk-config --cflags) +-LIBS = $(shell gtk-config --libs) ++GCC = ${CC} ++PREFIX?=/usr/local ++GTK_CONFIG?=gtk-config ++CFLAGS += -Wall $(shell $(GTK_CONFIG) --cflags) ++LIBS = $(shell $(GTK_CONFIG) --libs) + VERSION = 1.0.1 + all: switch + +@@ -12,11 +13,10 @@ clean: + -rm -f switch *~ + + install: all +- strip switch +- mkdir -p ${PREFIX}/bin +- mkdir -p ${PREFIX}/man +- install -c switch ${PREFIX}/bin +- install -c switch.1 ${PREFIX}/man ++ mkdir -p $(DESTDIR)${PREFIX}/bin ++ mkdir -p $(DESTDIR)${PREFIX}/man/man1 ++ $(BSD_INSTALL_PROGRAM) switch $(DESTDIR)${PREFIX}/bin/gtk-theme-switch ++ $(BSD_INSTALL_MAN) switch.1 $(DESTDIR)${PREFIX}/man/man1/gtk-theme-switch.1 + + dist: clean + rm -rf /tmp/gtk-theme-switch-$(VERSION) Modified: head/x11/imwheel/Makefile ============================================================================== --- head/x11/imwheel/Makefile Tue Jul 29 16:01:25 2014 (r363351) +++ head/x11/imwheel/Makefile Tue Jul 29 16:09:41 2014 (r363352) @@ -20,17 +20,13 @@ CONFIGURE_ARGS= --disable-gpm OPTIONS_DEFINE= DOCS -.include - post-patch: .for i in imwheel.1 util.c @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i} .endfor post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/EMACS ${STAGEDIR}${DOCSDIR} -.endif .include Copied: head/x11/imwheel/files/patch-imwheel.1 (from r363316, head/x11/imwheel/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/imwheel/files/patch-imwheel.1 Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/imwheel/files/patch-ae) @@ -0,0 +1,21 @@ +--- imwheel.1.orig Sun Nov 7 08:47:14 2004 ++++ imwheel.1 Sun Nov 7 08:49:03 2004 +@@ -329,7 +329,7 @@ + .fi + .RE + .SH "IMWHEELRC" +-IMWheel uses, optionally, two configuration files. One called /etc/X11/imwheel/imwheelrc, ++IMWheel uses, optionally, two configuration files. One called %%PREFIX%%/etc/imwheelrc, + which is used for everybody. The other is $HOME/.imwheelrc, used only for one + user. One is supplied and should have been installed automatically in /etc/X11/imwheel/ + if not also in the installing users $HOME as well. All whitespace is ignored +@@ -671,7 +671,7 @@ + $HOME/.imwheelrc + The users configuration file. + +-/etc/X11/imwheel/imwheelrc ++%%PREFIX%%/etc/imwheelrc + The global location for the configuration + file, it is always loaded. Overided by + the users configuration file. + Copied: head/x11/imwheel/files/patch-imwheelrc (from r363316, head/x11/imwheel/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/imwheel/files/patch-imwheelrc Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/imwheel/files/patch-af) @@ -0,0 +1,34 @@ +--- imwheelrc.orig Wed Feb 23 15:14:20 2000 ++++ imwheelrc Wed Feb 23 15:25:12 2000 +@@ -34,6 +34,10 @@ + None, Down, KP_Subtract + None, Up, KP_Add + ++"^fxtv" ++None, Down, KP_Subtract ++None, Up, KP_Add ++ + "^Xman" + None, Down, F + Shift_L, Down, 3 +@@ -52,14 +56,14 @@ + None, Down, Shift_L|Page_Down + + "^rxvt" +-Alt_L, Up, Shift_L|Page_Up +-Alt_L, Down, Shift_L|Page_Down ++None, Up, Shift_L|Page_Up ++None, Down, Shift_L|Page_Down + + "^XTerm" +-Alt_L, Up, Shift_R|Page_Up +-Alt_L, Down, Shift_R|Page_Down +-Alt_L, Left, Control_L|A +-Alt_L, Right, Control_L|E ++None, Up, Shift_R|Page_Up ++None, Down, Shift_R|Page_Down ++None, Left, Control_L|A ++None, Right, Control_L|E + #Shift_L, Down, Shift_L|1 + + "^Netscape" Copied: head/x11/kb2mb2/files/patch-Imakefile (from r363316, head/x11/kb2mb2/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kb2mb2/files/patch-Imakefile Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/kb2mb2/files/patch-aa) @@ -0,0 +1,8 @@ +--- Imakefile.orig Wed Dec 24 10:45:38 1997 ++++ Imakefile Wed Nov 1 07:09:12 2000 +@@ -1,2 +1,4 @@ + LOCAL_LIBRARIES = $(XTESTLIB) $(XLIB) +-SimpleProgramTarget(kb2mb2) ++SRCS = kb2mb2.c ++OBJS = kb2mb2.o ++ComplexProgramTargetNoMan(kb2mb2) Copied: head/x11/kb2mb2/files/patch-kb2mb2.c (from r363316, head/x11/kb2mb2/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kb2mb2/files/patch-kb2mb2.c Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/kb2mb2/files/patch-ab) @@ -0,0 +1,24 @@ +--- kb2mb2.c.orig Thu Aug 23 00:07:17 2001 ++++ kb2mb2.c Thu Aug 23 00:17:02 2001 +@@ -165,7 +165,9 @@ + if (verbose) { + fprintf(stderr, "Pressed Key %x\n", input_keysym); + } +- XTestFakeButtonEvent(d, Button2, True, CurrentTime); ++ if (input_keycode == keycode) { ++ XTestFakeButtonEvent(d, Button2, True, CurrentTime); ++ } + break; + case KeyRelease: + input_keycode = ev.xkey.keycode; +@@ -174,7 +176,9 @@ + if (verbose) { + fprintf(stderr, "Released Key %x\n", input_keysym); + } +- XTestFakeButtonEvent(d, Button2, False, CurrentTime); ++ if (input_keycode == keycode) { ++ XTestFakeButtonEvent(d, Button2, False, CurrentTime); ++ } + break; + } + XFlush(d); Modified: head/x11/libdnd/Makefile ============================================================================== --- head/x11/libdnd/Makefile Tue Jul 29 16:01:25 2014 (r363351) +++ head/x11/libdnd/Makefile Tue Jul 29 16:09:41 2014 (r363352) @@ -7,11 +7,11 @@ PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= http://leb.net/offix/ DISTNAME= dnd.${PORTVERSION} -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Drag and drop library +USES= tar:tgz USE_XORG= x11 xmu ice xaw USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/DND/DNDlib @@ -22,12 +22,8 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS -.include - post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/libdnd + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKDIR}/DND/DNDdoc/* ${STAGEDIR}${DOCSDIR} -.endif .include Copied: head/x11/libdnd/files/patch-DragAndDrop.c (from r363316, head/x11/libdnd/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/libdnd/files/patch-DragAndDrop.c Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/libdnd/files/patch-aa) @@ -0,0 +1,57 @@ +--- DragAndDrop.c.orig Fri Nov 22 19:19:27 1996 ++++ DragAndDrop.c Sat Feb 26 22:03:14 2000 +@@ -22,7 +22,12 @@ + #include + #include + #include ++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) ++#include ++#define MAXINT INT_MAX ++#else + #include ++#endif + + /* Local variables */ + static Display *dpy; /* current display */ +@@ -81,23 +86,23 @@ + + static CursorData DndCursor[DndEND]={ + { 0,0,NULL,NULL,0,0,0 }, +- { grey_width, grey_height,grey_bits,grey_mask_bits, ++ { grey_width, grey_height,(char *)grey_bits,(char *)grey_mask_bits, + grey_x_hot,grey_y_hot}, +- { file_width,file_height,file_bits,file_mask_bits, ++ { file_width,file_height,(char *)file_bits,(char *)file_mask_bits, + file_x_hot,file_y_hot}, +- { files_width,files_height,files_bits,files_mask_bits, ++ { files_width,files_height,(char *)files_bits,(char *)files_mask_bits, + files_x_hot,files_y_hot}, +- { text_width,text_height,text_bits,text_mask_bits, ++ { text_width,text_height,(char *)text_bits,(char *)text_mask_bits, + text_x_hot,text_y_hot }, +- { dir_width,dir_height,dir_bits,dir_mask_bits, ++ { dir_width,dir_height,(char *)dir_bits,(char *)dir_mask_bits, + dir_x_hot,dir_y_hot }, +- { link_width,link_height,link_bits,link_mask_bits, ++ { link_width,link_height,(char *)link_bits,(char *)link_mask_bits, + link_x_hot,link_y_hot}, +- { app_width,app_height,app_bits,app_mask_bits, ++ { app_width,app_height,(char *)app_bits,(char *)app_mask_bits, + app_x_hot,app_y_hot }, +- { url_width,url_height,url_bits,url_mask_bits, ++ { url_width,url_height,(char *)url_bits,(char *)url_mask_bits, + url_x_hot,url_y_hot }, +- { mime_width,mime_height,mime_bits,mime_mask_bits, ++ { mime_width,mime_height,(char *)mime_bits,(char *)mime_mask_bits, + mime_x_hot,mime_y_hot } + }; + +@@ -394,7 +399,7 @@ + if(MainWidget) return MainWidget; + #ifdef DEBUG + fprintf(stderr,"Multiple shells.\n"); +-#endif DEBUG ++#endif + + while(XtParent(widget) && XtIsRealized(XtParent(widget))==True) + widget=XtParent(widget); Copied: head/x11/libdnd/files/patch-Makefile.in (from r363316, head/x11/libdnd/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/libdnd/files/patch-Makefile.in Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/libdnd/files/patch-ab) @@ -0,0 +1,68 @@ +--- Makefile.in.orig 1997-05-23 10:18:22.000000000 +0800 ++++ Makefile.in 2014-01-09 20:47:32.000000000 +0800 +@@ -13,6 +13,10 @@ LDFLAGS = @LDFLAGS@ + RANLIB = @RANLIB@ + + LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@ ++LIBS+= -Wl,-rpath,$(LOCALBASE)/lib ++SHLDFLAGS= -shared -x -soname $@ ++DNDLIB= libDnd.so.1 ++DNDPLUSLIB= libDnd++.so.1 + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +@@ -23,20 +27,30 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -c + CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -c + LINK = $(CC) $(LDFLAGS) -o $@ + ++SOCOMPILE= $(COMPILE) -fpic ++SOCXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -c -fpic ++ + default: all + +-all: libC libCpp dndtest ++all: libC libCpp dndtest libC-so libCpp-so + + install: libCpp libC +- install -d $(INC_DIR) +- install DragAndDrop.h DragAndDropTypes.h $(INC_DIR) +- install -d $(LIB_DIR) +- install libDnd.a libDnd++.a $(LIB_DIR) ++ install -d $(DESTDIR)$(INC_DIR) ++ install -c -m 644 DragAndDrop.h DragAndDropTypes.h $(DESTDIR)$(INC_DIR) ++ install -d $(DESTDIR)$(LIB_DIR) ++ install -c -m 644 libDnd.a libDnd++.a $(DESTDIR)$(LIB_DIR) ++ install -c $(DNDLIB) $(DNDPLUSLIB) $(DESTDIR)$(LIB_DIR) ++ cd $(DESTDIR)/$(LIB_DIR); ln -sf $(DNDLIB) libDnd.so ++ cd $(DESTDIR)/$(LIB_DIR); ln -sf $(DNDPLUSLIB) libDnd++.so + + libC: libDnd.a + + libCpp: libDnd++.a + ++libC-so: $(DNDLIB) ++ ++libCpp-so: $(DNDPLUSLIB) ++ + dndtest: dndtest.c libDnd.a + rm -f dndtest + $(COMPILE) dndtest.c +@@ -57,6 +71,16 @@ libDnd++.a: DragAndDrop.c + $(AR) cru libDnd++.a DragAndDrop.o + $(RANLIB) libDnd++.a + +-clean: +- rm -f *.o *.cxx *.a dndtest *~ *bak ++$(DNDLIB): DragAndDrop.c ++ rm -f DragAndDrop.so ++ $(SOCOMPILE) -o DragAndDrop.so DragAndDrop.c ++ $(LD) $(SHLDFLAGS) -o $(DNDLIB) DragAndDrop.so + ++$(DNDPLUSLIB): DragAndDrop.c ++ rm -f DragAndDrop.so DragAndDrop.cxx ++ ln -s DragAndDrop.c DragAndDrop.cxx ++ $(SOCXXCOMPILE) -o DragAndDrop.so DragAndDrop.cxx ++ $(LD) $(SHLDFLAGS) -o $(DNDPLUSLIB) DragAndDrop.so ++ ++clean: ++ rm -f *.o *.so *.cxx *.a dndtest *~ *bak Modified: head/x11/libsx/Makefile ============================================================================== --- head/x11/libsx/Makefile Tue Jul 29 16:01:25 2014 (r363351) +++ head/x11/libsx/Makefile Tue Jul 29 16:09:41 2014 (r363352) @@ -8,13 +8,13 @@ CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= libraries DISTNAME= ${PORTNAME} -EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Simple X11 library LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d +USES= tar:Z USE_XORG= x11 xaw xext xmu xt ALL_TARGET= src freq MAKE_JOBS_UNSAFE= yes Copied: head/x11/libsx/files/patch-freq-dirlist.c (from r363316, head/x11/libsx/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/libsx/files/patch-freq-dirlist.c Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/libsx/files/patch-ab) @@ -0,0 +1,10 @@ +--- freq/dirlist.c.orig Tue Feb 15 00:25:28 1994 ++++ freq/dirlist.c Wed Sep 3 14:11:59 1997 +@@ -25,6 +25,7 @@ + + #include + #include ++#include + #include + #include + #include Copied: head/x11/libsx/files/patch-libsx_defs (from r363316, head/x11/libsx/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/libsx/files/patch-libsx_defs Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/libsx/files/patch-aa) @@ -0,0 +1,38 @@ +--- libsx_defs.orig Mon Feb 28 10:04:26 1994 ++++ libsx_defs Sat Sep 26 20:55:27 1998 +@@ -9,7 +9,7 @@ + # you have it). Using cc seems to also work on the RS/6000 (though + # you may need the -xansi or -ansi flag). + #CC = gcc +-CC = cc ++#CC = cc + + + # Using gcc it's nice to be real strict and compile with -Wall, for +@@ -46,15 +46,15 @@ + # If you're daring, and you have OpenGL, try: + # CFLAGS = -g -D_POSIX_SOURCE -DOPENGL_SUPPORT + # +-CFLAGS = -g -D_POSIX_SOURCE ++CFLAGS += -O -D_POSIX_SOURCE -I$(LOCALBASE)/include + + # + # if you are on a System V (like the SGI) machine, just define RANLIB + # to be something innocuous like `echo'. On a Sun or other BSD machine + # (like a DECstation, AIX) we need to run the ranlib program. + # +-#RANLIB=ranlib +-RANLIB=echo ++RANLIB=ranlib ++#RANLIB=echo + + # + # libraries we need to link with... +@@ -83,5 +83,5 @@ + # + LIBSX = ../src/libsx.a + #LIBS = $(LIBSX) -lXaw -lXmu -lXt -lX11 +-LIBS = $(LIBSX) -lXaw -lXmu -lXt -lX11 +- ++LIBS = $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(LOCALBASE)/lib ++LIBS+= -Wl,-rpath,${LOCALBASE}/lib Copied: head/x11/p5-X11-IdleTime/files/patch-IdleTime.pm (from r363316, head/x11/p5-X11-IdleTime/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/p5-X11-IdleTime/files/patch-IdleTime.pm Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/p5-X11-IdleTime/files/patch-aa) @@ -0,0 +1,10 @@ +--- IdleTime.pm.orig Fri Feb 7 23:22:42 2003 ++++ IdleTime.pm Wed Jul 9 18:23:01 2003 +@@ -12,6 +12,7 @@ + C => 'DATA', + VERSION => '0.01', + NAME => 'X11::IdleTime', ++ INC => '-I/usr/X11R6/include/', + LIBS => '-L/usr/X11R6/lib/ -lX11 -lXext -lXss', + ); + Copied: head/x11/props/files/patch-l10n_props.h (from r363316, head/x11/props/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/props/files/patch-l10n_props.h Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/props/files/patch-aa) @@ -0,0 +1,12 @@ +--- l10n_props.h.orig Tue Nov 4 20:36:07 1997 ++++ l10n_props.h Tue Nov 4 20:36:31 1997 +@@ -13,6 +13,9 @@ + */ + #define LOCALE_NAME_LEN 20 + ++#ifndef LC_MESSAGES ++#define LC_MESSAGES 0 ++#endif + + typedef struct _l10n_config_list_item { + /* Copied: head/x11/props/files/patch-l10n_read.c (from r363316, head/x11/props/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/props/files/patch-l10n_read.c Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/props/files/patch-ab) @@ -0,0 +1,32 @@ +--- l10n_read.c.orig Fri Nov 7 17:21:25 1997 ++++ l10n_read.c Mon Oct 21 03:29:17 2002 +@@ -18,15 +18,17 @@ + #include "l10n_props.h" + + +-#define MAX_LINE_LENGTH 256 ++#define MAX_LINE_LENGTH 2560 + + #define NAME_SEPARATOR '=' + #define FIELD_SEPARATOR '|' + #define ITEM_SEPARATOR ';' + + ++#if !defined(__FreeBSD__) + extern char *malloc(); + extern char *calloc(); ++#endif + + + /* +@@ -72,8 +74,9 @@ + /* + * Find path for localization configuration files under + * $OPENWINHOME/share/locale//props ++ * $OPENWINHOME/lib/X11/locale//props + */ +- sprintf(fullpath, "%s/share/locale/%s/props/%s", ++ sprintf(fullpath, "%s/lib/X11/locale/%s/props/%s", + getenv("OPENWINHOME"), locale, file_name); + + if ((config_file = fopen(fullpath, "r")) == NULL) Copied: head/x11/props/files/patch-props.c (from r363316, head/x11/props/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/props/files/patch-props.c Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/props/files/patch-ac) @@ -0,0 +1,29 @@ +--- props.c.orig 1997-11-08 17:18:50.000000000 -0800 ++++ props.c 2013-09-17 23:33:43.311493251 -0700 +@@ -718,7 +718,7 @@ + int factory = !(int) xv_get(panel_item, PANEL_VALUE); + + if (factory == showing_factory) +- return; ++ return 0; + + if (factory) { + if (!saved_defaults[0]) { +@@ -752,7 +752,7 @@ + int width; + + if (panel_group[which_panel] == current_panel) +- return; ++ return 0; + + /* Show requested panel */ + xv_set(current_panel, XV_SHOW, FALSE, NULL); +@@ -816,7 +816,7 @@ + else + { + strcpy(localepath, openwin_dir); +- strcat(localepath, "/lib/locale/"); ++ strcat(localepath, "/lib/X11/locale/C/"); + bindtextdomain("props", localepath); + } + Copied: head/x11/rxvt-devel/files/patch-Makefile.in (from r363316, head/x11/rxvt-devel/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt-devel/files/patch-Makefile.in Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt-devel/files/patch-aa) @@ -0,0 +1,19 @@ +*** Makefile.in.orig Sat Aug 9 15:44:33 2003 +--- Makefile.in Sat Aug 9 15:44:39 2003 +*************** +*** 9,15 **** + first_rule: all + dummy: + +! subdirs = src doc rclock src/graphics src/test + allsubdirs = W11 $(subdirs) + + DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog +--- 9,15 ---- + first_rule: all + dummy: + +! subdirs = src doc #rclock src/graphics src/test + allsubdirs = W11 $(subdirs) + + DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog Copied: head/x11/rxvt-devel/files/patch-autoconf__config.h.in (from r363316, head/x11/rxvt-devel/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt-devel/files/patch-autoconf__config.h.in Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt-devel/files/patch-ad) @@ -0,0 +1,20 @@ +--- autoconf/config.h.in.orig Sun Oct 22 00:13:00 2000 ++++ autoconf/config.h.in Sun Oct 22 00:13:43 2000 +@@ -168,7 +168,7 @@ + #undef HAVE_UTMP_HOST + + /* Define location of utmp */ +-#undef RXVT_UTMP_FILE ++#define RXVT_UTMP_FILE "/var/run/utmp" + + /* Define in utmpx.h has struct utmpx */ + #undef HAVE_STRUCT_UTMPX +@@ -180,7 +180,7 @@ + #undef RXVT_UTMPX_FILE + + /* Define location of wtmp */ +-#undef RXVT_WTMP_FILE ++#define RXVT_WTMP_FILE "/var/log/wtmp" + + /* Define location of wtmpx */ + #undef RXVT_WTMPX_FILE Copied: head/x11/rxvt-devel/files/patch-doc__Makefile.in (from r363316, head/x11/rxvt-devel/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt-devel/files/patch-doc__Makefile.in Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt-devel/files/patch-ac) @@ -0,0 +1,12 @@ +--- doc/Makefile.in Sun Mar 12 00:26:26 2000 ++++ doc/Makefile.in.new Mon Mar 27 01:39:53 2000 +@@ -40,9 +40,6 @@ + + all: rxvt.1 + +-rxvt.1: rxvt.tbl Makefile +- @if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi +- + SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\ + -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\ + -e 's%@RXVT_DATE@%$(DATE)%g;'\ Copied: head/x11/rxvt-devel/files/patch-src__command.c (from r363316, head/x11/rxvt-devel/files/patch-src::command.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt-devel/files/patch-src__command.c Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt-devel/files/patch-src::command.c) @@ -0,0 +1,11 @@ +--- src/command.c.orig Thu Apr 5 03:52:39 2001 ++++ src/command.c Fri Jun 22 13:36:57 2001 +@@ -2878,7 +2878,7 @@ + unsigned char buf[256]; + + va_start(arg_ptr, fmt); +- vsprintf((char *)buf, fmt, arg_ptr); ++ vsnprintf((char *)buf, sizeof(buf), fmt, arg_ptr); + va_end(arg_ptr); + rxvt_tt_write(r, buf, (unsigned int)STRLEN(buf)); + } Copied: head/x11/rxvt-devel/files/patch-src__init.c (from r363316, head/x11/rxvt-devel/files/patch-src::init.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt-devel/files/patch-src__init.c Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt-devel/files/patch-src::init.c) @@ -0,0 +1,22 @@ +--- src/init.c.orig Wed Dec 4 03:21:17 2002 ++++ src/init.c Mon Oct 10 00:30:31 2005 +@@ -1531,6 +1531,9 @@ + # ifdef VEOL2 + tio->c_cc[VEOL2] = VDISABLE; + # endif ++# ifdef VERASE2 ++ tio->c_cc[VERASE2] = CERASE2; ++# endif + # ifdef VSWTC + tio->c_cc[VSWTC] = VDISABLE; + # endif +@@ -1650,6 +1653,9 @@ + FOO(VEOL, "VEOL"); + # ifdef VEOL2 + FOO(VEOL2, "VEOL2"); ++# endif ++# ifdef VERASE2 ++ FOO(VERASE2, "VERASE2"); + # endif + # ifdef VSWTC + FOO(VSWTC, "VSWTC"); Copied: head/x11/rxvt-devel/files/patch-src__rxvt.h (from r363316, head/x11/rxvt-devel/files/patch-src::rxvt.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt-devel/files/patch-src__rxvt.h Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt-devel/files/patch-src::rxvt.h) @@ -0,0 +1,11 @@ +--- src/rxvt.h ++++ src/rxvt.h +@@ -804,7 +804,7 @@ + #define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (r, 'R',(x),(y)) + + #ifdef UTMP_SUPPORT +-# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) ++# if !defined(HAVE_STRUCT_UTMPX) + # undef HAVE_UTMPX_H + # undef HAVE_STRUCT_UTMPX + # endif Copied: head/x11/rxvt-devel/files/patch-src__screen.c (from r363316, head/x11/rxvt-devel/files/patch-src-screen.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt-devel/files/patch-src__screen.c Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt-devel/files/patch-src-screen.c) @@ -0,0 +1,62 @@ +--- src/screen.c.orig 2003-03-23 17:56:06.000000000 +0100 ++++ src/screen.c 2011-04-19 23:27:32.000000000 +0200 +@@ -3520,6 +3520,7 @@ + Atom32 target_list[3]; + #endif + Atom target; ++ Atom property; + XTextProperty ct; + XICCEncodingStyle style; + char *cl[2], dummy[1]; +@@ -3532,6 +3533,15 @@ + ev.target = rq->target; + ev.time = rq->time; + ++ /* ICCCM: 2.2. Responsibilities of the Selection Owner ++ * SelectionRequest: ++ * If the specified property is None , the requestor ++ * an obsolete client. Owners are encouraged ++ * to support these clients by using the specified ++ * target atom as the property name to be used for ++ * the reply. ++ */ ++ property = (rq->property == 0) ? rq->target : rq->property; + if (rq->target == r->h->xa[XA_TARGETS]) { + target_list[0] = (Atom32) r->h->xa[XA_TARGETS]; + target_list[1] = (Atom32) XA_STRING; +@@ -3539,7 +3549,7 @@ + #ifdef USE_XIM + target_list[3] = (Atom32) r->h->xa[XA_COMPOUND_TEXT]; + #endif +- XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM, ++ XChangeProperty(r->Xdisplay, rq->requestor, property, XA_ATOM, + (8 * sizeof(target_list[0])), PropModeReplace, + (unsigned char *)target_list, + (sizeof(target_list) / sizeof(target_list[0]))); +@@ -3547,10 +3557,10 @@ + } else if (rq->target == r->h->xa[XA_MULTIPLE]) { + /* TODO: Handle MULTIPLE */ + } else if (rq->target == r->h->xa[XA_TIMESTAMP] && r->selection.text) { +- XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_INTEGER, +- (8 * sizeof(Time)), PropModeReplace, ++ XChangeProperty(r->Xdisplay, rq->requestor, property, XA_INTEGER, ++ 32, PropModeReplace, + (unsigned char *)&r->h->selection_time, 1); +- ev.property = rq->property; ++ ev.property = property; + } else if (rq->target == XA_STRING + || rq->target == r->h->xa[XA_COMPOUND_TEXT] + || rq->target == r->h->xa[XA_TEXT]) { +@@ -3588,10 +3598,10 @@ + ct.value = (unsigned char *)cl[0]; + ct.nitems = selectlen; + } +- XChangeProperty(r->Xdisplay, rq->requestor, rq->property, ++ XChangeProperty(r->Xdisplay, rq->requestor, property, + target, 8, PropModeReplace, + ct.value, (int)ct.nitems); +- ev.property = rq->property; ++ ev.property = property; + #ifdef USE_XIM + if (freect) + XFree(ct.value); Copied: head/x11/rxvt/files/patch-Makefile.in (from r363316, head/x11/rxvt/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt/files/patch-Makefile.in Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt/files/patch-aa) @@ -0,0 +1,11 @@ +--- Makefile.in.orig Mon Aug 21 23:31:36 2000 ++++ Makefile.in Mon Aug 21 23:31:51 2000 +@@ -9,7 +9,7 @@ + first_rule: all + dummy: + +-subdirs = src doc rclock src/graphics ++subdirs = src doc + + DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog + Copied: head/x11/rxvt/files/patch-autoconf__config.h.in (from r363316, head/x11/rxvt/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt/files/patch-autoconf__config.h.in Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt/files/patch-ac) @@ -0,0 +1,20 @@ +--- autoconf/config.h.in.orig Mon Aug 21 23:33:43 2000 ++++ autoconf/config.h.in Mon Aug 21 23:34:39 2000 +@@ -161,7 +161,7 @@ + #undef HAVE_UTMP_HOST + + /* Define location of utmp */ +-#undef RXVT_UTMP_FILE ++#define RXVT_UTMP_FILE "/var/run/utmp" + + /* Define in utmpx.h has struct utmpx */ + #undef HAVE_STRUCT_UTMPX +@@ -173,7 +173,7 @@ + #undef RXVT_UTMPX_FILE + + /* Define location of wtmp */ +-#undef RXVT_WTMP_FILE ++#define RXVT_WTMP_FILE "/var/log/wtmp" + + /* Define location of wtmpx */ + #undef RXVT_WTMPX_FILE Copied: head/x11/rxvt/files/patch-doc__Makefile.in (from r363316, head/x11/rxvt/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt/files/patch-doc__Makefile.in Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt/files/patch-ab) @@ -0,0 +1,12 @@ +--- doc/Makefile.in.orig Mon Aug 21 23:32:21 2000 ++++ doc/Makefile.in Mon Aug 21 23:32:44 2000 +@@ -41,9 +41,6 @@ + + all: rxvt.1 + +-rxvt.1: Makefile +- @if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi +- + SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\ + -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\ + -e 's%@RXVT_DATE@%$(DATE)%g;'\ Copied: head/x11/rxvt/files/patch-src__command.c (from r363316, head/x11/rxvt/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/rxvt/files/patch-src__command.c Tue Jul 29 16:09:41 2014 (r363352, copy of r363316, head/x11/rxvt/files/patch-ad) @@ -0,0 +1,40 @@ +--- src/command.c.orig Thu Nov 1 22:18:35 2001 ++++ src/command.c Mon Oct 10 00:29:07 2005 +@@ -254,7 +254,7 @@ + extern char *ptsname(); + + # ifdef PTYS_ARE_GETPT +- if ((fd = getpt()) >= 0) { ++ if ((fd = posix_openpt(O_RDWR)) >= 0) { + # else + if ((fd = open("/dev/ptmx", O_RDWR)) >= 0) { + # endif +@@ -519,6 +519,9 @@ + # ifdef VEOL2 + FOO(VEOL2, "VEOL2"); + # endif ++# ifdef VERASE2 ++ FOO(VERASE2, "VERASE2"); ++# endif + # ifdef VSWTC + FOO(VSWTC, "VSWTC"); + # endif +@@ -596,6 +599,9 @@ + # ifdef VSWTCH + tio->c_cc[VSWTCH] = VDISABLE; + # endif ++# ifdef VERASE2 ++ tio->c_cc[VERASE2] = CERASE2; ++# endif + # if VMIN != VEOF + tio->c_cc[VMIN] = 1; + # endif +@@ -2376,7 +2382,7 @@ + unsigned char buf[256]; + + va_start(arg_ptr, fmt); +- vsprintf(buf, fmt, arg_ptr); ++ vsnprintf(buf, sizeof(buf), fmt, arg_ptr); + va_end(arg_ptr); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***