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 (expand / 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,28 +1,28 @@ @@ -1,28 +1,28 @@
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
cvs diff -r1.33 -r1.34 pkgsrc/wm/windowmaker/distinfo (expand / 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 (expand / 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 \