Changes 0.95.5: * Window Maker can now maximize windows to the top/bottom halves of the screen as well as to the corners (top left, top right etc). The keyboard shortcuts to do that can be configured via WPrefs * Support for drawers in the dock has been added * Keyboard shortcuts to move windows between workspaces * Window border colours and width are now configurable * The menu is now able to parse command-generated proplist style menus. WPrefs support for this has been added too * Plus a few other new features and a lot of bug fixes and code cleanups by various people.diff -r1.104 -r1.105 pkgsrc/wm/windowmaker/Makefile
(adam)
@@ -1,25 +1,24 @@ | @@ -1,25 +1,24 @@ | |||
1 | # $NetBSD: Makefile,v 1.104 2013/07/05 13:29:43 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.105 2014/01/17 08:48:06 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= WindowMaker-0.95.4 | 3 | DISTNAME= WindowMaker-0.95.5 | |
4 | PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} | 4 | PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} | |
5 | PKGREVISION= 5 | |||
6 | CATEGORIES= x11 wm windowmaker | 5 | CATEGORIES= x11 wm windowmaker | |
7 | MASTER_SITES= http://windowmaker.info/pub/source/release/ | 6 | MASTER_SITES= http://windowmaker.info/pub/source/release/ | |
8 | EXTRACT_SUFX= .tar.gz | |||
9 | 7 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.windowmaker.info/ | 9 | HOMEPAGE= http://www.windowmaker.info/ | |
12 | COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone | 10 | COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone | |
11 | LICENSE= gnu-gpl-v2 | |||
13 | 12 | |||
14 | BROKEN_GETTEXT_DETECTION= yes | 13 | BROKEN_GETTEXT_DETECTION= yes | |
15 | 14 | |||
16 | USE_TOOLS+= msgfmt pkg-config xgettext | 15 | USE_TOOLS+= msgfmt pkg-config xgettext | |
17 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
18 | USE_PKGLOCALEDIR= yes | 17 | USE_PKGLOCALEDIR= yes | |
19 | GNU_CONFIGURE= yes | 18 | GNU_CONFIGURE= yes | |
20 | CONFIGURE_ARGS+= --enable-usermenu | 19 | CONFIGURE_ARGS+= --enable-usermenu | |
21 | CONFIGURE_ARGS+= --enable-xinerama | 20 | CONFIGURE_ARGS+= --enable-xinerama | |
22 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} | 21 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} | |
23 | CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep | 22 | CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep | |
24 | CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale | 23 | CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale | |
25 | CONFIGURE_ENV+= LINGUAS="bg ca cs cz da de el es et fi fr gl he hr hu it ja ko nl ms no pl pt ro ru se sk sl sv tr zh_CN zh_TW" | 24 | CONFIGURE_ENV+= LINGUAS="bg ca cs cz da de el es et fi fr gl he hr hu it ja ko nl ms no pl pt ro ru se sk sl sv tr zh_CN zh_TW" | |
@@ -55,52 +54,53 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCON | @@ -55,52 +54,53 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCON | |||
55 | # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options | 54 | # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options | |
56 | # to support. Currently supported options: | 55 | # to support. Currently supported options: | |
57 | # | 56 | # | |
58 | # vdesktop enable support for virtual desktop. | 57 | # vdesktop enable support for virtual desktop. | |
59 | 58 | |||
60 | WINDOWMAKER_OPTIONS?= vdesktop | 59 | WINDOWMAKER_OPTIONS?= vdesktop | |
61 | 60 | |||
62 | BUILD_DEFS+= WINDOWMAKER_OPTIONS | 61 | BUILD_DEFS+= WINDOWMAKER_OPTIONS | |
63 | 62 | |||
64 | .for option in ${WINDOWMAKER_OPTIONS} | 63 | .for option in ${WINDOWMAKER_OPTIONS} | |
65 | CONFIGURE_ARGS+= --enable-${option} | 64 | CONFIGURE_ARGS+= --enable-${option} | |
66 | .endfor | 65 | .endfor | |
67 | 66 | |||
68 | post-extract: | 67 | SUBST_CLASSES+= fix-path | |
68 | SUBST_STAGE.fix-path= pre-configure | |||
69 | SUBST_MESSAGE.fix-path= Fixing absolute paths. | |||
70 | SUBST_FILES.fix-path= WINGs/wapplication.c | |||
71 | SUBST_FILES.fix-path+= WindowMaker/Defaults/WindowMaker.in | |||
72 | SUBST_FILES.fix-path+= WPrefs.app/Paths.c | |||
73 | SUBST_FILES.fix-path+= WindowMaker/menu* | |||
74 | SUBST_FILES.fix-path+= WindowMaker/plmenu* | |||
75 | SUBST_SED.fix-path= -e 's,/usr/local,${PREFIX},g' | |||
76 | SUBST_SED.fix-path+= -e 's,${PREFIX}/GNUstep,${PREFIX}/share/GNUstep,g' | |||
77 | ||||
78 | pre-configure: | |||
69 | ${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \ | 79 | ${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \ | |
70 | ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \ | 80 | ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \ | |
71 | ${WRKSRC}/WindowMaker/Defaults/WindowMaker \ | 81 | ${WRKSRC}/WindowMaker/Defaults/WindowMaker \ | |
72 | ${WRKSRC}/po/zh_TW.Big5.po | 82 | ${WRKSRC}/po/zh_TW.Big5.po | |
73 | set -e; \ | 83 | set -e; \ | |
74 | for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \ | 84 | for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \ | |
75 | do \ | 85 | do \ | |
76 | ${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \ | 86 | ${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \ | |
77 | done; | 87 | done; | |
78 | set -e; \ | |||
79 | cd ${WRKSRC} && \ | |||
80 | for f in WINGs/wapplication.c WindowMaker/Defaults/WindowMaker.in \ | |||
81 | WPrefs.app/Paths.c WindowMaker/menu* WindowMaker/plmenu*; do \ | |||
82 | ${SED} -e "s|/usr/local|${PREFIX}|g" \ | |||
83 | -e "s|${PREFIX}/GNUstep|${PREFIX}/share/GNUstep|g" \ | |||
84 | "$$f" > "$$f".new && \ | |||
85 | ${MV} "$$f".new "$$f"; \ | |||
86 | done | |||
87 | 88 | |||
88 | post-install: | 89 | post-install: | |
89 | ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/SoundSets/.directory | 90 | ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/SoundSets/.directory | |
90 | ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/Sounds/.directory | 91 | ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/Sounds/.directory | |
91 | cd ${WRKSRC} && \ | 92 | cd ${WRKSRC} && \ | |
92 | ${INSTALL_DATA} \ | 93 | ${INSTALL_DATA} README README.definable-cursor FAQ FAQ.I18N \ | |
93 | README README.definable-cursor FAQ FAQ.I18N \ | |||
94 | ${DESTDIR}${PREFIX}/share/doc/WindowMaker | 94 | ${DESTDIR}${PREFIX}/share/doc/WindowMaker | |
95 | 95 | |||
96 | .include "../../converters/libiconv/buildlink3.mk" | 96 | .include "../../converters/libiconv/buildlink3.mk" | |
97 | .include "../../devel/gettext-lib/buildlink3.mk" | 97 | .include "../../devel/gettext-lib/buildlink3.mk" | |
98 | .include "../../mk/giflib.buildlink3.mk" | 98 | .include "../../mk/giflib.buildlink3.mk" | |
99 | .include "../../mk/jpeg.buildlink3.mk" | 99 | .include "../../mk/jpeg.buildlink3.mk" | |
100 | .include "../../graphics/png/buildlink3.mk" | 100 | .include "../../graphics/png/buildlink3.mk" | |
101 | .include "../../graphics/tiff/buildlink3.mk" | 101 | .include "../../graphics/tiff/buildlink3.mk" | |
102 | .include "../../x11/libX11/buildlink3.mk" | 102 | .include "../../x11/libX11/buildlink3.mk" | |
103 | .include "../../x11/libXext/buildlink3.mk" | 103 | .include "../../x11/libXext/buildlink3.mk" | |
104 | .include "../../x11/libXft/buildlink3.mk" | 104 | .include "../../x11/libXft/buildlink3.mk" | |
105 | .include "../../x11/libXinerama/buildlink3.mk" | 105 | .include "../../x11/libXinerama/buildlink3.mk" | |
106 | .include "../../x11/libXmu/buildlink3.mk" | 106 | .include "../../x11/libXmu/buildlink3.mk" |
@@ -1,77 +1,73 @@ | @@ -1,77 +1,73 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.18 2013/05/21 14:38:40 hans Exp $ | 1 | @comment $NetBSD: PLIST,v 1.19 2014/01/17 08:48:06 adam Exp $ | |
2 | bin/convertfonts | 2 | bin/convertfonts | |
3 | bin/get-wings-flags | 3 | bin/get-wings-flags | |
4 | bin/get-wraster-flags | 4 | bin/get-wraster-flags | |
5 | bin/get-wutil-flags | 5 | bin/get-wutil-flags | |
6 | bin/geticonset | 6 | bin/geticonset | |
7 | bin/getstyle | 7 | bin/getstyle | |
8 | bin/seticons | 8 | bin/seticons | |
9 | bin/setstyle | 9 | bin/setstyle | |
10 | bin/wdread | 10 | bin/wdread | |
11 | bin/wdwrite | 11 | bin/wdwrite | |
12 | bin/wkdemenu.pl | 12 | bin/wkdemenu.pl | |
13 | bin/wm-oldmenu2new | 13 | bin/wm-oldmenu2new | |
14 | bin/wmagnify | 14 | bin/wmagnify | |
15 | bin/wmaker | 15 | bin/wmaker | |
16 | bin/wmaker.inst | 16 | bin/wmaker.inst | |
17 | bin/wmgenmenu | 17 | bin/wmgenmenu | |
18 | bin/wmmenugen | 18 | bin/wmmenugen | |
19 | bin/wmsetbg | 19 | bin/wmsetbg | |
20 | bin/wxcopy | 20 | bin/wxcopy | |
21 | bin/wxpaste | 21 | bin/wxpaste | |
22 | include/WINGs/WINGs.h | 22 | include/WINGs/WINGs.h | |
23 | include/WINGs/WINGsP.h | 23 | include/WINGs/WINGsP.h | |
24 | include/WINGs/WUtil.h | 24 | include/WINGs/WUtil.h | |
25 | include/WMaker.h | 25 | include/WMaker.h | |
26 | include/wraster.h | 26 | include/wraster.h | |
27 | lib/libWINGs.la | 27 | lib/libWINGs.la | |
28 | lib/libWINGs.a | |||
29 | lib/libWMaker.a | |||
30 | lib/libWMaker.la | 28 | lib/libWMaker.la | |
31 | lib/libWUtil.a | |||
32 | lib/libWUtil.la | 29 | lib/libWUtil.la | |
33 | lib/libwraster.la | 30 | lib/libwraster.la | |
34 | lib/pkgconfig/WINGs.pc | 31 | lib/pkgconfig/WINGs.pc | |
35 | lib/pkgconfig/wrlib.pc | 32 | lib/pkgconfig/wrlib.pc | |
33 | man/cs/man1/geticonset.1 | |||
34 | man/cs/man1/getstyle.1 | |||
35 | man/cs/man1/seticons.1 | |||
36 | man/cs/man1/setstyle.1 | |||
37 | man/cs/man1/wdwrite.1 | |||
38 | man/cs/man1/wmaker.1 | |||
39 | man/cs/man1/wmsetbg.1 | |||
40 | man/cs/man1/wxcopy.1 | |||
41 | man/cs/man1/wxpaste.1 | |||
36 | man/man1/WPrefs.1 | 42 | man/man1/WPrefs.1 | |
37 | man/man1/WindowMaker.1 | 43 | man/man1/WindowMaker.1 | |
38 | man/man1/get-wings-flags.1 | 44 | man/man1/get-wings-flags.1 | |
39 | man/man1/get-wraster-flags.1 | 45 | man/man1/get-wraster-flags.1 | |
40 | man/man1/get-wutil-flags.1 | 46 | man/man1/get-wutil-flags.1 | |
41 | man/man1/geticonset.1 | 47 | man/man1/geticonset.1 | |
42 | man/man1/getstyle.1 | 48 | man/man1/getstyle.1 | |
43 | man/man1/seticons.1 | 49 | man/man1/seticons.1 | |
44 | man/man1/setstyle.1 | 50 | man/man1/setstyle.1 | |
45 | man/man1/wdwrite.1 | |||
46 | man/man1/wdread.1 | 51 | man/man1/wdread.1 | |
52 | man/man1/wdwrite.1 | |||
47 | man/man1/wmagnify.1 | 53 | man/man1/wmagnify.1 | |
48 | man/man1/wmaker.1 | 54 | man/man1/wmaker.1 | |
49 | man/man1/wmgenmenu.1 | 55 | man/man1/wmgenmenu.1 | |
50 | man/man1/wmmenugen.1 | 56 | man/man1/wmmenugen.1 | |
51 | man/man1/wmsetbg.1 | 57 | man/man1/wmsetbg.1 | |
52 | man/man1/wxcopy.1 | 58 | man/man1/wxcopy.1 | |
53 | man/man1/wxpaste.1 | 59 | man/man1/wxpaste.1 | |
54 | man/man8/upgrade-windowmaker-defaults.8 | 60 | man/man8/upgrade-windowmaker-defaults.8 | |
55 | man/cs/man1/geticonset.1 | |||
56 | man/cs/man1/getstyle.1 | |||
57 | man/cs/man1/seticons.1 | |||
58 | man/cs/man1/setstyle.1 | |||
59 | man/cs/man1/wdwrite.1 | |||
60 | man/cs/man1/wmaker.1 | |||
61 | man/cs/man1/wmaker.1 | |||
62 | man/cs/man1/wmsetbg.1 | |||
63 | man/cs/man1/wxcopy.1 | |||
64 | man/cs/man1/wxpaste.1 | |||
65 | man/ru/man1/geticonset.1 | 61 | man/ru/man1/geticonset.1 | |
66 | man/ru/man1/getstyle.1 | 62 | man/ru/man1/getstyle.1 | |
67 | man/ru/man1/seticons.1 | 63 | man/ru/man1/seticons.1 | |
68 | man/ru/man1/setstyle.1 | 64 | man/ru/man1/setstyle.1 | |
69 | man/ru/man1/wdwrite.1 | 65 | man/ru/man1/wdwrite.1 | |
70 | man/ru/man1/wmaker.1 | 66 | man/ru/man1/wmaker.1 | |
71 | man/ru/man1/wmsetbg.1 | 67 | man/ru/man1/wmsetbg.1 | |
72 | man/ru/man1/wxcopy.1 | 68 | man/ru/man1/wxcopy.1 | |
73 | man/ru/man1/wxpaste.1 | 69 | man/ru/man1/wxpaste.1 | |
74 | man/sk/man1/geticonset.1 | 70 | man/sk/man1/geticonset.1 | |
75 | man/sk/man1/getstyle.1 | 71 | man/sk/man1/getstyle.1 | |
76 | man/sk/man1/seticons.1 | 72 | man/sk/man1/seticons.1 | |
77 | man/sk/man1/setstyle.1 | 73 | man/sk/man1/setstyle.1 | |
@@ -80,27 +76,29 @@ man/sk/man1/wmaker.1 | @@ -80,27 +76,29 @@ man/sk/man1/wmaker.1 | |||
80 | man/sk/man1/wmsetbg.1 | 76 | man/sk/man1/wmsetbg.1 | |
81 | man/sk/man1/wxcopy.1 | 77 | man/sk/man1/wxcopy.1 | |
82 | man/sk/man1/wxpaste.1 | 78 | man/sk/man1/wxpaste.1 | |
83 | share/GNUstep/Applications/WPrefs.app/WPrefs | 79 | share/GNUstep/Applications/WPrefs.app/WPrefs | |
84 | share/GNUstep/Applications/WPrefs.app/WPrefs.tiff | 80 | share/GNUstep/Applications/WPrefs.app/WPrefs.tiff | |
85 | share/GNUstep/Applications/WPrefs.app/WPrefs.xpm | 81 | share/GNUstep/Applications/WPrefs.app/WPrefs.xpm | |
86 | share/GNUstep/Applications/WPrefs.app/tiff/advancetonewworkspace.tiff | 82 | share/GNUstep/Applications/WPrefs.app/tiff/advancetonewworkspace.tiff | |
87 | share/GNUstep/Applications/WPrefs.app/tiff/animations.tiff | 83 | share/GNUstep/Applications/WPrefs.app/tiff/animations.tiff | |
88 | share/GNUstep/Applications/WPrefs.app/tiff/appearance.tiff | 84 | share/GNUstep/Applications/WPrefs.app/tiff/appearance.tiff | |
89 | share/GNUstep/Applications/WPrefs.app/tiff/clip.tiff | 85 | share/GNUstep/Applications/WPrefs.app/tiff/clip.tiff | |
90 | share/GNUstep/Applications/WPrefs.app/tiff/configs.tiff | 86 | share/GNUstep/Applications/WPrefs.app/tiff/configs.tiff | |
91 | share/GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff | 87 | share/GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff | |
92 | share/GNUstep/Applications/WPrefs.app/tiff/dock.tiff | 88 | share/GNUstep/Applications/WPrefs.app/tiff/dock.tiff | |
89 | share/GNUstep/Applications/WPrefs.app/tiff/dockclipdrawersection.tiff | |||
93 | share/GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff | 90 | share/GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff | |
91 | share/GNUstep/Applications/WPrefs.app/tiff/drawer.tiff | |||
94 | share/GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff | 92 | share/GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff | |
95 | share/GNUstep/Applications/WPrefs.app/tiff/expert.tiff | 93 | share/GNUstep/Applications/WPrefs.app/tiff/expert.tiff | |
96 | share/GNUstep/Applications/WPrefs.app/tiff/fonts.tiff | 94 | share/GNUstep/Applications/WPrefs.app/tiff/fonts.tiff | |
97 | share/GNUstep/Applications/WPrefs.app/tiff/iconprefs.tiff | 95 | share/GNUstep/Applications/WPrefs.app/tiff/iconprefs.tiff | |
98 | share/GNUstep/Applications/WPrefs.app/tiff/keyboard.tiff | 96 | share/GNUstep/Applications/WPrefs.app/tiff/keyboard.tiff | |
99 | share/GNUstep/Applications/WPrefs.app/tiff/keyboardprefs.tiff | 97 | share/GNUstep/Applications/WPrefs.app/tiff/keyboardprefs.tiff | |
100 | share/GNUstep/Applications/WPrefs.app/tiff/keyshortcuts.tiff | 98 | share/GNUstep/Applications/WPrefs.app/tiff/keyshortcuts.tiff | |
101 | share/GNUstep/Applications/WPrefs.app/tiff/menualign1.tiff | 99 | share/GNUstep/Applications/WPrefs.app/tiff/menualign1.tiff | |
102 | share/GNUstep/Applications/WPrefs.app/tiff/menualign2.tiff | 100 | share/GNUstep/Applications/WPrefs.app/tiff/menualign2.tiff | |
103 | share/GNUstep/Applications/WPrefs.app/tiff/menuprefs.tiff | 101 | share/GNUstep/Applications/WPrefs.app/tiff/menuprefs.tiff | |
104 | share/GNUstep/Applications/WPrefs.app/tiff/menus.tiff | 102 | share/GNUstep/Applications/WPrefs.app/tiff/menus.tiff | |
105 | share/GNUstep/Applications/WPrefs.app/tiff/miscprefs2.tiff | 103 | share/GNUstep/Applications/WPrefs.app/tiff/miscprefs2.tiff | |
106 | share/GNUstep/Applications/WPrefs.app/tiff/moreanim.tiff | 104 | share/GNUstep/Applications/WPrefs.app/tiff/moreanim.tiff | |
@@ -150,26 +148,27 @@ share/GNUstep/Applications/WPrefs.app/ti | @@ -150,26 +148,27 @@ share/GNUstep/Applications/WPrefs.app/ti | |||
150 | share/GNUstep/Applications/WPrefs.app/tiff/whandling.tiff | 148 | share/GNUstep/Applications/WPrefs.app/tiff/whandling.tiff | |
151 | share/GNUstep/Applications/WPrefs.app/tiff/windowfocus.tiff | 149 | share/GNUstep/Applications/WPrefs.app/tiff/windowfocus.tiff | |
152 | share/GNUstep/Applications/WPrefs.app/tiff/workspace.tiff | 150 | share/GNUstep/Applications/WPrefs.app/tiff/workspace.tiff | |
153 | share/GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff | 151 | share/GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff | |
154 | share/GNUstep/Applications/WPrefs.app/tiff/xis.tiff | 152 | share/GNUstep/Applications/WPrefs.app/tiff/xis.tiff | |
155 | share/WINGs/Images.tiff | 153 | share/WINGs/Images.tiff | |
156 | share/WINGs/Images.xpm | 154 | share/WINGs/Images.xpm | |
157 | share/WINGs/defaultIcon.tiff | 155 | share/WINGs/defaultIcon.tiff | |
158 | share/WINGs/defaultIcon.xpm | 156 | share/WINGs/defaultIcon.xpm | |
159 | share/WindowMaker/Backgrounds/BlueImage.jpeg | 157 | share/WindowMaker/Backgrounds/BlueImage.jpeg | |
160 | share/WindowMaker/IconSets/Default.iconset | 158 | share/WindowMaker/IconSets/Default.iconset | |
161 | share/WindowMaker/Icons/BitchX.tiff | 159 | share/WindowMaker/Icons/BitchX.tiff | |
162 | share/WindowMaker/Icons/BitchX.xpm | 160 | share/WindowMaker/Icons/BitchX.xpm | |
161 | share/WindowMaker/Icons/Drawer.png | |||
163 | share/WindowMaker/Icons/Ear.png | 162 | share/WindowMaker/Icons/Ear.png | |
164 | share/WindowMaker/Icons/Ftp.png | 163 | share/WindowMaker/Icons/Ftp.png | |
165 | share/WindowMaker/Icons/GNUstep.tiff | 164 | share/WindowMaker/Icons/GNUstep.tiff | |
166 | share/WindowMaker/Icons/GNUstep.xpm | 165 | share/WindowMaker/Icons/GNUstep.xpm | |
167 | share/WindowMaker/Icons/GNUstep3D.tiff | 166 | share/WindowMaker/Icons/GNUstep3D.tiff | |
168 | share/WindowMaker/Icons/GNUstep3D.xpm | 167 | share/WindowMaker/Icons/GNUstep3D.xpm | |
169 | share/WindowMaker/Icons/GNUstepGlow.tiff | 168 | share/WindowMaker/Icons/GNUstepGlow.tiff | |
170 | share/WindowMaker/Icons/GNUstepGlow.xpm | 169 | share/WindowMaker/Icons/GNUstepGlow.xpm | |
171 | share/WindowMaker/Icons/GNUterm.tiff | 170 | share/WindowMaker/Icons/GNUterm.tiff | |
172 | share/WindowMaker/Icons/GNUterm.xpm | 171 | share/WindowMaker/Icons/GNUterm.xpm | |
173 | share/WindowMaker/Icons/GreenWilber.png | 172 | share/WindowMaker/Icons/GreenWilber.png | |
174 | share/WindowMaker/Icons/ICQ.png | 173 | share/WindowMaker/Icons/ICQ.png | |
175 | share/WindowMaker/Icons/Jabber.png | 174 | share/WindowMaker/Icons/Jabber.png |
@@ -1,19 +1,18 @@ | @@ -1,19 +1,18 @@ | |||
1 | $NetBSD: distinfo,v 1.35 2013/07/06 10:19:31 tron Exp $ | 1 | $NetBSD: distinfo,v 1.36 2014/01/17 08:48:06 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (WindowMaker-0.95.4.tar.gz) = 1477954668012010cf7991cb8139205768205717 | 3 | SHA1 (WindowMaker-0.95.5.tar.gz) = b04aef6a9076dd31a4e819275a78ece1784db28e | |
4 | RMD160 (WindowMaker-0.95.4.tar.gz) = 9316c30d9d2ebd1080711596ec1b97158997fa3a | 4 | RMD160 (WindowMaker-0.95.5.tar.gz) = 40b7782e1c86c0f850a48daad23cdcdb13f74785 | |
5 | Size (WindowMaker-0.95.4.tar.gz) = 2789390 bytes | 5 | Size (WindowMaker-0.95.5.tar.gz) = 2927995 bytes | |
6 | SHA1 (patch-WINGs_proplist.c) = 8636ebf38659b03e11c1e616c95b43a1708be69f | |||
7 | SHA1 (patch-aa) = e926a78bc5b800a1e5fbc8792099fc4a97ae916f | 6 | SHA1 (patch-aa) = e926a78bc5b800a1e5fbc8792099fc4a97ae916f | |
8 | SHA1 (patch-ab) = 794946828ede1816ea3b6a4c17f00465e1ae06c9 | 7 | SHA1 (patch-ab) = f954dadf7863a0ffc5eb4fb31bfadc218570324d | |
9 | SHA1 (patch-ac) = 0a2843e3f8e8456080082d1f3e57f58a5d440d18 | 8 | SHA1 (patch-ac) = 0a2843e3f8e8456080082d1f3e57f58a5d440d18 | |
10 | SHA1 (patch-ad) = ec668c0e40289e87e92ec85d26810ef358d2407a | 9 | SHA1 (patch-ad) = ec668c0e40289e87e92ec85d26810ef358d2407a | |
11 | SHA1 (patch-ae) = af4cf08ef774080efeaa5baa2662748418b442a3 | 10 | SHA1 (patch-ae) = af4cf08ef774080efeaa5baa2662748418b442a3 | |
12 | SHA1 (patch-af) = 87c1ddd22f4afae10ae60f012d12a41de44b0f12 | 11 | SHA1 (patch-af) = 87c1ddd22f4afae10ae60f012d12a41de44b0f12 | |
13 | SHA1 (patch-ag) = 4447310218e73ab0b78e563dabc9ce9614d68cfd | 12 | SHA1 (patch-ag) = 4447310218e73ab0b78e563dabc9ce9614d68cfd | |
14 | SHA1 (patch-ai) = 44a6a63bad867e6bc614b58688d59aa610b8553b | 13 | SHA1 (patch-ai) = 44a6a63bad867e6bc614b58688d59aa610b8553b | |
15 | SHA1 (patch-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9 | 14 | SHA1 (patch-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9 | |
16 | SHA1 (patch-ak) = 33935c1d6192b2e3833cf1d5b3c724269cb051b3 | 15 | SHA1 (patch-ak) = 40221313ce3456f4357082caec17991390607159 | |
17 | SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103 | 16 | SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103 | |
18 | SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031 | 17 | SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031 | |
19 | SHA1 (patch-wrlib_gif.c) = c050efa872151a326a2e96af16acb40c3bba4a9c | 18 | SHA1 (patch-wrlib_gif.c) = c050efa872151a326a2e96af16acb40c3bba4a9c |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-ab,v 1.14 2013/05/21 14:38:40 hans Exp $ | 1 | $NetBSD: patch-ab,v 1.15 2014/01/17 08:48:06 adam Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2013-01-09 21:43:05.000000000 +0000 | 3 | --- configure.orig 2013-01-09 21:43:05.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -11613,9 +11613,9 @@ test "x$exec_prefix" = xNONE && exec_pre | 5 | @@ -11948,9 +11948,9 @@ test "x$exec_prefix" = xNONE && exec_pre | |
6 | _bindir=`eval echo $bindir` | 6 | _bindir=`eval echo $bindir` | |
7 | _bindir=`eval echo $_bindir` | 7 | _bindir=`eval echo $_bindir` | |
8 | 8 | |||
9 | -lib_search_path='-L${libdir}' | 9 | -lib_search_path='-L${libdir}' | |
10 | +lib_search_path="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib" | 10 | +lib_search_path="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib" | |
11 | 11 | |||
12 | -inc_search_path='-I${includedir}' | 12 | -inc_search_path='-I${includedir}' | |
13 | +inc_search_path="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include" | 13 | +inc_search_path="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include" | |
14 | 14 | |||
15 | 15 | |||
16 | # Check whether --with-libs-from was given. | 16 | # Check whether --with-libs-from was given. |
@@ -1,32 +1,32 @@ | @@ -1,32 +1,32 @@ | |||
1 | $NetBSD: patch-ak,v 1.5 2013/05/30 15:18:28 hans Exp $ | 1 | $NetBSD: patch-ak,v 1.6 2014/01/17 08:48:06 adam Exp $ | |
2 | 2 | |||
3 | --- util/Makefile.in.orig 2013-01-09 21:43:07.000000000 +0000 | 3 | --- util/Makefile.in.orig 2013-09-12 22:00:17.000000000 +0000 | |
4 | +++ util/Makefile.in | 4 | +++ util/Makefile.in | |
5 | @@ -374,21 +374,21 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" | 5 | @@ -375,21 +375,21 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" | |
6 | -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\" | 6 | -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\" | |
7 | 7 | |||
8 | liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@ | 8 | liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@ | |
9 | -wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | 9 | -wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
10 | -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | 10 | -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
11 | +wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | 11 | +wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | |
12 | +wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | 12 | +wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | |
13 | wxcopy_LDADD = @XLFLAGS@ @XLIBS@ | 13 | wxcopy_LDADD = @XLFLAGS@ @XLIBS@ | |
14 | wxpaste_LDADD = @XLFLAGS@ @XLIBS@ | 14 | wxpaste_LDADD = @XLFLAGS@ @XLIBS@ | |
15 | -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | 15 | -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
16 | +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | 16 | +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | |
17 | getstyle_SOURCES = getstyle.c fontconv.c | 17 | getstyle_SOURCES = getstyle.c fontconv.c common.h | |
18 | setstyle_LDADD = \ | 18 | setstyle_LDADD = \ | |
19 | $(top_builddir)/WINGs/libWUtil.la \ | 19 | $(top_builddir)/WINGs/libWUtil.la \ | |
20 | @XLFLAGS@ @XLIBS@ $(liblist) | 20 | @XLFLAGS@ @XLIBS@ $(liblist) | |
21 | 21 | |||
22 | setstyle_SOURCES = setstyle.c fontconv.c | 22 | setstyle_SOURCES = setstyle.c fontconv.c common.h | |
23 | -convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | 23 | -convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
24 | +convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | 24 | +convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | |
25 | convertfonts_SOURCES = convertfonts.c fontconv.c | 25 | convertfonts_SOURCES = convertfonts.c fontconv.c common.h | |
26 | -seticons_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | 26 | -seticons_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
27 | -geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | 27 | -geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
28 | +seticons_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | 28 | +seticons_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | |
29 | +geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | 29 | +geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) | |
30 | wmagnify_LDADD = \ | 30 | wmagnify_LDADD = \ | |
31 | $(top_builddir)/WINGs/libWINGs.la \ | 31 | $(top_builddir)/WINGs/libWINGs.la \ | |
32 | $(top_builddir)/WINGs/libWUtil.la \ | 32 | $(top_builddir)/WINGs/libWUtil.la \ |