Thu May 30 15:18:29 2013 UTC ()
Fix typo in patch-ak, add xgettext to USE_TOOLS.


(hans)
diff -r1.98 -r1.99 pkgsrc/wm/windowmaker/Makefile
diff -r1.33 -r1.34 pkgsrc/wm/windowmaker/distinfo
diff -r1.4 -r1.5 pkgsrc/wm/windowmaker/patches/patch-ak
cvs diff -r1.98 -r1.99 pkgsrc/wm/windowmaker/Makefile (switch to unified diff)

--- pkgsrc/wm/windowmaker/Makefile 2013/05/21 14:38:40 1.98
+++ pkgsrc/wm/windowmaker/Makefile 2013/05/30 15:18:28 1.99
@@ -1,109 +1,109 @@ @@ -1,109 +1,109 @@
1# $NetBSD: Makefile,v 1.98 2013/05/21 14:38:40 hans Exp $ 1# $NetBSD: Makefile,v 1.99 2013/05/30 15:18:28 hans Exp $
2 2
3DISTNAME= WindowMaker-0.95.4 3DISTNAME= WindowMaker-0.95.4
4PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} 4PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
5CATEGORIES= x11 wm windowmaker 5CATEGORIES= x11 wm windowmaker
6MASTER_SITES= http://windowmaker.info/pub/source/release/ 6MASTER_SITES= http://windowmaker.info/pub/source/release/
7EXTRACT_SUFX= .tar.gz 7EXTRACT_SUFX= .tar.gz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.windowmaker.info/ 10HOMEPAGE= http://www.windowmaker.info/
11COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone 11COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone
12 12
13BROKEN_GETTEXT_DETECTION= yes 13BROKEN_GETTEXT_DETECTION= yes
14 14
15USE_TOOLS+= msgfmt pkg-config 15USE_TOOLS+= msgfmt pkg-config xgettext
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --enable-usermenu 19CONFIGURE_ARGS+= --enable-usermenu
20CONFIGURE_ARGS+= --enable-xinerama 20CONFIGURE_ARGS+= --enable-xinerama
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
22CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep 22CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep
23CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale 23CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
24CONFIGURE_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" 24CONFIGURE_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"
25CONFIGURE_ENV+= CPP_PATH=${CPP:Q} 25CONFIGURE_ENV+= CPP_PATH=${CPP:Q}
26USE_TOOLS+= perl:run 26USE_TOOLS+= perl:run
27REPLACE_PERL+= util/wkdemenu.pl 27REPLACE_PERL+= util/wkdemenu.pl
28 28
29INSTALLATION_DIRS= share/WindowMaker/SoundSets 29INSTALLATION_DIRS= share/WindowMaker/SoundSets
30INSTALLATION_DIRS+= share/WindowMaker/Sounds 30INSTALLATION_DIRS+= share/WindowMaker/Sounds
31INSTALLATION_DIRS+= share/doc/WindowMaker 31INSTALLATION_DIRS+= share/doc/WindowMaker
32 32
33.include "../../mk/compiler.mk" 33.include "../../mk/compiler.mk"
34 34
35.if !empty(MACHINE_PLATFORM:MSunOS-5.11-*) 35.if !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
36CONFIGURE_ENV+= ac_cv_lib_Xext_XineramaGetInfo=no 36CONFIGURE_ENV+= ac_cv_lib_Xext_XineramaGetInfo=no
37.endif 37.endif
38 38
39.if ${MACHINE_ARCH} != "i386" 39.if ${MACHINE_ARCH} != "i386"
40CONFIGURE_ENV+= ac_cv_c_inline_asm=no 40CONFIGURE_ENV+= ac_cv_c_inline_asm=no
41.endif 41.endif
42 42
43.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" 43.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
44GCC_REQD+= 3.0 44GCC_REQD+= 3.0
45.endif 45.endif
46 46
47PKG_SYSCONFSUBDIR= WindowMaker 47PKG_SYSCONFSUBDIR= WindowMaker
48EGDIR= ${PREFIX}/share/examples/WindowMaker 48EGDIR= ${PREFIX}/share/examples/WindowMaker
49CONF_FILES= 49CONF_FILES=
50.for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker 50.for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker
51CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 51CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
52.endfor 52.endfor
53 53
54# WINDOWMAKER_OPTIONS is a space-separated list of compile-time options 54# WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
55# to support. Currently supported options: 55# to support. Currently supported options:
56# 56#
57# vdesktop enable support for virtual desktop. 57# vdesktop enable support for virtual desktop.
58 58
59WINDOWMAKER_OPTIONS?= vdesktop 59WINDOWMAKER_OPTIONS?= vdesktop
60 60
61BUILD_DEFS+= WINDOWMAKER_OPTIONS 61BUILD_DEFS+= WINDOWMAKER_OPTIONS
62 62
63.for option in ${WINDOWMAKER_OPTIONS} 63.for option in ${WINDOWMAKER_OPTIONS}
64CONFIGURE_ARGS+= --enable-${option} 64CONFIGURE_ARGS+= --enable-${option}
65.endfor 65.endfor
66 66
67post-extract: 67post-extract:
68 ${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \ 68 ${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \
69 ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \ 69 ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
70 ${WRKSRC}/WindowMaker/Defaults/WindowMaker \ 70 ${WRKSRC}/WindowMaker/Defaults/WindowMaker \
71 ${WRKSRC}/po/zh_TW.Big5.po 71 ${WRKSRC}/po/zh_TW.Big5.po
72 set -e; \ 72 set -e; \
73 for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \ 73 for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \
74 do \ 74 do \
75 ${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \ 75 ${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \
76 done; 76 done;
77 set -e; \ 77 set -e; \
78 cd ${WRKSRC} && \ 78 cd ${WRKSRC} && \
79 for f in WINGs/wapplication.c WindowMaker/Defaults/WindowMaker.in \ 79 for f in WINGs/wapplication.c WindowMaker/Defaults/WindowMaker.in \
80 WPrefs.app/Paths.c WindowMaker/menu* WindowMaker/plmenu*; do \ 80 WPrefs.app/Paths.c WindowMaker/menu* WindowMaker/plmenu*; do \
81 ${SED} -e "s|/usr/local|${PREFIX}|g" \ 81 ${SED} -e "s|/usr/local|${PREFIX}|g" \
82 -e "s|${PREFIX}/GNUstep|${PREFIX}/share/GNUstep|g" \ 82 -e "s|${PREFIX}/GNUstep|${PREFIX}/share/GNUstep|g" \
83 "$$f" > "$$f".new && \ 83 "$$f" > "$$f".new && \
84 ${MV} "$$f".new "$$f"; \ 84 ${MV} "$$f".new "$$f"; \
85 done 85 done
86 86
87post-install: 87post-install:
88 ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/SoundSets/.directory 88 ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/SoundSets/.directory
89 ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/Sounds/.directory 89 ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/Sounds/.directory
90 cd ${WRKSRC} && \ 90 cd ${WRKSRC} && \
91 ${INSTALL_DATA} \ 91 ${INSTALL_DATA} \
92 README README.definable-cursor FAQ FAQ.I18N \ 92 README README.definable-cursor FAQ FAQ.I18N \
93 ${DESTDIR}${PREFIX}/share/doc/WindowMaker 93 ${DESTDIR}${PREFIX}/share/doc/WindowMaker
94 94
95.include "../../converters/libiconv/buildlink3.mk" 95.include "../../converters/libiconv/buildlink3.mk"
96.include "../../devel/gettext-lib/buildlink3.mk" 96.include "../../devel/gettext-lib/buildlink3.mk"
97.include "../../mk/giflib.buildlink3.mk" 97.include "../../mk/giflib.buildlink3.mk"
98.include "../../mk/jpeg.buildlink3.mk" 98.include "../../mk/jpeg.buildlink3.mk"
99.include "../../graphics/png/buildlink3.mk" 99.include "../../graphics/png/buildlink3.mk"
100.include "../../graphics/tiff/buildlink3.mk" 100.include "../../graphics/tiff/buildlink3.mk"
101.include "../../x11/libX11/buildlink3.mk" 101.include "../../x11/libX11/buildlink3.mk"
102.include "../../x11/libXext/buildlink3.mk" 102.include "../../x11/libXext/buildlink3.mk"
103.include "../../x11/libXft/buildlink3.mk" 103.include "../../x11/libXft/buildlink3.mk"
104.include "../../x11/libXinerama/buildlink3.mk" 104.include "../../x11/libXinerama/buildlink3.mk"
105.include "../../x11/libXmu/buildlink3.mk" 105.include "../../x11/libXmu/buildlink3.mk"
106.include "../../x11/libXpm/buildlink3.mk" 106.include "../../x11/libXpm/buildlink3.mk"
107BUILDLINK_DEPMETHOD.libXt?= build 107BUILDLINK_DEPMETHOD.libXt?= build
108.include "../../x11/libXt/buildlink3.mk" 108.include "../../x11/libXt/buildlink3.mk"
109.include "../../mk/bsd.pkg.mk" 109.include "../../mk/bsd.pkg.mk"
cvs diff -r1.33 -r1.34 pkgsrc/wm/windowmaker/distinfo (switch to unified diff)

--- pkgsrc/wm/windowmaker/distinfo 2013/05/23 15:08:50 1.33
+++ pkgsrc/wm/windowmaker/distinfo 2013/05/30 15:18:28 1.34
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1$NetBSD: distinfo,v 1.33 2013/05/23 15:08:50 joerg Exp $ 1$NetBSD: distinfo,v 1.34 2013/05/30 15:18:28 hans Exp $
2 2
3SHA1 (WindowMaker-0.95.4.tar.gz) = 1477954668012010cf7991cb8139205768205717 3SHA1 (WindowMaker-0.95.4.tar.gz) = 1477954668012010cf7991cb8139205768205717
4RMD160 (WindowMaker-0.95.4.tar.gz) = 9316c30d9d2ebd1080711596ec1b97158997fa3a 4RMD160 (WindowMaker-0.95.4.tar.gz) = 9316c30d9d2ebd1080711596ec1b97158997fa3a
5Size (WindowMaker-0.95.4.tar.gz) = 2789390 bytes 5Size (WindowMaker-0.95.4.tar.gz) = 2789390 bytes
6SHA1 (patch-WINGs_proplist.c) = 8636ebf38659b03e11c1e616c95b43a1708be69f 6SHA1 (patch-WINGs_proplist.c) = 8636ebf38659b03e11c1e616c95b43a1708be69f
7SHA1 (patch-aa) = e926a78bc5b800a1e5fbc8792099fc4a97ae916f 7SHA1 (patch-aa) = e926a78bc5b800a1e5fbc8792099fc4a97ae916f
8SHA1 (patch-ab) = 794946828ede1816ea3b6a4c17f00465e1ae06c9 8SHA1 (patch-ab) = 794946828ede1816ea3b6a4c17f00465e1ae06c9
9SHA1 (patch-ac) = 0a2843e3f8e8456080082d1f3e57f58a5d440d18 9SHA1 (patch-ac) = 0a2843e3f8e8456080082d1f3e57f58a5d440d18
10SHA1 (patch-ad) = ec668c0e40289e87e92ec85d26810ef358d2407a 10SHA1 (patch-ad) = ec668c0e40289e87e92ec85d26810ef358d2407a
11SHA1 (patch-ae) = af4cf08ef774080efeaa5baa2662748418b442a3 11SHA1 (patch-ae) = af4cf08ef774080efeaa5baa2662748418b442a3
12SHA1 (patch-af) = 87c1ddd22f4afae10ae60f012d12a41de44b0f12 12SHA1 (patch-af) = 87c1ddd22f4afae10ae60f012d12a41de44b0f12
13SHA1 (patch-ag) = 4447310218e73ab0b78e563dabc9ce9614d68cfd 13SHA1 (patch-ag) = 4447310218e73ab0b78e563dabc9ce9614d68cfd
14SHA1 (patch-ai) = 44a6a63bad867e6bc614b58688d59aa610b8553b 14SHA1 (patch-ai) = 44a6a63bad867e6bc614b58688d59aa610b8553b
15SHA1 (patch-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9 15SHA1 (patch-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9
16SHA1 (patch-ak) = 10ba26239b1d85746e42ac1fad983bc3cd11d0a7 16SHA1 (patch-ak) = 33935c1d6192b2e3833cf1d5b3c724269cb051b3
17SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103 17SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103
18SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031 18SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031
19SHA1 (patch-wrlib_Makefile.in) = da39a3ee5e6b4b0d3255bfef95601890afd80709 
cvs diff -r1.4 -r1.5 pkgsrc/wm/windowmaker/patches/Attic/patch-ak (switch to unified diff)

--- pkgsrc/wm/windowmaker/patches/Attic/patch-ak 2013/05/21 14:38:40 1.4
+++ pkgsrc/wm/windowmaker/patches/Attic/patch-ak 2013/05/30 15:18:28 1.5
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-ak,v 1.4 2013/05/21 14:38:40 hans Exp $ 1$NetBSD: patch-ak,v 1.5 2013/05/30 15:18:28 hans Exp $
2 2
3--- util/Makefile.in.orig 2013-01-09 21:43:07.000000000 +0000 3--- util/Makefile.in.orig 2013-01-09 21:43:07.000000000 +0000
4+++ util/Makefile.in 4+++ util/Makefile.in
5@@ -374,21 +374,21 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"  5@@ -374,21 +374,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
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
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
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 \