Attachment #138411 for bug #184359

View | Details | Raw Unified | Return to bug 184359
Collapse All | Expand All




# $FreeBSD$

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


OPTIONS_DEFINE=	DOCS NLS XRANDR

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${ARCH} == amd64 && ${OSVERSION} < 800000

CONFIGURE_ARGS+=--enable-xrandr
.endif

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-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

post-install:
	@${MKDIR} \
		${STAGEDIR}${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
		${STAGEDIR}${PREFIX}/share/WindowMaker/Sounds
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (WindowMaker-0.95.4.tar.gz) = 2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45	1	SHA256 (WindowMaker-0.95.5.tar.gz) = 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0
2	SIZE (WindowMaker-0.95.4.tar.gz) = 2789390	2	SIZE (WindowMaker-0.95.5.tar.gz) = 2927995




--- WINGs/proplist.c.orig	2013-05-03 02:48:24.000000000 +0900
+++ WINGs/proplist.c	2013-05-03 02:52:24.000000000 +0900
@@ -1162,7 +1162,7 @@
 	WMPropList *key, *value, *dvalue;
 	WMHashEnumerator e;
 
-	wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
+	wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL);
 
 	if (source == dest)
 		return dest;
@@ -1189,7 +1189,7 @@
 	WMPropList *key, *value, *dvalue;
 	WMHashEnumerator e;
 
