Attachment #128555 for bug #172421

Lines 1-11 Link Here

(-)x11-wm/libwraster/Makefile (-5 / +2 lines)
1	# New ports collection makefile for: libwraster	1	# Created by: Doug Barton <dougb@FreeBSD.org>
2	# Date created: August 17, 2009
3	# Whom: Doug Barton <dougb@FreeBSD.org>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6		3
7	PORTNAME= libwraster	4	PORTNAME= libwraster
8	PORTREVISION= 1	5	PORTREVISION= 0
9		6
10	COMMENT= libwraster from Window Maker	7	COMMENT= libwraster from Window Maker
11		8




# Created by: Brian Handy <handy@physics.montana.edu>
# Date created:				August 13, 1997
# Whom:					Brian Handy <handy@physics.montana.edu>
#
# $FreeBSD$

PORTNAME?=	windowmaker
PORTVERSION=	0.95.3
PORTREVISION?=	0
CATEGORIES=	x11-wm windowmaker
MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
MASTER_SITE_SUBDIR=	source/release

.if !defined(LWR_SLAVE)
RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
USE_PERL5=	yes
OPTIONS_DEFINE=	XRANDR
OPTIONS=	XRANDR "xrandr support (EXPERIMENTAL)" off
.endif

MAKE_JOBS_SAFE=	yes

USE_AUTOTOOLS=	libtool
USE_BZIP2=	yes
USE_GNOME=	gnomehack
USE_XORG=	xft xinerama xmu xpm
USE_GETTEXT=	yes

BROKEN=		does not compile on FreeBSD 7.X
.endif

.if ${PORT_OPTIONS:MXRANDR}
USE_XORG+=	xrandr
CONFIGURE_ARGS+=	--enable-xrandr
.endif

CONFLICTS=	libwraster-0.*

MANLANG=	"" cs sk ru
MAN1_EN=	geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x get-wings-flags.1 \
		get-wraster-flags.1 get-wutil-flags.1 wdread.1 WindowMaker.1x \
		wmagnify.1x wmgenmenu.1 wmmenugen.1 WPrefs.1x

MAN8_EN=	upgrade-windowmaker-defaults.8

MAN1_CS=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x

MAN1_SK=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x

MAN1_RU=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x

PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
		INSTALL-WMAKER NEWS README README.definable-cursor TODO

LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
CONFIGURE_ENV+=	LINGUAS="${LINGUAS}"

