Date: Tue, 29 Jul 2014 16:36:07 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363358 - in head: x11-clocks/abclock/files x11-clocks/asclock-gtk/files x11-clocks/eyeclock x11-clocks/eyeclock/files x11-clocks/mouseclock/files x11-clocks/swisswatch x11-clocks/swiss... Message-ID: <201407291636.s6TGa7Yt085180@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Jul 29 16:36:06 2014 New Revision: 363358 URL: http://svnweb.freebsd.org/changeset/ports/363358 QAT: https://qat.redports.org/buildarchive/r363358/ Log: Rename x11-*/ patch-xy patches to reflect the files they modify. Finally, this is the last of it. Added: head/x11-clocks/abclock/files/patch-abclock.c - copied unchanged from r363352, head/x11-clocks/abclock/files/patch-ab head/x11-clocks/asclock-gtk/files/patch-Makefile - copied unchanged from r363352, head/x11-clocks/asclock-gtk/files/patch-aa head/x11-clocks/asclock-gtk/files/patch-config.c - copied unchanged from r363352, head/x11-clocks/asclock-gtk/files/patch-ac head/x11-clocks/asclock-gtk/files/patch-configure - copied unchanged from r363352, head/x11-clocks/asclock-gtk/files/patch-ab head/x11-clocks/asclock-gtk/files/patch-themes__classic__led.xpm - copied unchanged from r363352, head/x11-clocks/asclock-gtk/files/patch-led.xpm head/x11-clocks/eyeclock/files/patch-Makefile - copied unchanged from r363352, head/x11-clocks/eyeclock/files/patch-aa head/x11-clocks/eyeclock/files/patch-main.c - copied unchanged from r363352, head/x11-clocks/eyeclock/files/patch-ab head/x11-clocks/mouseclock/files/patch-mouseclock.c - copied unchanged from r363352, head/x11-clocks/mouseclock/files/patch-01 head/x11-clocks/swisswatch/files/patch-Imakefile - copied unchanged from r363352, head/x11-clocks/swisswatch/files/patch-aa head/x11-clocks/tclock/files/patch-tclock.c - copied unchanged from r363352, head/x11-clocks/tclock/files/patch-aa head/x11-clocks/wmtime/files/patch-Imakefile - copied unchanged from r363352, head/x11-clocks/wmtime/files/patch-ab head/x11-clocks/wmtime/files/patch-wmtime.c2 - copied unchanged from r363352, head/x11-clocks/wmtime/files/patch-aa head/x11-fm/ezfm/files/patch-Makefile - copied unchanged from r363352, head/x11-fm/ezfm/files/patch-aa head/x11-fm/ezfm/files/patch-aboutEZFM.h - copied unchanged from r363352, head/x11-fm/ezfm/files/patch-ag head/x11-fm/ezfm/files/patch-ezfm.h - copied unchanged from r363352, head/x11-fm/ezfm/files/patch-ab head/x11-fm/ezfm/files/patch-ezfmrc - copied unchanged from r363352, head/x11-fm/ezfm/files/patch-af head/x11-fm/ezfm/files/patch-infoBtn.c - copied unchanged from r363352, head/x11-fm/ezfm/files/patch-ac head/x11-fm/ezfm/files/patch-libfile__Makefile - copied unchanged from r363352, head/x11-fm/ezfm/files/patch-ae head/x11-fm/ezfm/files/patch-main.c - copied unchanged from r363352, head/x11-fm/ezfm/files/patch-ad head/x11-fm/ezfm/files/patch-transparent.c - copied unchanged from r363352, head/x11-fm/ezfm/files/patch-ah head/x11-fm/xcruise/files/patch-Imakefile - copied unchanged from r363352, head/x11-fm/xcruise/files/patch-aa head/x11-fonts/bdfresize/files/patch-charresize.c - copied unchanged from r363352, head/x11-fonts/bdfresize/files/patch-aa head/x11-fonts/geminifonts/files/patch-Makefile - copied unchanged from r363352, head/x11-fonts/geminifonts/files/patch-gz head/x11-fonts/intlfonts/files/patch-Chinese__taipei16.bdf - copied unchanged from r363352, head/x11-fonts/intlfonts/files/patch-aa head/x11-fonts/p5-type1inst/files/patch-type1inst.man - copied unchanged from r363352, head/x11-fonts/p5-type1inst/files/patch-aa head/x11-fonts/tkfont/files/patch-tkfont - copied unchanged from r363352, head/x11-fonts/tkfont/files/patch-aa head/x11-themes/murrine-configurator/files/patch-files__murrine-configurator - copied unchanged from r363352, head/x11-themes/murrine-configurator/files/patch-aa head/x11-toolkits/gal2/files/patch-Makefile.in - copied unchanged from r363352, head/x11-toolkits/gal2/files/patch-ab head/x11-toolkits/gtk12/files/patch-Makefile.in - copied unchanged from r363352, head/x11-toolkits/gtk12/files/patch-aa head/x11-toolkits/gtk12/files/patch-configure - copied unchanged from r363352, head/x11-toolkits/gtk12/files/patch-ae head/x11-toolkits/gtk12/files/patch-docs__Makefile.in - copied unchanged from r363352, head/x11-toolkits/gtk12/files/patch-ah head/x11-toolkits/gtk12/files/patch-gdk__Makefile.in - copied unchanged from r363352, head/x11-toolkits/gtk12/files/patch-gdk::Makefile.in head/x11-toolkits/gtk12/files/patch-gdk__gdkimage.c - copied unchanged from r363352, head/x11-toolkits/gtk12/files/patch-gdk::gdkimage.c head/x11-toolkits/gtk12/files/patch-gtk-config.in - copied unchanged from r363352, head/x11-toolkits/gtk12/files/patch-ab head/x11-toolkits/gtk12/files/patch-gtk__Makefile.in - copied unchanged from r363352, head/x11-toolkits/gtk12/files/patch-ag head/x11-toolkits/gtk12/files/patch-gtk__gtkrc.c - copied unchanged from r363352, head/x11-toolkits/gtk12/files/patch-ad head/x11-toolkits/gtk12/files/patch-gtk__gtkrc.ru - copied unchanged from r363352, head/x11-toolkits/gtk12/files/patch-af head/x11-toolkits/gtk20/files/patch-docs_Makefile.in - copied unchanged from r363352, head/x11-toolkits/gtk20/files/patch-ah head/x11-toolkits/gtk20/files/patch-docs_reference_Makefile.in - copied unchanged from r363352, head/x11-toolkits/gtk20/files/patch-ai head/x11-toolkits/gtk20/files/patch-gdk_Makefile.in - copied unchanged from r363352, head/x11-toolkits/gtk20/files/patch-ak head/x11-toolkits/scintilla/files/patch-makefile - copied unchanged from r363352, head/x11-toolkits/scintilla/files/patch-aa head/x11-toolkits/slingshot/files/patch-Makefile - copied unchanged from r363352, head/x11-toolkits/slingshot/files/patch-aa head/x11-toolkits/slingshot/files/patch-examples-Makefile - copied unchanged from r363352, head/x11-toolkits/slingshot/files/patch-ca head/x11-toolkits/slingshot/files/patch-include-sspkg-Makefile - copied unchanged from r363352, head/x11-toolkits/slingshot/files/patch-da head/x11-toolkits/slingshot/files/patch-src-Makefile - copied unchanged from r363352, head/x11-toolkits/slingshot/files/patch-ba head/x11-toolkits/slingshot/files/patch-src-tacho.c - copied unchanged from r363352, head/x11-toolkits/slingshot/files/patch-bc head/x11-toolkits/tk84/files/patch-Makefile.in - copied unchanged from r363352, head/x11-toolkits/tk84/files/patch-ab head/x11-toolkits/tk84/files/patch-configure - copied unchanged from r363352, head/x11-toolkits/tk84/files/patch-aa head/x11-wm/afterstep/files/patch-Imakefile - copied unchanged from r363352, head/x11-wm/afterstep/files/patch-ac head/x11-wm/afterstep/files/patch-afterstep__alpha_header.h - copied unchanged from r363352, head/x11-wm/afterstep/files/patch-ad head/x11-wm/afterstep/files/patch-afterstep__icons.c - copied unchanged from r363352, head/x11-wm/afterstep/files/patch-icons.c head/x11-wm/afterstep/files/patch-configure.h - copied unchanged from r363352, head/x11-wm/afterstep/files/patch-aa head/x11-wm/afterstep/files/patch-sample.steprc - copied unchanged from r363352, head/x11-wm/afterstep/files/patch-ab head/x11-wm/fvwm/files/patch-Imakefiles - copied unchanged from r363352, head/x11-wm/fvwm/files/patch-ad head/x11-wm/fvwm/files/patch-configure.h - copied unchanged from r363352, head/x11-wm/fvwm/files/patch-ab head/x11-wm/fvwm/files/patch-sample.fvwmrc-system.fvwmrc - copied unchanged from r363352, head/x11-wm/fvwm/files/patch-ac head/x11-wm/piewm/files/patch-Imakefile - copied unchanged from r363352, head/x11-wm/piewm/files/patch-ad head/x11-wm/piewm/files/patch-gram.y - copied unchanged from r363352, head/x11-wm/piewm/files/patch-ae head/x11-wm/piewm/files/patch-parse.c - copied unchanged from r363352, head/x11-wm/piewm/files/patch-ag head/x11-wm/tvtwm/files/patch-Imakefile - copied unchanged from r363352, head/x11-wm/tvtwm/files/patch-ac head/x11-wm/tvtwm/files/patch-gram.y - copied unchanged from r363352, head/x11-wm/tvtwm/files/patch-aa head/x11-wm/tvtwm/files/patch-lex.l - copied unchanged from r363352, head/x11-wm/tvtwm/files/patch-ab head/x11-wm/weewm/files/patch-src__info.c - copied unchanged from r363352, head/x11-wm/weewm/files/patch-aa head/x11-wm/wm2/files/patch-General.h - copied unchanged from r363352, head/x11-wm/wm2/files/patch-ad head/x11-wm/wm2/files/patch-Makefile - copied unchanged from r363352, head/x11-wm/wm2/files/patch-aa head/x11-wm/wm2/files/patch-Manager.C - copied unchanged from r363352, head/x11-wm/wm2/files/patch-ab head/x11-wm/wm2/files/patch-Manager.h - copied unchanged from r363352, head/x11-wm/wm2/files/patch-ac head/x11-wm/wmakerconf/files/patch-scripts__wget.pl - copied unchanged from r363352, head/x11-wm/wmakerconf/files/patch-aa head/x11-wm/wmanager/files/patch-Makefile - copied unchanged from r363352, head/x11-wm/wmanager/files/patch-aa head/x11-wm/wmanager/files/patch-inc__WManager.H - copied unchanged from r363352, head/x11-wm/wmanager/files/patch-inc::WManager.H head/x11-wm/wmanager/files/patch-src__Interface.cc - copied unchanged from r363352, head/x11-wm/wmanager/files/patch-src::Interface.cc head/x11-wm/wmanager/files/patch-src__WManager.cc - copied unchanged from r363352, head/x11-wm/wmanager/files/patch-ab Deleted: head/x11-clocks/abclock/files/patch-ab head/x11-clocks/asclock-gtk/files/patch-aa head/x11-clocks/asclock-gtk/files/patch-ab head/x11-clocks/asclock-gtk/files/patch-ac head/x11-clocks/asclock-gtk/files/patch-led.xpm head/x11-clocks/eyeclock/files/patch-aa head/x11-clocks/eyeclock/files/patch-ab head/x11-clocks/mouseclock/files/patch-01 head/x11-clocks/swisswatch/files/patch-aa head/x11-clocks/tclock/files/patch-aa head/x11-clocks/wmtime/files/patch-aa head/x11-clocks/wmtime/files/patch-ab head/x11-fm/ezfm/files/patch-aa head/x11-fm/ezfm/files/patch-ab head/x11-fm/ezfm/files/patch-ac head/x11-fm/ezfm/files/patch-ad head/x11-fm/ezfm/files/patch-ae head/x11-fm/ezfm/files/patch-af head/x11-fm/ezfm/files/patch-ag head/x11-fm/ezfm/files/patch-ah head/x11-fm/xcruise/files/patch-aa head/x11-fonts/bdfresize/files/patch-aa head/x11-fonts/geminifonts/files/patch-gz head/x11-fonts/intlfonts/files/patch-aa head/x11-fonts/p5-type1inst/files/patch-aa head/x11-fonts/tkfont/files/patch-aa head/x11-themes/murrine-configurator/files/patch-aa head/x11-toolkits/gal2/files/patch-ab head/x11-toolkits/gtk12/files/patch-aa head/x11-toolkits/gtk12/files/patch-ab head/x11-toolkits/gtk12/files/patch-ad head/x11-toolkits/gtk12/files/patch-ae head/x11-toolkits/gtk12/files/patch-af head/x11-toolkits/gtk12/files/patch-ag head/x11-toolkits/gtk12/files/patch-ah head/x11-toolkits/gtk12/files/patch-gdk::Makefile.in head/x11-toolkits/gtk12/files/patch-gdk::gdkimage.c head/x11-toolkits/gtk20/files/patch-ah head/x11-toolkits/gtk20/files/patch-ai head/x11-toolkits/gtk20/files/patch-ak head/x11-toolkits/scintilla/files/patch-aa head/x11-toolkits/slingshot/files/patch-aa head/x11-toolkits/slingshot/files/patch-ba head/x11-toolkits/slingshot/files/patch-bc head/x11-toolkits/slingshot/files/patch-ca head/x11-toolkits/slingshot/files/patch-da head/x11-toolkits/tk84/files/patch-aa head/x11-toolkits/tk84/files/patch-ab head/x11-wm/afterstep/files/patch-aa head/x11-wm/afterstep/files/patch-ab head/x11-wm/afterstep/files/patch-ac head/x11-wm/afterstep/files/patch-ad head/x11-wm/afterstep/files/patch-icons.c head/x11-wm/fvwm/files/patch-ab head/x11-wm/fvwm/files/patch-ac head/x11-wm/fvwm/files/patch-ad head/x11-wm/piewm/files/patch-ad head/x11-wm/piewm/files/patch-ae head/x11-wm/piewm/files/patch-ag head/x11-wm/tvtwm/files/patch-aa head/x11-wm/tvtwm/files/patch-ab head/x11-wm/tvtwm/files/patch-ac head/x11-wm/weewm/files/patch-aa head/x11-wm/wm2/files/patch-aa head/x11-wm/wm2/files/patch-ab head/x11-wm/wm2/files/patch-ac head/x11-wm/wm2/files/patch-ad head/x11-wm/wmakerconf/files/patch-aa head/x11-wm/wmanager/files/patch-aa head/x11-wm/wmanager/files/patch-ab head/x11-wm/wmanager/files/patch-inc::WManager.H head/x11-wm/wmanager/files/patch-src::Interface.cc Modified: head/x11-clocks/eyeclock/Makefile head/x11-clocks/swisswatch/Makefile head/x11-clocks/tclock/Makefile head/x11-fm/ezfm/Makefile head/x11-fonts/geminifonts/Makefile head/x11-fonts/intlfonts/Makefile head/x11-fonts/p5-type1inst/Makefile head/x11-themes/murrine-configurator/Makefile head/x11-toolkits/slingshot/Makefile Copied: head/x11-clocks/abclock/files/patch-abclock.c (from r363352, head/x11-clocks/abclock/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/abclock/files/patch-abclock.c Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/abclock/files/patch-ab) @@ -0,0 +1,11 @@ +--- abclock.c.orig Tue Aug 15 11:25:10 2000 ++++ abclock.c Tue Aug 15 11:43:06 2000 +@@ -29,7 +29,7 @@ + #include <time.h> + #include <sys/time.h> + #include <unistd.h> +-#include <values.h> ++#include <float.h> + #include <X11/Xlib.h> + #include <X11/Xutil.h> + Copied: head/x11-clocks/asclock-gtk/files/patch-Makefile (from r363352, head/x11-clocks/asclock-gtk/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-Makefile Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/asclock-gtk/files/patch-aa) @@ -0,0 +1,71 @@ +--- Makefile.orig Fri Mar 26 16:08:33 1999 ++++ Makefile Sat Jul 1 17:43:08 2000 +@@ -1,19 +1,20 @@ + CP=cp -f + MKDIR=mkdir -p + +-CFLAGS = -Wall -g ++CFLAGS?= -Wall -g ++PREFIX?= /usr/local + +-GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \ ++GNOME_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \ + -DASCLOCK_GNOME `gnome-config --cflags gnomeui gnome gtk` + GNOME_OBJS = .gnome/draw.o .gnome/asclock.o .gnome/config.o .gnome/rot.o .gnome/parser.o \ + .gnome/symbols.o .gnome/dialogs.o .gnome/timezone.o .gnome/gnome_config.o + + GNOME_LIBS = -lpanel -lpanel_applet `gnome-config --libs gnomeui gnome gtk gnorba` + +-GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \ +- -DASCLOCK_GTK `$(CONFIG_PATH)gtk-config --cflags` ++GTK_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \ ++ -DASCLOCK_GTK `$(GTK_CONFIG) --cflags` + GTK_OBJS = .gtk/draw.o .gtk/asclock.o .gtk/config.o .gtk/rot.o .gtk/parser.o .gtk/symbols.o +-GTK_LIBS = `$(CONFIG_PATH)gtk-config --libs` ++GTK_LIBS = `$(GTK_CONFIG) --libs` + + + info: default_theme +@@ -41,24 +42,24 @@ + $(GTK_CC) $(GTK_LIBS) $(GTK_OBJS) -o asclock + + install: asclock +- $(CP) asclock /usr/X11/bin +- $(MKDIR) /usr/local/share/asclock +- $(MKDIR) /usr/local/share/asclock/themes +- $(MKDIR) /usr/local/share/asclock/themes/Newstone +- $(CP) themes/Newstone/* /usr/local/share/asclock/themes/Newstone +- $(MKDIR) /usr/local/share/asclock/themes/Orb +- $(CP) themes/Orb/* /usr/local/share/asclock/themes/Orb +- $(MKDIR) /usr/local/share/asclock/themes/Stone +- $(CP) themes/Stone/* /usr/local/share/asclock/themes/Stone +- $(MKDIR) /usr/local/share/asclock/themes/analog +- $(CP) themes/analog/* /usr/local/share/asclock/themes/analog +- $(MKDIR) /usr/local/share/asclock/themes/beats +- $(CP) themes/beats/* /usr/local/share/asclock/themes/beats +- $(MKDIR) /usr/local/share/asclock/themes/classic +- $(CP) themes/classic/* /usr/local/share/asclock/themes/classic +- $(MKDIR) /usr/local/share/asclock/themes/shaped +- $(CP) themes/shaped/* /usr/local/share/asclock/themes/shaped +-# $(CP) -rf themes/* /usr/local/share/asclock/ ++ ${BSD_INSTALL_PROGRAM} asclock ${PREFIX}/bin ++ $(MKDIR) ${PREFIX}/share/asclock ++ $(MKDIR) ${PREFIX}/share/asclock/themes ++ $(MKDIR) ${PREFIX}/share/asclock/themes/Newstone ++ ${BSD_INSTALL_DATA} themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone ++ $(MKDIR) ${PREFIX}/share/asclock/themes/Orb ++ ${BSD_INSTALL_DATA} themes/Orb/* ${PREFIX}/share/asclock/themes/Orb ++ $(MKDIR) ${PREFIX}/share/asclock/themes/Stone ++ ${BSD_INSTALL_DATA} themes/Stone/* ${PREFIX}/share/asclock/themes/Stone ++ $(MKDIR) ${PREFIX}/share/asclock/themes/analog ++ ${BSD_INSTALL_DATA} themes/analog/* ${PREFIX}/share/asclock/themes/analog ++ $(MKDIR) ${PREFIX}/share/asclock/themes/beats ++ ${BSD_INSTALL_DATA} themes/beats/* ${PREFIX}/share/asclock/themes/beats ++ $(MKDIR) ${PREFIX}/share/asclock/themes/classic ++ ${BSD_INSTALL_DATA} themes/classic/* ${PREFIX}/share/asclock/themes/classic ++ $(MKDIR) ${PREFIX}/share/asclock/themes/shaped ++ ${BSD_INSTALL_DATA} themes/shaped/* ${PREFIX}/share/asclock/themes/shaped ++# ${BSD_INSTALL_DATA} -rf themes/* ${PREFIX}/share/asclock/ + + clean: + rm -rf core *.o *~ .gtk .gnome asclock asclock_applet Copied: head/x11-clocks/asclock-gtk/files/patch-config.c (from r363352, head/x11-clocks/asclock-gtk/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-config.c Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/asclock-gtk/files/patch-ac) @@ -0,0 +1,19 @@ +--- config.c~ Fri Mar 26 16:38:29 1999 ++++ config.c Sat Jun 12 15:55:56 1999 +@@ -52,14 +52,14 @@ + fprintf(stderr, "dir : %s\n", *cpp); + + if((dfd = opendir(*cpp)) == NULL) +- printf(" not found\n\n"); ++ printf(" not found\n"); + else { + while((dp = readdir(dfd)) != NULL) + if ( dp->d_name[0]!='.' ) + printf("%s\n", dp->d_name); + closedir(dfd); + } +- printf("\n\n"); ++ printf("\n"); + + } + Copied: head/x11-clocks/asclock-gtk/files/patch-configure (from r363352, head/x11-clocks/asclock-gtk/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-configure Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/asclock-gtk/files/patch-ab) @@ -0,0 +1,39 @@ +--- configure.orig Sat Mar 27 01:56:27 1999 ++++ configure Sat Jun 12 15:44:06 1999 +@@ -2,19 +2,7 @@ + clear + echo Welcome to the new world of asclock! + echo +-echo Specify the versions you want to build. Note that you can always +-echo "build them explicitly by issuing 'make asclock' (gtk) or 'make asclock_applet'" +-echo "(gnome) in the shell." +-echo "asclock : the gtk standalone version" +-echo "asclock_applet : the applet version (always docks to the gnome panel)" +-echo "all : both versions" +-printf "I want to build [default=='asclock']:" +-read build +-case $build in +- asclock_applet) build="asclock_applet";; +- all) build="all";; +- *) build="asclock";; +-esac ++build="asclock" + + echo You selected \'make $build\' + echo +@@ -74,15 +62,6 @@ + else echo "char *second_xpm[] = { NULL };" >>./default_theme/second.xpm + fi + +- echo Do you want to build \'$build\' now [default==\'yes\']? +- read bla +- case $bla in +- [Nn]|[Nn][Oo]) echo no make no clock...; +- exit 0; +- ;; +- *) touch config.c asclock.c; +- make $build;; +- esac + exit 0 + fi + done Copied: head/x11-clocks/asclock-gtk/files/patch-themes__classic__led.xpm (from r363352, head/x11-clocks/asclock-gtk/files/patch-led.xpm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-themes__classic__led.xpm Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/asclock-gtk/files/patch-led.xpm) @@ -0,0 +1,9 @@ +--- themes/classic/led.xpm.orig Sun Mar 25 13:12:27 2007 ++++ themes/classic/led.xpm Sun Mar 25 13:12:33 2007 +@@ -1,5 +1,5 @@ + /* XPM */ +-char * led_xpm[] = { ++static char * led_xpm[] = { + "135 11 3 1", + " c #282828", + "O c #00df00", Modified: head/x11-clocks/eyeclock/Makefile ============================================================================== --- head/x11-clocks/eyeclock/Makefile Tue Jul 29 16:35:30 2014 (r363357) +++ head/x11-clocks/eyeclock/Makefile Tue Jul 29 16:36:06 2014 (r363358) @@ -7,7 +7,6 @@ PORTREVISION= 3 CATEGORIES= x11-clocks MASTER_SITES= http://ftp.vector.co.jp/pack/unix/personal/tokei/ DISTNAME= eyeclk20 -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Clock with eyes following the mouse pointer @@ -15,6 +14,7 @@ COMMENT= Clock with eyes following the m WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKE_ENV= X11BASE=${LOCALBASE} USE_XORG= x11 xau xdmcp xpm xt ice +USES= tar:tgz post-patch: @${REINPLACE_CMD} -e "s#gcc#${CC}#" ${WRKSRC}/Makefile Copied: head/x11-clocks/eyeclock/files/patch-Makefile (from r363352, head/x11-clocks/eyeclock/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/eyeclock/files/patch-Makefile Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/eyeclock/files/patch-aa) @@ -0,0 +1,62 @@ +--- Makefile.orig Sat Dec 25 03:18:57 1999 ++++ Makefile Sun Dec 26 16:33:49 1999 +@@ -15,8 +15,8 @@ + ############################################################################### + + #PREFIX = /usr/local +-PREFIX = /usr/X11R6 +-X11BASE = /usr/X11R6 ++#PREFIX = /usr/X11R6 ++#X11BASE = /usr/X11R6 + BINDIR = ${PREFIX}/bin + LIBDIR = ${PREFIX}/lib/X11/EyeClock + RESDIR = ${PREFIX}/lib/X11/app-defaults +@@ -26,15 +26,15 @@ + + # Choose a default face from below lines. + +-#DEFAULT_FACE = DEFAULT_FACE_IS_BSD_DAEMON ++DEFAULT_FACE = DEFAULT_FACE_IS_BSD_DAEMON + #DEFAULT_FACE = DEFAULT_FACE_IS_PENGUIN +-DEFAULT_FACE = DEFAULT_FACE_IS_NORMAL ++#DEFAULT_FACE = DEFAULT_FACE_IS_NORMAL + + # Choose a default resource file from below lines. + +-#DEFAULT_RESOURCE = EyeClock.daemon ++DEFAULT_RESOURCE = EyeClock.daemon + #DEFAULT_RESOURCE = EyeClock.penguin +-DEFAULT_RESOURCE = EyeClock.normal ++#DEFAULT_RESOURCE = EyeClock.normal + + # Choose icon pixmap from below lines. + +@@ -93,14 +93,15 @@ + backup : + cp COPYRIGHT* *.jpn CHANGE EyeClock* Makefile *.h *.c *.man bak + +-makeclock : eyeclock daemonclock penguinclock umeharaclock taroclock boyclock girlclock henohenoclock silicagelclock punpunclock margueriteclock octopusclock ++#makeclock : eyeclock daemonclock penguinclock umeharaclock taroclock boyclock girlclock henohenoclock silicagelclock punpunclock margueriteclock octopusclock ++makeclock : eyeclock daemonclock umeharaclock taroclock boyclock girlclock henohenoclock silicagelclock punpunclock margueriteclock octopusclock + + daemonclock : + ln -s eyeclock daemonclock + +-penguinclock : +- ln -s eyeclock penguinclock +- ++#penguinclock : ++# ln -s eyeclock penguinclock ++# + umeharaclock : + ln -s eyeclock umeharaclock + +@@ -131,7 +132,7 @@ + clearclock : + rm -f ${BINDIR}/eyeclock + rm -f ${BINDIR}/daemonclock +- rm -f ${BINDIR}/penguinclock ++# rm -f ${BINDIR}/penguinclock + rm -f ${BINDIR}/umeharaclock + rm -f ${BINDIR}/taroclock + rm -f ${BINDIR}/boyclock Copied: head/x11-clocks/eyeclock/files/patch-main.c (from r363352, head/x11-clocks/eyeclock/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/eyeclock/files/patch-main.c Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/eyeclock/files/patch-ab) @@ -0,0 +1,72 @@ +--- main.c.orig Sun Dec 26 16:34:55 1999 ++++ main.c Sun Dec 26 16:37:01 1999 +@@ -76,7 +76,7 @@ + /*===========================================================================*/ + + static Widget toplevel = 0; +-static Widget clock = 0; ++static Widget myclock = 0; + + /*===========================================================================*/ + /* Number ヴィジェットのヴィジェットごとの名前 */ +@@ -616,9 +616,9 @@ + Display * display; + int i; + +- if (clock) +- if (XtIsRealized(clock)) +- ClockStop(clock); ++ if (myclock) ++ if (XtIsRealized(myclock)) ++ ClockStop(myclock); + + if (toplevel) + if (XtIsRealized(toplevel)) { +@@ -650,8 +650,8 @@ + unsigned int width; + unsigned int height; + +- width = ClockGetFaceWidth(clock); +- height = ClockGetFaceHeight(clock); ++ width = ClockGetFaceWidth(myclock); ++ height = ClockGetFaceHeight(myclock); + + if (width && height) + XtVaSetValues(toplevel, XtNwidth, width, XtNheight, height, NULL); +@@ -730,23 +730,23 @@ + } + + /* Clock ヴィジェットの作成 */ +- clock = XtCreateManagedWidget("clock", clockWidgetClass, toplevel, NULL, 0); ++ myclock = XtCreateManagedWidget("clock", clockWidgetClass, toplevel, NULL, 0); + + /* Hand ヴィジェットの作成 */ + for (i = 0; hands_default_values[i].name; i++) + XtVaCreateManagedWidget(hands_default_values[i].name, +- handWidgetClass, clock, ++ handWidgetClass, myclock, + XtNtype, hands_default_values[i].type, NULL); + + /* Number ヴィジェットの作成 */ + for (i = 0; numbers_default_values[i].name; i++) + XtVaCreateManagedWidget(numbers_default_values[i].name, +- numberWidgetClass, clock, ++ numberWidgetClass, myclock, + XtNnumber, numbers_default_values[i].number, NULL); + + /* Eye ヴィジェットの作成 */ + for (i = 0; eyes_name[i]; i++) +- XtCreateManagedWidget(eyes_name[i], eyeWidgetClass, clock, NULL, 0); ++ XtCreateManagedWidget(eyes_name[i], eyeWidgetClass, myclock, NULL, 0); + + /* ポインタのフォーカスを有効にする */ + XtVaSetValues(toplevel, XtNinput, True, NULL); +@@ -788,7 +788,7 @@ + XSetWMProtocols(display, XtWindow(toplevel), &wm_delete_window, 1); + + /* 時計をスタートさせる */ +- ClockStart(app_context, clock); ++ ClockStart(app_context, myclock); + + /* Ctrl-c のトラップ */ + signal(SIGINT, interrupt_handler); Copied: head/x11-clocks/mouseclock/files/patch-mouseclock.c (from r363352, head/x11-clocks/mouseclock/files/patch-01) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/mouseclock/files/patch-mouseclock.c Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/mouseclock/files/patch-01) @@ -0,0 +1,39 @@ +--- mouseclock.c.orig Sun May 5 09:47:18 1996 ++++ mouseclock.c Mon Oct 6 23:09:43 1997 +@@ -31,6 +31,7 @@ + Window Root; + int shadow_size = 2; + int shadow_mode = 1; ++int ampm = 0; + + /* ---------------------------------------------------------------- */ + void +@@ -56,6 +57,7 @@ + printf ("-display <dpy> display name\n"); + printf ("-fg <color> foreground color\n"); + printf ("-fn <font_name> font to use\n"); ++ printf ("-12hr use 12-hour format\n"); + + exit (1); + } +@@ -266,6 +268,11 @@ + shadow_mode = 0; + continue; + } ++ if (!strcmp ("-12hr", argv[i])) ++ { ++ ampm = 1; ++ continue; ++ } + usage (argv[0]); + } + +@@ -295,7 +302,7 @@ + struct tm *now_tm = localtime (&now); + Cursor cur; + +- h = now_tm->tm_hour; ++ h = ampm && (now_tm->tm_hour - 12 > 0) ? now_tm->tm_hour - 12 : now_tm->tm_hour; + m = now_tm->tm_min; + + if (h != last_h || m != last_m) Modified: head/x11-clocks/swisswatch/Makefile ============================================================================== --- head/x11-clocks/swisswatch/Makefile Tue Jul 29 16:35:30 2014 (r363357) +++ head/x11-clocks/swisswatch/Makefile Tue Jul 29 16:36:06 2014 (r363358) @@ -6,12 +6,11 @@ PORTVERSION= 0.06 PORTREVISION= 2 CATEGORIES= x11-clocks MASTER_SITES= ${MASTER_SITE_PORTS_JP} -EXTRACT_SUFX= .tar.Z MAINTAINER= sanpei@FreeBSD.org COMMENT= Swiss railway clock emulation, and a fancy default appearance -USES= imake +USES= imake tar:Z USE_XORG= ice sm x11 xext xmu xt .include <bsd.port.mk> Copied: head/x11-clocks/swisswatch/files/patch-Imakefile (from r363352, head/x11-clocks/swisswatch/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/swisswatch/files/patch-Imakefile Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/swisswatch/files/patch-aa) @@ -0,0 +1,11 @@ +--- Imakefile.org Sat Dec 16 19:10:12 1995 ++++ Imakefile Sat Dec 16 18:59:27 1995 +@@ -1,7 +1,7 @@ + #ifdef ContribRules + ContribRules + #endif +-DEFINES = ExtensionDefines ++DEFINES = ExtensionDefines -DSHAPE + SRCS = swisswatch.c SwissWatch.c Hand.c Mark.c HandOrMark.c TableConvert.c + OBJS = swisswatch.o SwissWatch.o Hand.o Mark.o HandOrMark.o TableConvert.o + DEPLIBS = $(DEPXTOOLLIB) $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB) Modified: head/x11-clocks/tclock/Makefile ============================================================================== --- head/x11-clocks/tclock/Makefile Tue Jul 29 16:35:30 2014 (r363357) +++ head/x11-clocks/tclock/Makefile Tue Jul 29 16:36:06 2014 (r363358) @@ -7,13 +7,12 @@ PORTREVISION= 2 CATEGORIES= x11-clocks MASTER_SITES= http://www.linta.de/distfiles/ \ ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/ -EXTRACT_SUFX= .tar.Z MAINTAINER= aehlig@linta.de COMMENT= Transparent analog clock for x11 NO_WRKSUBDIR= yes -USES= imake +USES= imake tar:Z USE_XORG= x11 xext PLIST_FILES= bin/tclock man/man1/${PORTNAME}.1.gz Copied: head/x11-clocks/tclock/files/patch-tclock.c (from r363352, head/x11-clocks/tclock/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/tclock/files/patch-tclock.c Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/tclock/files/patch-aa) @@ -0,0 +1,112 @@ +--- tclock.c.orig 1992-12-21 19:56:29.000000000 +0000 ++++ tclock.c 2011-06-20 18:42:37.000000000 +0100 +@@ -22,7 +22,10 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> ++#include <unistd.h> + #include <math.h> ++#include <time.h> + #include <X11/Xlib.h> + #include <X11/Xutil.h> + #include <X11/Xos.h> +@@ -51,7 +54,7 @@ + int screen_number; + Window rootWindow, mainWindow; + int ShapeEventNumber, ShapeErrorNumber; +-long clock; ++time_t lclock; + struct tm lastTimes, times; + Pixmap border, clip; + GC clearGC, drawGC; +@@ -212,7 +215,7 @@ + XShapeCombineMask(display, mainWindow, ShapeBounding, 0, 0, border, ShapeSet); + XShapeCombineMask(display, mainWindow, ShapeClip, 0, 0, clip, ShapeSet); + +- XFlush(display, 1); ++ XFlush(display); + + /* This call to XPending ensures that if the window gets closed, we die */ + XPending(display); +@@ -222,8 +225,6 @@ + strToTP(s) + char *s; + { +- extern +- char *malloc(); + + XTextProperty *tp = (XTextProperty *)malloc(sizeof *tp); + XStringListToTextProperty(&s, 1, tp); +@@ -233,11 +234,11 @@ + int + sigalrm() + { +- clock = time(0); +- times = *localtime(&clock); ++ lclock = time(0); ++ times = *localtime(&lclock); + times.tm_hour = times.tm_hour * 5 + times.tm_min / 12; + reshape(); +- signal(SIGALRM, sigalrm); /* For SysV lusers */ ++ signal(SIGALRM, (void *)sigalrm); /* For SysV lusers */ + } + + unsigned long +@@ -294,7 +295,7 @@ + strcpy(appClass, "Tclock"); + } + +-void ++int + main(ac, av) + int ac; + char **av; +@@ -309,6 +310,7 @@ + extern + char *getenv(); + char *displayName, fn[1000]; ++ char *sdb; + int parseReturn, rc; + + XrmParseCommand(&db, option, numOptions, "tclock", &ac, av); +@@ -330,7 +332,7 @@ + display = XOpenDisplay(displayName); + if(display == 0) + { +- fprintf("Couldn't open display %s\n", displayName); ++ fprintf(stderr, "Couldn't open display %s\n", displayName); + exit(-1); + } + +@@ -341,13 +343,14 @@ + exit(1); + + db = XrmGetStringDatabase(tclockDefaults); +- XrmMergeDatabases(XrmGetStringDatabase(XResourceManagerString(display)), &db); ++ if(sdb = XResourceManagerString(display)) ++ XrmMergeDatabases(XrmGetStringDatabase(sdb), &db); + + sprintf(fn, "%s/.Xdefaults", getenv("HOME")); + if(access(fn, R_OK) == 0) + XrmMergeDatabases(XrmGetFileDatabase(fn), &db); + +- if(getenv("XENVIRONMENT") && access(getenv("XENVIRONMENT")) == 0) ++ if(getenv("XENVIRONMENT") && access(getenv("XENVIRONMENT"), R_OK) == 0) + XrmMergeDatabases(XrmGetFileDatabase(getenv("XENVIRONMENT")), &db); + + XrmMergeDatabases(cmdDB, &db); +@@ -410,7 +413,7 @@ + XMapRaised(display, mainWindow); + XFlush(display); + +- signal(SIGALRM, sigalrm); ++ signal(SIGALRM, (void *)sigalrm); + new.it_interval.tv_sec = 1; + new.it_value.tv_sec = 1; + new.it_interval.tv_usec = 0; +@@ -420,4 +423,3 @@ + for(;;) + sigpause(0); + } +- Copied: head/x11-clocks/wmtime/files/patch-Imakefile (from r363352, head/x11-clocks/wmtime/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/wmtime/files/patch-Imakefile Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/wmtime/files/patch-ab) @@ -0,0 +1,9 @@ +--- Imakefile.orig Wed Nov 1 09:26:11 2000 ++++ Imakefile Wed Nov 1 09:26:51 2000 +@@ -13,5 +13,5 @@ + misc.o \ + list.o + +-ComplexProgramTarget(wmtime) ++ComplexProgramTargetNoMan(wmtime) + Copied: head/x11-clocks/wmtime/files/patch-wmtime.c2 (from r363352, head/x11-clocks/wmtime/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/wmtime/files/patch-wmtime.c2 Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-clocks/wmtime/files/patch-aa) @@ -0,0 +1,11 @@ +--- wmtime.c Wed May 20 06:34:53 1998 ++++ wmtime.c2 Sat Nov 28 18:44:59 1998 +@@ -89,7 +89,7 @@ + char *ProgName; + int digital = 0; + char day_of_week[7][3] = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" }; +-char mon_of_year[12][4] = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOW", "DEC" }; ++char mon_of_year[12][4] = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" }; + + /* functions */ + void usage(void); Modified: head/x11-fm/ezfm/Makefile ============================================================================== --- head/x11-fm/ezfm/Makefile Tue Jul 29 16:35:30 2014 (r363357) +++ head/x11-fm/ezfm/Makefile Tue Jul 29 16:36:06 2014 (r363358) @@ -7,7 +7,6 @@ PORTREVISION= 7 CATEGORIES= x11-fm MASTER_SITES= ftp://ftp.ma.utexas.edu/pub/mzou/ DISTNAME= EZFM-${PORTVERSION:R}-src -EXTRACT_SUFX= .tgz MAINTAINER= gahr@FreeBSD.org COMMENT= EZWGL-based file manager for X Window System @@ -17,7 +16,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libEZ.so:${PORTSDIR}/graphics/EZWGL -USES= gmake +USES= gmake tar:tgz WRKSRC= ${WRKDIR}/EZFM-${PORTVERSION} @@ -28,7 +27,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DATADIR} .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/ezfmIcons - cd ${WRKSRC}/ezfmIcons && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/ezfmIcons + (cd ${WRKSRC}/ezfmIcons && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ezfmIcons) ${INSTALL_MAN} ${WRKSRC}/ezfm.1 ${STAGEDIR}${PREFIX}/man/man1 .include <bsd.port.mk> Copied: head/x11-fm/ezfm/files/patch-Makefile (from r363352, head/x11-fm/ezfm/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/ezfm/files/patch-Makefile Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fm/ezfm/files/patch-aa) @@ -0,0 +1,79 @@ +--- Makefile.orig Thu Jul 15 00:31:35 1999 ++++ Makefile Sat May 27 14:40:42 2000 +@@ -2,7 +2,10 @@ + # + # Where to install ezfm files + # +-DEST_DIR=/usr/local ++LOCALBASE?=/usr/local ++X11BASE?=/usr/local ++PREFIX?=${LOCALBASE} ++DEST_DIR=${PREFIX} + # + # + EZFM_MAGIC=$(DEST_DIR)/lib/ezfm/ezfmMagic +@@ -25,12 +28,13 @@ BIN=$(DEST_DIR)/bin + # + #---------------------------------------------------------------------------------- + # +-CC= gcc -g -DLINUX -I../include ++CC?= gcc -g -DLINUX -I../include ++CFLAGS+= -I$(LOCALBASE)/include + + # + #---------------------------------------------------------------------------------- +-LIBS = libfile.a -L../EZWGL/lib -lEZ -L/usr/X11R6/lib -lX11 -lXext -ljpeg -ltiff -lpng -lz -lm -lc +-STATICLIBS = libfile.a /usr/local/lib/libEZ.a -L/usr/X11R6/lib -lX11 -lXext -lm -lc ++LIBS = libfile.a -L../EZWGL/lib -lEZ -L${LOCALBASE}/lib -lX11 -lXext -ljpeg -ltiff -lpng -lz -lm -lc ++STATICLIBS = libfile.a ${LOCALBASE}/lib/libEZ.a -L${LOCALBASE}/lib -lX11 -lXext -lm -lc + + SRC= action.c folder.c atoms.c clientMessage.c main.c icons.c items.c finfo.c \ + signal.c info.c infoBtn.c printer.c misc.c mbtnFile.c mbtnView.c mbtnHelp.c popup.c\ +@@ -45,10 +49,10 @@ OBJECTS = $(SRC:.c=.o) + all: ezfm ezfmMagic + + ezfm: libfile.a $(OBJECTS) +- $(CC) $(CFLAG) -o ezfm $(OBJECTS) $(LIBS) $(JPEG_LIB) ++ $(CC) $(CFLAGS) -o ezfm $(OBJECTS) $(LIBS) $(JPEG_LIB) + + ezfm-static: libfile.a $(OBJECTS) +- $(CC) $(CFLAG) -o ezfm $(OBJECTS) $(STATICLIBS) $(JPEG_LIB) ++ $(CC) $(CFLAGS) -o ezfm $(OBJECTS) $(STATICLIBS) $(JPEG_LIB) + + + install: ezfm ezfmMagic ezfmExtension ezfmrc ezfmIcons +@@ -62,11 +66,11 @@ install: ezfm ezfmMagic ezfmExtension ez + cp ezfm $(BIN) + + libfile.a: +- (cd libfile; make libfile.a CC="gcc -O"; mv libfile.a ../ ) ++ $(MAKE) -C libfile libfile.a && mv libfile/libfile.a . + - ranlib libfile.a + + ezfmMagic: +- (cd libfile/Magdir; make all) ++ $(MAKE) -C libfile/Magdir all + + + mbtnHelp.c: aboutEZFM.h +@@ -75,17 +79,17 @@ mbtnHelp.c: aboutEZFM.h + + clean: + $(RM) libfile.a +- (cd libfile; make clean;) ++ $(MAKE) -C libfile clean + $(RM) $(OBJECTS) ezfm + + .c.o: +- $(CC) $(CFLAG) -c $< ++ $(CC) $(CFLAGS) -c $< + + .o: + $(CC) $< -o $@ $(LIBS) $(JPEG_LIB) + + .c: +- $(CC) $(CFLAG) $< -o $@ $(LIBS) $(JPEG_LIB) ++ $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(JPEG_LIB) + + # + # That's all folks, Copied: head/x11-fm/ezfm/files/patch-aboutEZFM.h (from r363352, head/x11-fm/ezfm/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/ezfm/files/patch-aboutEZFM.h Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fm/ezfm/files/patch-ag) @@ -0,0 +1,16 @@ +--- aboutEZFM.h.orig Fri Aug 29 17:42:25 2003 ++++ aboutEZFM.h Fri Aug 29 17:42:55 2003 +@@ -24,9 +24,9 @@ + *************************************************************************/ + + static char *ezfmInfoString = +-" +- Copyright (C) 1998 Maorong Zou +- +- Please report bugs to Maorong Zou <mzou@math.utexas.edu> ++"\n\ ++ Copyright (C) 1998 Maorong Zou\n\ ++\n\ ++ Please report bugs to Maorong Zou <mzou@math.utexas.edu>\n\ + "; + Copied: head/x11-fm/ezfm/files/patch-ezfm.h (from r363352, head/x11-fm/ezfm/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/ezfm/files/patch-ezfm.h Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fm/ezfm/files/patch-ab) @@ -0,0 +1,23 @@ +--- ezfm.h.orig 1999-10-06 00:01:29.000000000 +0200 ++++ ezfm.h 2007-12-07 00:02:05.000000000 +0100 +@@ -52,8 +52,11 @@ + #define REMOVABLE_DRIVES + #endif + /*************************************************************/ +-EXTERN int erron, sys_nerr; ++EXTERN int erron; ++#ifndef __FreeBSD__ ++EXTERN int sys_nerr; + EXTERN char *sys_errlist[]; ++#endif + #define syserr(en) (((en) >= 0 && (en) < sys_nerr) ? sys_errlist[(en)] : "Unknown error") + #define SECONDS_IN_YEAR 31536000 + #define SelectionBackground "yellow" +@@ -253,7 +256,6 @@ + EXTERN char ezfmFolderBgPixmap[]; + EXTERN EZ_Widget *ezfmDragIcon; + EXTERN Cursor ezfmDragCursor; +-EXTERN Pixmap rootBgPixmap; + EXTERN EZ_LabelPixmap *bigPixmap; + EXTERN int transparent; + EXTERN Display *theDisplay; Copied: head/x11-fm/ezfm/files/patch-ezfmrc (from r363352, head/x11-fm/ezfm/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/ezfm/files/patch-ezfmrc Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fm/ezfm/files/patch-af) @@ -0,0 +1,15 @@ +--- ezfmrc Wed Dec 9 12:05:32 1998 ++++ /home/andy/tmp/wrk/ezfmrc Tue Mar 16 17:18:22 1999 +@@ -2,9 +2,9 @@ + # Initialization file for ezfm. Path should be ~/.ezfmrc + # + Section "Files" +- Magicfile ezfmMagic:~/.ezfmMagic:/etc/ezfmMagic:/usr/local/lib/ezfm/ezfmMagic +- IconPath ezfmIcons:~/.ezfmIcons:/usr/lib/ezfm/ezfmIcons:/usr/local/lib/ezfm/ezfmIcons +- ExtensionFile ezfmExtension:~/.ezfmExtension ++ Magicfile ezfmMagic:~/.ezfmMagic:/usr/X11R6/share/ezfm/ezfmMagic ++ IconPath ezfmIcons:~/.ezfmIcons:/usr/X11R6/share/ezfm/ezfmIcons ++ ExtensionFile ezfmExtension:~/.ezfmExtension:/usr/X11R6/share/ezfm/ezfmExtension + EndSection + # + # Note: the extension file above is used to supress magic check. You can Copied: head/x11-fm/ezfm/files/patch-infoBtn.c (from r363352, head/x11-fm/ezfm/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/ezfm/files/patch-infoBtn.c Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fm/ezfm/files/patch-ac) @@ -0,0 +1,65 @@ +--- infoBtn.c.orig 1998-11-16 06:02:59.000000000 +0100 ++++ infoBtn.c 2007-12-07 00:09:30.000000000 +0100 +@@ -214,7 +214,7 @@ + if(chmod(ptr->pathname, ptr->mode) != 0) + { + char *err= (errno >= 0 && errno <sys_nerr)? +- sys_errlist[errno] : "Unknown error"; ++ (char *)sys_errlist[errno] : "Unknown error"; + ezfmWarning("chmod() failed due to the following error", err); + haserr++; + } +@@ -245,7 +245,7 @@ + if(chown(ptr->pathname, pswd->pw_uid, grp->gr_gid) != 0) + { + char *err= (errno >= 0 && errno <sys_nerr)? +- sys_errlist[errno] : "Unknown error"; ++ (char *)sys_errlist[errno] : "Unknown error"; + ezfmWarning("chown() failed due to the following error", err); + haserr++; + } +@@ -260,7 +260,7 @@ + if(rename(ptr->pathname, nname) < 0) + { + char *err= (errno >= 0 && errno <sys_nerr)? +- sys_errlist[errno] : "Unknown error"; ++ (char *)sys_errlist[errno] : "Unknown error"; + ezfmWarning("rename() failed due to the following error", err); + haserr++; + } +@@ -290,7 +290,7 @@ + } + } + /**************************************************************************/ +-static void setmode(widget, data) EZ_Widget *widget; void *data; ++static void _setmode(widget, data) EZ_Widget *widget; void *data; + { + char str[12]; + infoControl *ptr = (infoControl *)data; +@@ -347,7 +347,7 @@ + EZ_GRID_CELL_GEOMETRY, 2, idx , 1, 1, + EZ_CLIENT_INT_DATA, rr, + EZ_CLIENT_PTR_DATA, clabel, +- EZ_CALLBACK, setmode, data, ++ EZ_CALLBACK, _setmode, data, + NULL); + label = EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe, + EZ_LABEL_STRING, "write", +@@ -358,7 +358,7 @@ + EZ_CLIENT_INT_DATA, ww, + EZ_CLIENT_PTR_DATA, clabel, + EZ_GRID_CELL_GEOMETRY, 3, idx , 1, 1, +- EZ_CALLBACK, setmode, data, ++ EZ_CALLBACK, _setmode, data, + NULL); + label = EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe, + EZ_LABEL_STRING, "execute", +@@ -369,7 +369,7 @@ + EZ_CLIENT_PTR_DATA, clabel, + EZ_CHECK_BUTTON_ON_OFF, xx&mode, + EZ_GRID_CELL_GEOMETRY, 4, idx , 1, 1, +- EZ_CALLBACK, setmode, data, ++ EZ_CALLBACK, _setmode, data, + NULL); + } + Copied: head/x11-fm/ezfm/files/patch-libfile__Makefile (from r363352, head/x11-fm/ezfm/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/ezfm/files/patch-libfile__Makefile Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fm/ezfm/files/patch-ae) @@ -0,0 +1,17 @@ +--- libfile/Makefile Mon Jun 29 16:13:19 1998 ++++ /home/andy/tmp/wrk/libfile/Makefile Thu Jul 30 11:25:39 1998 +@@ -1,5 +1,5 @@ + # Makefile +-MAGIC = /etc/ezfmMagic ++MAGIC = ${PREFIX}/share/ezfm/ezfmMagic + CC = cc + CFLAGS = + +@@ -18,6 +18,6 @@ + rm -f *.o core File + + .c.o: +- $(CC) $(CFLAGS) -c $< ++ $(CC) -DMAGIC=\"${MAGIC}\" $(CFLAGS) -c $< + + #--end-- Copied: head/x11-fm/ezfm/files/patch-main.c (from r363352, head/x11-fm/ezfm/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/ezfm/files/patch-main.c Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fm/ezfm/files/patch-ad) @@ -0,0 +1,71 @@ +--- main.c.orig Thu Oct 7 16:06:48 1999 ++++ main.c Fri Aug 29 17:40:40 2003 +@@ -84,41 +84,41 @@ + */ + static char *fallbackResources = + /* initialization file name */ +-"ezfm*ezfmrc: ezfmrc:~/.ezfmrc:/etc/ezfmrc:/usr/lib/ezfm/ezfmrc:/usr/local/lib/ezfm/ezfmrc ++"ezfm*ezfmrc: ezfmrc:~/.ezfmrc:/etc/ezfmrc:/usr/X11R6/share/ezfm/ezfmrc:/usr/local/lib/ezfm/ezfmrc\n\ + " + /* fonts used in display items */ +-" +-ezfm*itemMediumFont: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-* +-ezfm*itemSlantFont: -*-helvetica-medium-o-*-*-12-*-*-*-*-*-*-* +-ezfm*itemBoldFont: -*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-* +-ezfm*itemBoldSlantFont: -*-helvetica-bold-o-*-*-12-*-*-*-*-*-*-* ++"\ ++ezfm*itemMediumFont: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*\n\ ++ezfm*itemSlantFont: -*-helvetica-medium-o-*-*-12-*-*-*-*-*-*-*\n\ ++ezfm*itemBoldFont: -*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*\n\ ++ezfm*itemBoldSlantFont: -*-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*\n\ + " + /* default font for entries/textWidgets (fixed width font)*/ +-" +-ezfm*textFont: -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* +-ezfm*textBoldFont: -*-lucidatypewriter-bold-r-*-*-14-*-*-*-*-*-*-* ++"\ ++ezfm*textFont: -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-*\n\ ++ezfm*textBoldFont: -*-lucidatypewriter-bold-r-*-*-14-*-*-*-*-*-*-*\n\ + " + /* default font for button labels */ +-" +-ezfm*labelMediumFont: -adobe-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-* +-ezfm*labelBoldFont: -adobe-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-* +-ezfm*labelLargeFont: -adobe-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-* +-ezfm*labelSmallFont: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-* ++"\ ++ezfm*labelMediumFont: -adobe-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*\n\ ++ezfm*labelBoldFont: -adobe-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*\n\ ++ezfm*labelLargeFont: -adobe-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*\n\ ++ezfm*labelSmallFont: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*\n\ + " + /* background colors */ +-" +-!!! text background for folders +-!*.textBackground: white +- +-!!! background for bubble help +-*bubble.background: yellow +- +-!!! selection background +-*selectionBackground: yellow +- +-!!! +-*HighlightMode: 2 +-ezfm.backingStore: 1 ++"\ ++!!! text background for folders\n\ ++!*.textBackground: white\n\ ++\n\ ++!!! background for bubble help\n\ ++*bubble.background: yellow\n\ ++\n\ ++!!! selection background\n\ ++*selectionBackground: yellow\n\ ++\n\ ++!!!\n\ ++*HighlightMode: 2\n\ ++ezfm.backingStore: 1\n\ + " + ; + Copied: head/x11-fm/ezfm/files/patch-transparent.c (from r363352, head/x11-fm/ezfm/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/ezfm/files/patch-transparent.c Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fm/ezfm/files/patch-ah) @@ -0,0 +1,24 @@ +--- transparent.c.orig Fri Aug 29 17:47:44 2003 ++++ transparent.c Fri Aug 29 17:48:01 2003 +@@ -417,9 +417,9 @@ void makeDialogue() + } + /********************************************************************************/ + static char *transparentResource = +-" +-*tileOrigin: 2 0 0 +-*fileIcon.labeledIcon: 3 ++"\n\ ++*tileOrigin: 2 0 0\n\ ++*fileIcon.labeledIcon: 3\n\ + " + ; + /********************************************************************************/ +@@ -535,7 +535,7 @@ void ezfmPopupWarning(lab1, lab2, lab3, + } + } + /***************************************************************************/ +-static setroot(obj, data, scale) ++static void setroot(obj, data, scale) + void *obj, *data; int scale; + { + FileInfo *finfo = (FileInfo *)data; Copied: head/x11-fm/xcruise/files/patch-Imakefile (from r363352, head/x11-fm/xcruise/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/xcruise/files/patch-Imakefile Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fm/xcruise/files/patch-aa) @@ -0,0 +1,11 @@ +--- Imakefile.orig Sat Mar 15 05:32:37 2003 ++++ Imakefile Sat Mar 15 05:33:50 2003 +@@ -12,7 +12,7 @@ + SYS_LIBRARIES = MathLibrary + DEFINES = XkbClientDefines + +-CDEBUGFLAGS = -g -Wall ++#CDEBUGFLAGS = -g -Wall + + SRCS = MainScreen.c xcruiser.c draw.c zone.c vec3.c info.c + OBJS = MainScreen.o xcruiser.o draw.o zone.o vec3.o info.o Copied: head/x11-fonts/bdfresize/files/patch-charresize.c (from r363352, head/x11-fonts/bdfresize/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fonts/bdfresize/files/patch-charresize.c Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fonts/bdfresize/files/patch-aa) @@ -0,0 +1,10 @@ +--- charresize.c.orig Fri Aug 23 16:24:22 2002 ++++ charresize.c Fri Aug 23 16:24:46 2002 +@@ -46,7 +46,6 @@ + void + processChar(void) + { +- char *malloc(); + char *srcimage; + int *dstgray; + Modified: head/x11-fonts/geminifonts/Makefile ============================================================================== --- head/x11-fonts/geminifonts/Makefile Tue Jul 29 16:35:30 2014 (r363357) +++ head/x11-fonts/geminifonts/Makefile Tue Jul 29 16:36:06 2014 (r363358) @@ -9,7 +9,6 @@ MASTER_SITES= http://www.brama.com/compu PKGNAMEPREFIX= koi8-u- PKGNAMESUFFIX= -x11 DISTNAME= x-koi8u -EXTRACT_SUFX= .tgz MAINTAINER= mi@aldan.algebra.com COMMENT= Ukrainian KOI8 fonts for X11R6 (koi8-u) @@ -18,7 +17,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USES= perl5 +USES= perl5 tar:tgz USE_PERL5= build USE_XORG= x11 NO_WRKSUBDIR= yes @@ -30,9 +29,6 @@ post-patch: -e 's|DESTDIR =.*|MDESTDIR=${STAGEDIR}${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \ ${WRKSRC}/Makefile -post-install: - @${CAT} ${PKGMESSAGE} - # This will allow one to use just this fonts for both, the Ukrainian # koi8-u and the Russian koi8-r encodings. Since koi8-u is a superset of # koi8-r, there is not need to load both sets into X-server, but some Copied: head/x11-fonts/geminifonts/files/patch-Makefile (from r363352, head/x11-fonts/geminifonts/files/patch-gz) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fonts/geminifonts/files/patch-Makefile Tue Jul 29 16:36:06 2014 (r363358, copy of r363352, head/x11-fonts/geminifonts/files/patch-gz) @@ -0,0 +1,22 @@ +--- Makefile Sun Dec 31 11:22:34 1995 ++++ Makefile Mon Jul 11 12:37:08 2005 +@@ -53,5 +53,4 @@ + + all: $(SRC) $(ROMAN) $(SLANT) $(BOLD) $(BSLANT) $(FIXED) +- mkfontdir . + + src: $(SRC) +@@ -63,6 +62,7 @@ + install: +- -mkdir $(DESTDIR) ++ -mkdir $(MDESTDIR) +- for i in $(ROMAN) $(SLANT) $(BOLD) $(BSLANT) $(FIXED) fonts.dir fonts.alias;\ +- do install -c -m 444 $$i $(DESTDIR)/$$i; done ++ ${BSD_INSTALL_DATA} $(ROMAN) $(SLANT) $(BOLD) $(BSLANT) $(FIXED) \ ++ fonts.alias $(MDESTDIR)/ ++ mkfontdir $(MDESTDIR) + + package: +@@ -75 +75 @@ +- bdftopcf -t $< | compress > $@ ++ bdftopcf -t $< | gzip -9 > $@ Modified: head/x11-fonts/intlfonts/Makefile ============================================================================== --- head/x11-fonts/intlfonts/Makefile Tue Jul 29 16:35:30 2014 (r363357) +++ head/x11-fonts/intlfonts/Makefile Tue Jul 29 16:36:06 2014 (r363358) @@ -59,16 +59,14 @@ do-build: *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407291636.s6TGa7Yt085180>