-	wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
+	wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL);
 
 	if (source == dest) {
 		WMPropList *keys = WMGetPLDictionaryKeys(dest);




--- configure.orig	2013-05-02 15:16:38.000000000 +0900
+++ configure	2013-05-02 15:17:26.000000000 +0900
@@ -12042,20 +12042,6 @@
 fi
 
 
-for ac_header in sys/inotify.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_INOTIFY_H 1
-_ACEOF
-
-$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h
-
-fi
-
-done
-
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5




GNUstep/Applications/WPrefs.app/tiff/configs.tiff
GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff
GNUstep/Applications/WPrefs.app/tiff/dock.tiff
GNUstep/Applications/WPrefs.app/tiff/dockclipdrawersection.tiff
GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff
GNUstep/Applications/WPrefs.app/tiff/drawer.tiff
GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff
GNUstep/Applications/WPrefs.app/tiff/expert.tiff
GNUstep/Applications/WPrefs.app/tiff/fonts.tiff

lib/libWUtil.a
lib/libWUtil.la
lib/libWUtil.so
lib/libWUtil.so.3
libdata/pkgconfig/WINGs.pc
man/cs/man1/geticonset.1x.gz
man/cs/man1/getstyle.1x.gz
man/cs/man1/seticons.1x.gz
man/cs/man1/setstyle.1x.gz
man/cs/man1/wdwrite.1x.gz
man/cs/man1/wmaker.1x.gz
man/cs/man1/wmsetbg.1x.gz
man/cs/man1/wxcopy.1x.gz
man/cs/man1/wxpaste.1x.gz
man/man1/WPrefs.1x.gz
man/man1/WindowMaker.1x.gz
man/man1/get-wings-flags.1.gz
man/man1/get-wutil-flags.1.gz
man/man1/geticonset.1x.gz
man/man1/getstyle.1x.gz
man/man1/seticons.1x.gz
man/man1/setstyle.1x.gz
man/man1/wdread.1.gz
man/man1/wdwrite.1x.gz
man/man1/wmagnify.1x.gz
man/man1/wmaker.1x.gz
man/man1/wmgenmenu.1.gz
man/man1/wmmenugen.1.gz
man/man1/wmsetbg.1x.gz
man/man1/wxcopy.1x.gz
man/man1/wxpaste.1x.gz
man/man8/upgrade-windowmaker-defaults.8.gz
man/ru/man1/geticonset.1x.gz
man/ru/man1/getstyle.1x.gz
man/ru/man1/seticons.1x.gz
man/ru/man1/setstyle.1x.gz
man/ru/man1/wdwrite.1x.gz
man/ru/man1/wmaker.1x.gz
man/ru/man1/wmsetbg.1x.gz
man/ru/man1/wxcopy.1x.gz
man/ru/man1/wxpaste.1x.gz
man/sk/man1/geticonset.1x.gz
man/sk/man1/getstyle.1x.gz
man/sk/man1/seticons.1x.gz
man/sk/man1/setstyle.1x.gz
man/sk/man1/wdwrite.1x.gz
man/sk/man1/wmaker.1x.gz
man/sk/man1/wmsetbg.1x.gz
man/sk/man1/wxcopy.1x.gz
man/sk/man1/wxpaste.1x.gz
share/WINGs/Images.tiff
share/WINGs/Images.xpm
share/WINGs/defaultIcon.tiff

share/WindowMaker/IconSets/Default.iconset
share/WindowMaker/Icons/BitchX.tiff
share/WindowMaker/Icons/BitchX.xpm
share/WindowMaker/Icons/Drawer.png
share/WindowMaker/Icons/Ear.png
share/WindowMaker/Icons/Ftp.png
share/WindowMaker/Icons/GNUstep.tiff

@dirrm GNUstep/Applications/WPrefs.app
@dirrm GNUstep/Applications
@dirrm GNUstep
@dirrmtry share/WindowMaker/Themes
@dirrmtry share/WindowMaker/Pixmaps
@dirrmtry share/WindowMaker/Icons
@dirrmtry share/WindowMaker

Return to bug 184359

Lines 2-9 Link Here

(-)Makefile (-22 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= windowmaker	4	PORTNAME= windowmaker
5	PORTVERSION= 0.95.4	5	PORTVERSION= 0.95.5
6	PORTREVISION= 1
7	CATEGORIES= x11-wm windowmaker	6	CATEGORIES= x11-wm windowmaker
8	MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/	7	MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/
9	MASTER_SITE_SUBDIR= source/release	8	MASTER_SITE_SUBDIR= source/release
Lines 40-46 Link Here
40		39
41	OPTIONS_DEFINE= DOCS NLS XRANDR	40	OPTIONS_DEFINE= DOCS NLS XRANDR
42		41
43	NO_STAGE= yes
44	.include <bsd.port.options.mk>	42	.include <bsd.port.options.mk>
45		43
46	.if ${ARCH} == amd64 && ${OSVERSION} < 800000	44	.if ${ARCH} == amd64 && ${OSVERSION} < 800000
Lines 67-92 Link Here
67	CONFIGURE_ARGS+=--enable-xrandr	65	CONFIGURE_ARGS+=--enable-xrandr
68	.endif	66	.endif
69		67
70	MANLANG= "" cs sk ru
71	MAN1_EN= geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
72	wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x get-wings-flags.1 \
73	get-wutil-flags.1 wdread.1 WindowMaker.1x wmagnify.1x \
74	wmgenmenu.1 wmmenugen.1 WPrefs.1x
75	MAN8_EN= upgrade-windowmaker-defaults.8
76	MAN1_CS= geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
77	wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
78	MAN1_SK= geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
79	wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
80	MAN1_RU= geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
81	wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
82
83	post-install:	68	post-install:
84	@${MKDIR} \	69	@${MKDIR} \
85	${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \	70	${STAGEDIR}${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
86	${PREFIX}/share/WindowMaker/Sounds	71	${STAGEDIR}${PREFIX}/share/WindowMaker/Sounds
87	.if ${PORT_OPTIONS:MDOCS}	72	@${MKDIR} ${STAGEDIR}${DOCSDIR}
88	@${MKDIR} ${DOCSDIR}	73	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
89	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
90	.endif
91		74
92	.include <bsd.port.mk>	75	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)files/patch-WINGs__proplist.c (-20 lines)
1	--- WINGs/proplist.c.orig 2013-05-03 02:48:24.000000000 +0900
2	+++ WINGs/proplist.c 2013-05-03 02:52:24.000000000 +0900
3	@@ -1162,7 +1162,7 @@
4	WMPropList key, value, *dvalue;
5	WMHashEnumerator e;
6
7	- wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
8	+ wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL);
9
10	if (source == dest)
11	return dest;
12	@@ -1189,7 +1189,7 @@
13	WMPropList key, value, *dvalue;
14	WMHashEnumerator e;
15
16	- wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
17	+ wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL);
18
19	if (source == dest) {
20	WMPropList *keys = WMGetPLDictionaryKeys(dest);

Lines 1-23 Link Here

(-)files/patch-configure (-23 lines)
1	--- configure.orig 2013-05-02 15:16:38.000000000 +0900
2	+++ configure 2013-05-02 15:17:26.000000000 +0900
3	@@ -12042,20 +12042,6 @@
4	fi
5
6
7	-for ac_header in sys/inotify.h
8	-do :
9	- ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
10	-if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
11	- cat >>confdefs.h <<_ACEOF
12	-#define HAVE_SYS_INOTIFY_H 1
13	-_ACEOF
14	-
15	-$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h
16	-
17	-fi
18	-
19	-done
20	-
21
22
23	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5

Lines 10-16 Link Here

(-)pkg-plist (-1 / +53 lines)
10	GNUstep/Applications/WPrefs.app/tiff/configs.tiff	10	GNUstep/Applications/WPrefs.app/tiff/configs.tiff
11	GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff	11	GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff
12	GNUstep/Applications/WPrefs.app/tiff/dock.tiff	12	GNUstep/Applications/WPrefs.app/tiff/dock.tiff
		13	GNUstep/Applications/WPrefs.app/tiff/dockclipdrawersection.tiff
13	GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff	14	GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff
		15	GNUstep/Applications/WPrefs.app/tiff/drawer.tiff
14	GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff	16	GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff
15	GNUstep/Applications/WPrefs.app/tiff/expert.tiff	17	GNUstep/Applications/WPrefs.app/tiff/expert.tiff
16	GNUstep/Applications/WPrefs.app/tiff/fonts.tiff	18	GNUstep/Applications/WPrefs.app/tiff/fonts.tiff
Lines 111-118 Link Here
111	lib/libWUtil.a	113	lib/libWUtil.a
112	lib/libWUtil.la	114	lib/libWUtil.la
113	lib/libWUtil.so	115	lib/libWUtil.so
114	lib/libWUtil.so.2	116	lib/libWUtil.so.3
115	libdata/pkgconfig/WINGs.pc	117	libdata/pkgconfig/WINGs.pc
		118	man/cs/man1/geticonset.1x.gz
		119	man/cs/man1/getstyle.1x.gz
		120	man/cs/man1/seticons.1x.gz
		121	man/cs/man1/setstyle.1x.gz
		122	man/cs/man1/wdwrite.1x.gz
		123	man/cs/man1/wmaker.1x.gz
		124	man/cs/man1/wmsetbg.1x.gz
		125	man/cs/man1/wxcopy.1x.gz
		126	man/cs/man1/wxpaste.1x.gz
		127	man/man1/WPrefs.1x.gz
		128	man/man1/WindowMaker.1x.gz
		129	man/man1/get-wings-flags.1.gz
		130	man/man1/get-wutil-flags.1.gz
		131	man/man1/geticonset.1x.gz
		132	man/man1/getstyle.1x.gz
		133	man/man1/seticons.1x.gz
		134	man/man1/setstyle.1x.gz
		135	man/man1/wdread.1.gz
		136	man/man1/wdwrite.1x.gz
		137	man/man1/wmagnify.1x.gz
		138	man/man1/wmaker.1x.gz
		139	man/man1/wmgenmenu.1.gz
		140	man/man1/wmmenugen.1.gz
		141	man/man1/wmsetbg.1x.gz
		142	man/man1/wxcopy.1x.gz
		143	man/man1/wxpaste.1x.gz
		144	man/man8/upgrade-windowmaker-defaults.8.gz
		145	man/ru/man1/geticonset.1x.gz
		146	man/ru/man1/getstyle.1x.gz
		147	man/ru/man1/seticons.1x.gz
		148	man/ru/man1/setstyle.1x.gz
		149	man/ru/man1/wdwrite.1x.gz
		150	man/ru/man1/wmaker.1x.gz
		151	man/ru/man1/wmsetbg.1x.gz
		152	man/ru/man1/wxcopy.1x.gz
		153	man/ru/man1/wxpaste.1x.gz
		154	man/sk/man1/geticonset.1x.gz
		155	man/sk/man1/getstyle.1x.gz
		156	man/sk/man1/seticons.1x.gz
		157	man/sk/man1/setstyle.1x.gz
		158	man/sk/man1/wdwrite.1x.gz
		159	man/sk/man1/wmaker.1x.gz
		160	man/sk/man1/wmsetbg.1x.gz
		161	man/sk/man1/wxcopy.1x.gz
		162	man/sk/man1/wxpaste.1x.gz
116	share/WINGs/Images.tiff	163	share/WINGs/Images.tiff
117	share/WINGs/Images.xpm	164	share/WINGs/Images.xpm
118	share/WINGs/defaultIcon.tiff	165	share/WINGs/defaultIcon.tiff
Lines 121-126 Link Here
121	share/WindowMaker/IconSets/Default.iconset	168	share/WindowMaker/IconSets/Default.iconset
122	share/WindowMaker/Icons/BitchX.tiff	169	share/WindowMaker/Icons/BitchX.tiff
123	share/WindowMaker/Icons/BitchX.xpm	170	share/WindowMaker/Icons/BitchX.xpm
		171	share/WindowMaker/Icons/Drawer.png
124	share/WindowMaker/Icons/Ear.png	172	share/WindowMaker/Icons/Ear.png
125	share/WindowMaker/Icons/Ftp.png	173	share/WindowMaker/Icons/Ftp.png
126	share/WindowMaker/Icons/GNUstep.tiff	174	share/WindowMaker/Icons/GNUstep.tiff
Lines 362-364 Link Here
362	@dirrm GNUstep/Applications/WPrefs.app	410	@dirrm GNUstep/Applications/WPrefs.app
363	@dirrm GNUstep/Applications	411	@dirrm GNUstep/Applications
364	@dirrm GNUstep	412	@dirrm GNUstep
		413	@dirrmtry share/WindowMaker/Themes
		414	@dirrmtry share/WindowMaker/Pixmaps
		415	@dirrmtry share/WindowMaker/Icons
		416	@dirrmtry share/WindowMaker