post-patch:
.for f in WINGs/wapplication.c WPrefs.app/Menu.c WPrefs.app/Paths.c \
    WindowMaker/*menu*
	@${REINPLACE_CMD} -e "s#/usr/local#${PREFIX}#g" ${WRKSRC}/${f}

Lines 1-2 Link Here

(-)x11-wm/windowmaker/distinfo (-2 / +2 lines)
1	SHA256 (WindowMaker-0.95.2.tar.bz2) = 65b5dee5d87103292fd6afc039a81ed3287e4a545d149a33a50b303a9a9cc94b	1	SHA256 (WindowMaker-0.95.3.tar.gz) = b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a
2	SIZE (WindowMaker-0.95.2.tar.bz2) = 2190825	2	SIZE (WindowMaker-0.95.3.tar.gz) = 2780245

Lines 1-18 Link Here

(-)x11-wm/windowmaker/files/patch-am (-18 lines)
1	--- util/wm-oldmenu2new.orig Wed Jan 20 21:39:18 1999
2	+++ util/wm-oldmenu2new Wed Jan 20 21:39:29 1999
3	@@ -127,6 +127,7 @@
4	for (@foo2) {
5	s/^(\s)"([^"])"\s\s*END/\1),/;
6	s/^(\s)"([^"])"\s\sEXEC\s\s(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/;
7	+ s/^(\s)"([^"])"\s\sSHEXEC\s\s(.*)$/\1($v\n\1"\2",$v\n\1SHEXEC,$v\n\1"\3"$v\n\1),/;
8	push @foo,split "\n";
9	}
10	@foo2=();
11	@@ -144,6 +145,7 @@
12	for (@foo) {
13	s/^(\s)([^ ])\s\s*END/\1),/;
14	s/^(\s)([^ ])\s\sEXEC\s\s(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/;
15	+ s/^(\s)([^ ])\s\sSHEXEC\s\s(.*)$/\1($v\n\1"\2",$v\n\1SHEXEC,$v\n\1"\3"$v\n\1),/;
16	push @foo2,split "\n";
17	}
18	@foo=();




diff -ur ../WindowMaker-0.95.2-pre-clang/src/actions.c ./src/actions.c
--- ../WindowMaker-0.95.2-pre-clang/src/actions.c	2012-02-14 11:36:01.000000000 -0800
+++ ./src/actions.c	2012-02-25 02:29:30.000000000 -0800
@@ -60,6 +60,9 @@
 				  unsigned int *new_width, unsigned int *new_height);
 static void save_old_geometry(WWindow *wwin);
 
+/* In usermenu.c */
+void wUserMenuRefreshInstances(WMenu * menu, WWindow * wwin);
+
 /******* Local Variables *******/
 static struct {
 	int steps;
diff -ur ../WindowMaker-0.95.2-pre-clang/src/event.c ./src/event.c
--- ../WindowMaker-0.95.2-pre-clang/src/event.c	2012-02-14 11:36:01.000000000 -0800
+++ ./src/event.c	2012-02-25 02:30:58.000000000 -0800
@@ -130,9 +130,11 @@
 static void handleFocusIn(XEvent *event);
 static void handleMotionNotify(XEvent *event);
 static void handleVisibilityNotify(XEvent *event);
-static void handle_inotify_events(int fd, int wd);
 static void wdelete_death_handler(WMagicNumber id);
 
+#ifdef HAVE_INOTIFY
+static void handle_inotify_events(int fd, int wd);
+#endif
 
 #ifdef SHAPE
 static void handleShapeNotify(XEvent *event);
diff -ur ../WindowMaker-0.95.2-pre-clang/src/osdep_bsd.c ./src/osdep_bsd.c
--- ../WindowMaker-0.95.2-pre-clang/src/osdep_bsd.c	2012-02-14 11:36:01.000000000 -0800
+++ ./src/osdep_bsd.c	2012-02-25 02:31:25.000000000 -0800
@@ -85,7 +85,7 @@
 		mib[0] = CTL_KERN;
 		mib[1] = KERN_ARGMAX;
 		mib[2] = 0;
-		mib[4] = 0;
+		mib[3] = 0;
 
 		count = sizeof(argmax);
 		if (sysctl(mib, 2, &argmax, &count, NULL, 0) == -1)
diff -ur ../WindowMaker-0.95.2-pre-clang/src/usermenu.c ./src/usermenu.c
--- ../WindowMaker-0.95.2-pre-clang/src/usermenu.c	2012-02-14 11:36:01.000000000 -0800
+++ ./src/usermenu.c	2012-02-25 02:37:25.000000000 -0800
@@ -82,6 +82,9 @@
 /*** var ***/
 extern WPreferences wPreferences;
 
+/* In xmodifier.c */
+int wXModifierFromKey(char *key);
+
 typedef struct {
 	WScreen *screen;
 	WShortKey *key;
@@ -133,7 +136,6 @@
 	WUserMenuData *data;
 	KeySym ksym;
 	char *k;
-	char *buffer;
 	char buf[MAX_SHORTCUT_LENGTH], *b;
 	int keycount, i, j, mod;
 
@@ -283,7 +285,6 @@
 
 void wUserMenuRefreshInstances(WMenu * menu, WWindow * wwin)
 {
-	WMenuEntry *entry;
 	int i, j, count, paintflag;
 
 	paintflag = 0;
@@ -324,13 +325,11 @@
 static WMenu *readUserMenuFile(WScreen * scr, char *file_name)
 {
 	WMenu *menu;
-	char *mtitle;
-	WMPropList *plum, *elem, *title, *command, *params;
-	int count, i;
+	WMPropList *plum;
 
 	menu = NULL;
 	plum = WMReadPropListFromFile(file_name);
-	 /**/ if (plum) {
+	if (plum) {
 		menu = configureUserMenu(scr, plum);
 		WMReleasePropList(plum);
 	}
@@ -340,7 +339,6 @@
 WMenu *wUserMenuGet(WScreen * scr, WWindow * wwin)
 {
 	WMenu *menu = NULL;
-	char buffer[100];
 	char *path = NULL;
 	char *tmp;
 	if (wwin->wm_instance && wwin->wm_class) {

Lines 101-106 Link Here

(-)x11-wm/windowmaker/pkg-plist (+6 lines)
101	include/WINGs/WINGsP.h	101	include/WINGs/WINGsP.h
102	include/WINGs/WUtil.h	102	include/WINGs/WUtil.h
103	include/wraster.h	103	include/wraster.h
		104	include/WMaker.h
104	lib/libWINGs.a	105	lib/libWINGs.a
105	lib/libWINGs.la	106	lib/libWINGs.la
106	lib/libWINGs.so	107	lib/libWINGs.so
Lines 113-118 Link Here
113	lib/libwraster.la	114	lib/libwraster.la
114	lib/libwraster.so	115	lib/libwraster.so
115	lib/libwraster.so.4	116	lib/libwraster.so.4
		117	lib/libWMaker.so.1
		118	lib/libWMaker.so
		119	lib/libWMaker.la
		120	lib/libWMaker.a
116	libdata/pkgconfig/WINGs.pc	121	libdata/pkgconfig/WINGs.pc
117	libdata/pkgconfig/wrlib.pc	122	libdata/pkgconfig/wrlib.pc
118	share/WINGs/Images.tiff	123	share/WINGs/Images.tiff
Lines 331-336 Link Here
331	share/locale/pl/LC_MESSAGES/WindowMaker.mo	336	share/locale/pl/LC_MESSAGES/WindowMaker.mo
332	share/locale/pt/LC_MESSAGES/WPrefs.mo	337	share/locale/pt/LC_MESSAGES/WPrefs.mo
333	share/locale/pt/LC_MESSAGES/WindowMaker.mo	338	share/locale/pt/LC_MESSAGES/WindowMaker.mo
		339	share/locale/pt/LC_MESSAGES/wmgenmenu.mo
334	share/locale/ro/LC_MESSAGES/WindowMaker.mo	340	share/locale/ro/LC_MESSAGES/WindowMaker.mo
335	share/locale/ru/LC_MESSAGES/WPrefs.mo	341	share/locale/ru/LC_MESSAGES/WPrefs.mo
336	share/locale/ru/LC_MESSAGES/WindowMaker.mo	342	share/locale/ru/LC_MESSAGES/WindowMaker.mo

Return to bug 172421

Lines 1-12 Link Here

(-)x11-wm/windowmaker/Makefile (-14 / +22 lines)
1	# New ports collection makefile for: Window Maker	1	# Created by: Brian Handy <handy@physics.montana.edu>
2	# Date created: August 13, 1997
3	# Whom: Brian Handy <handy@physics.montana.edu>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6		3
7	PORTNAME?= windowmaker	4	PORTNAME?= windowmaker
8	PORTVERSION= 0.95.2	5	PORTVERSION= 0.95.3
9	PORTREVISION?= 4	6	PORTREVISION?= 0
10	CATEGORIES= x11-wm windowmaker	7	CATEGORIES= x11-wm windowmaker
11	MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/	8	MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/
12	MASTER_SITE_SUBDIR= source/release	9	MASTER_SITE_SUBDIR= source/release
Lines 23-36 Link Here
23	.if !defined(LWR_SLAVE)	20	.if !defined(LWR_SLAVE)
24	RUN_DEPENDS= ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons	21	RUN_DEPENDS= ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
25	USE_PERL5= yes	22	USE_PERL5= yes
26		23	OPTIONS_DEFINE= XRANDR
27	OPTIONS= XRANDR "xrandr support (EXPERIMENTAL)" off
28	.endif	24	.endif
29		25
30	MAKE_JOBS_SAFE= yes	26	MAKE_JOBS_SAFE= yes
31		27
32	USE_AUTOTOOLS= libtool	28	USE_AUTOTOOLS= libtool
33	USE_BZIP2= yes
34	USE_GNOME= gnomehack	29	USE_GNOME= gnomehack
35	USE_XORG= xft xinerama xmu xpm	30	USE_XORG= xft xinerama xmu xpm
36	USE_GETTEXT= yes	31	USE_GETTEXT= yes
Lines 60-83 Link Here
60	BROKEN= does not compile on FreeBSD 7.X	55	BROKEN= does not compile on FreeBSD 7.X
61	.endif	56	.endif
62		57
63	.if defined(WITH_XRANDR)	58	.if ${PORT_OPTIONS:MXRANDR}
64	USE_XORG+= xrandr	59	USE_XORG+= xrandr
65	CONFIGURE_ARGS+= --enable-xrandr	60	CONFIGURE_ARGS+= --enable-xrandr
66	.endif	61	.endif
67		62
68	CONFLICTS= libwraster-0.*	63	CONFLICTS= libwraster-0.*
69		64
70	MANLANG= "" cs ru sk	65	MANLANG= "" cs sk ru
71	MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \	66	MAN1_EN= geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
72	wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x	67	wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x get-wings-flags.1 \
		68	get-wraster-flags.1 get-wutil-flags.1 wdread.1 WindowMaker.1x \
		69	wmagnify.1x wmgenmenu.1 wmmenugen.1 WPrefs.1x
73		70
		71	MAN8_EN= upgrade-windowmaker-defaults.8
		72
		73	MAN1_CS= geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
		74	wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
		75
		76	MAN1_SK= geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
		77	wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
		78
		79	MAN1_RU= geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
		80	wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
		81
74	PORTDOCS= AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \	82	PORTDOCS= AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
75	INSTALL-WMAKER NEWS README README.definable-cursor TODO	83	INSTALL-WMAKER NEWS README README.definable-cursor TODO
76		84
77	LINGUAS= be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW	85	LINGUAS= be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
78	CONFIGURE_ENV+= LINGUAS="${LINGUAS}"	86	CONFIGURE_ENV+= LINGUAS="${LINGUAS}"
79		87
80	pre-patch:	88	post-patch:
81	.for f in WINGs/wapplication.c WPrefs.app/Menu.c WPrefs.app/Paths.c \	89	.for f in WINGs/wapplication.c WPrefs.app/Menu.c WPrefs.app/Paths.c \
82	WindowMaker/menu	90	WindowMaker/menu
83	@${REINPLACE_CMD} -e "s#/usr/local#${PREFIX}#g" ${WRKSRC}/${f}	91	@${REINPLACE_CMD} -e "s#/usr/local#${PREFIX}#g" ${WRKSRC}/${f}

Lines 1-94 Link Here

(-)x11-wm/windowmaker/files/patch-clang-warnings (-94 lines)
1	diff -ur ../WindowMaker-0.95.2-pre-clang/src/actions.c ./src/actions.c
2	--- ../WindowMaker-0.95.2-pre-clang/src/actions.c 2012-02-14 11:36:01.000000000 -0800
3	+++ ./src/actions.c 2012-02-25 02:29:30.000000000 -0800
4	@@ -60,6 +60,9 @@
5	unsigned int new_width, unsigned int new_height);
6	static void save_old_geometry(WWindow *wwin);
7
8	+/* In usermenu.c */
9	+void wUserMenuRefreshInstances(WMenu * menu, WWindow * wwin);
10	+
11	/***** Local Variables *****/
12	static struct {
13	int steps;
14	diff -ur ../WindowMaker-0.95.2-pre-clang/src/event.c ./src/event.c
15	--- ../WindowMaker-0.95.2-pre-clang/src/event.c 2012-02-14 11:36:01.000000000 -0800
16	+++ ./src/event.c 2012-02-25 02:30:58.000000000 -0800
17	@@ -130,9 +130,11 @@
18	static void handleFocusIn(XEvent *event);
19	static void handleMotionNotify(XEvent *event);
20	static void handleVisibilityNotify(XEvent *event);
21	-static void handle_inotify_events(int fd, int wd);
22	static void wdelete_death_handler(WMagicNumber id);
23
24	+#ifdef HAVE_INOTIFY
25	+static void handle_inotify_events(int fd, int wd);
26	+#endif
27
28	#ifdef SHAPE
29	static void handleShapeNotify(XEvent *event);
30	diff -ur ../WindowMaker-0.95.2-pre-clang/src/osdep_bsd.c ./src/osdep_bsd.c
31	--- ../WindowMaker-0.95.2-pre-clang/src/osdep_bsd.c 2012-02-14 11:36:01.000000000 -0800
32	+++ ./src/osdep_bsd.c 2012-02-25 02:31:25.000000000 -0800
33	@@ -85,7 +85,7 @@
34	mib[0] = CTL_KERN;
35	mib[1] = KERN_ARGMAX;
36	mib[2] = 0;
37	- mib[4] = 0;
38	+ mib[3] = 0;
39
40	count = sizeof(argmax);
41	if (sysctl(mib, 2, &argmax, &count, NULL, 0) == -1)
42	diff -ur ../WindowMaker-0.95.2-pre-clang/src/usermenu.c ./src/usermenu.c
43	--- ../WindowMaker-0.95.2-pre-clang/src/usermenu.c 2012-02-14 11:36:01.000000000 -0800
44	+++ ./src/usermenu.c 2012-02-25 02:37:25.000000000 -0800
45	@@ -82,6 +82,9 @@
46	/* var */
47	extern WPreferences wPreferences;
48
49	+/* In xmodifier.c */
50	+int wXModifierFromKey(char *key);
51	+
52	typedef struct {
53	WScreen *screen;
54	WShortKey *key;
55	@@ -133,7 +136,6 @@
56	WUserMenuData *data;
57	KeySym ksym;
58	char *k;
59	- char *buffer;
60	char buf[MAX_SHORTCUT_LENGTH], *b;
61	int keycount, i, j, mod;
62
63	@@ -283,7 +285,6 @@
64
65	void wUserMenuRefreshInstances(WMenu * menu, WWindow * wwin)
66	{
67	- WMenuEntry *entry;
68	int i, j, count, paintflag;
69
70	paintflag = 0;
71	@@ -324,13 +325,11 @@
72	static WMenu readUserMenuFile(WScreen scr, char *file_name)
73	{
74	WMenu *menu;
75	- char *mtitle;
76	- WMPropList plum, elem, title, command, *params;
77	- int count, i;
78	+ WMPropList *plum;
79
80	menu = NULL;
81	plum = WMReadPropListFromFile(file_name);
82	- /**/ if (plum) {
83	+ if (plum) {
84	menu = configureUserMenu(scr, plum);
85	WMReleasePropList(plum);
86	}
87	@@ -340,7 +339,6 @@
88	WMenu wUserMenuGet(WScreen scr, WWindow * wwin)
89	{
90	WMenu *menu = NULL;
91	- char buffer[100];
92	char *path = NULL;
93	char *tmp;
94	if (wwin->wm_instance && wwin->wm_class) {