Attachment 138411 Details for Bug 184359 – file.diff

[patch] file.diff

file.diff (text/plain), 6.37 KB, created by Renato Botelho on 2013-11-28 18:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2013-11-28 18:20:00 UTC

Size: 6.37 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 335073)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	windowmaker
>-PORTVERSION=	0.95.4
>-PORTREVISION=	1
>+PORTVERSION=	0.95.5
> CATEGORIES=	x11-wm windowmaker
> MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
> MASTER_SITE_SUBDIR=	source/release
>@@ -40,7 +39,6 @@
> 
> OPTIONS_DEFINE=	DOCS NLS XRANDR
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${ARCH} == amd64 && ${OSVERSION} < 800000
>@@ -67,26 +65,11 @@
> 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} \
>-		${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
>-		${PREFIX}/share/WindowMaker/Sounds
>-.if ${PORT_OPTIONS:MDOCS}
>-	@${MKDIR} ${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>-.endif
>+		${STAGEDIR}${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
>+		${STAGEDIR}${PREFIX}/share/WindowMaker/Sounds
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 335073)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (WindowMaker-0.95.4.tar.gz) = 2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45
>-SIZE (WindowMaker-0.95.4.tar.gz) = 2789390
>+SHA256 (WindowMaker-0.95.5.tar.gz) = 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0
>+SIZE (WindowMaker-0.95.5.tar.gz) = 2927995
>Index: files/patch-WINGs__proplist.c
>===================================================================
>--- files/patch-WINGs__proplist.c	(revision 335073)
>+++ files/patch-WINGs__proplist.c	(working copy)
>@@ -1,20 +0,0 @@
>---- 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);
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 335073)
>+++ files/patch-configure	(working copy)
>@@ -1,23 +0,0 @@
>---- 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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 335073)
>+++ pkg-plist	(working copy)
>@@ -10,7 +10,9 @@
> 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
>@@ -111,8 +113,53 @@
> lib/libWUtil.a
> lib/libWUtil.la
> lib/libWUtil.so
>-lib/libWUtil.so.2
>+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
>@@ -121,6 +168,7 @@
> 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
>@@ -362,3 +410,7 @@
> @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

Actions: View | Diff

Attachments on bug 184359: 138411