diff options
-rw-r--r-- | wm/windowmaker/Makefile | 36 | ||||
-rw-r--r-- | wm/windowmaker/PLIST | 3 | ||||
-rw-r--r-- | wm/windowmaker/distinfo | 11 | ||||
-rw-r--r-- | wm/windowmaker/patches/patch-WindowMaker_Defaults_Makefile.in | 13 |
4 files changed, 17 insertions, 46 deletions
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 50edf17b0b7..ff8bacd188a 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.116 2017/02/28 15:20:10 ryoon Exp $ +# $NetBSD: Makefile,v 1.117 2017/03/20 12:29:52 adam Exp $ -DISTNAME= WindowMaker-0.95.7 -PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} -PKGREVISION= 3 +DISTNAME= WindowMaker-0.95.8 +PKGNAME= ${DISTNAME:tl} CATEGORIES= x11 wm windowmaker -MASTER_SITES= http://windowmaker.info/pub/source/release/ +MASTER_SITES= http://windowmaker.org/pub/source/release/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.windowmaker.org/ @@ -15,16 +14,16 @@ BROKEN_GETTEXT_DETECTION= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= msgfmt pkg-config xgettext +USE_TOOLS+= msgfmt perl:run pkg-config xgettext GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-pango CONFIGURE_ARGS+= --enable-usermenu CONFIGURE_ARGS+= --enable-xinerama CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +CONFIGURE_ARGS+= --with-defsdatadir=${PREFIX}/share/examples/WindowMaker CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep -#CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale 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" CONFIGURE_ENV+= CPP_PATH=${CPP:Q} -USE_TOOLS+= perl:run REPLACE_PERL+= util/wkdemenu.pl INSTALLATION_DIRS= share/WindowMaker/SoundSets @@ -37,10 +36,6 @@ INSTALLATION_DIRS+= share/doc/WindowMaker CONFIGURE_ENV+= ac_cv_lib_Xext_XineramaGetInfo=no .endif -.if ${MACHINE_ARCH} != "i386" -CONFIGURE_ENV+= ac_cv_c_inline_asm=no -.endif - .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" GCC_REQD+= 3.0 .endif @@ -54,19 +49,6 @@ CONF_FILES= CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -# WINDOWMAKER_OPTIONS is a space-separated list of compile-time options -# to support. Currently supported options: -# -# vdesktop enable support for virtual desktop. - -WINDOWMAKER_OPTIONS?= vdesktop - -BUILD_DEFS+= WINDOWMAKER_OPTIONS - -.for option in ${WINDOWMAKER_OPTIONS} -CONFIGURE_ARGS+= --enable-${option} -.endfor - SUBST_CLASSES+= fix-path SUBST_STAGE.fix-path= pre-configure SUBST_MESSAGE.fix-path= Fixing absolute paths. @@ -90,8 +72,9 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" .include "../../graphics/giflib/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" +.include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" @@ -103,4 +86,5 @@ post-install: .include "../../x11/libXpm/buildlink3.mk" BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXt/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST index 70143437325..c026f9915e1 100644 --- a/wm/windowmaker/PLIST +++ b/wm/windowmaker/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2015/10/16 10:42:23 adam Exp $ +@comment $NetBSD: PLIST,v 1.22 2017/03/20 12:29:52 adam Exp $ bin/convertfonts bin/get-wings-flags bin/get-wraster-flags @@ -31,6 +31,7 @@ lib/libWUtil.la lib/libwraster.la lib/pkgconfig/WINGs.pc lib/pkgconfig/WUtil.pc +lib/pkgconfig/wmlib.pc lib/pkgconfig/wrlib.pc man/cs/man1/geticonset.1 man/cs/man1/getstyle.1 diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo index 7afb6e8e830..c4e96224369 100644 --- a/wm/windowmaker/distinfo +++ b/wm/windowmaker/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.42 2015/11/04 17:41:21 agc Exp $ +$NetBSD: distinfo,v 1.43 2017/03/20 12:29:52 adam Exp $ -SHA1 (WindowMaker-0.95.7.tar.gz) = ceae84f67e056dd291199b76afd0235edda214a0 -RMD160 (WindowMaker-0.95.7.tar.gz) = 2ae5003eb4e59b89c2b81c3b7b751b2f2dc98b14 -SHA512 (WindowMaker-0.95.7.tar.gz) = 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f -Size (WindowMaker-0.95.7.tar.gz) = 3238325 bytes +SHA1 (WindowMaker-0.95.8.tar.gz) = fd59e3cb07071bd70359eef427ff12eb9cfe4641 +RMD160 (WindowMaker-0.95.8.tar.gz) = c1b19ae07a4d22ec6419c4eca5c1999e5f1dd442 +SHA512 (WindowMaker-0.95.8.tar.gz) = 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2 +Size (WindowMaker-0.95.8.tar.gz) = 3253515 bytes SHA1 (patch-WINGs_dragsource.c) = a9b8dfb0ac453e5835b683a2119428d0b1182ced -SHA1 (patch-WindowMaker_Defaults_Makefile.in) = 3f0fbb4f1adef603cc7e3c371c3e72dd1d8f594c SHA1 (patch-configure) = dde661da4d1b3632b4710285f9f7a9485356e8b8 SHA1 (patch-src_event.c) = 9f72b77f7f7890c9b4283eecca3e2bb25ad8d5b3 SHA1 (patch-src_main.c) = e1693470d803b96f8ff93906dfeea43d5c3509c9 diff --git a/wm/windowmaker/patches/patch-WindowMaker_Defaults_Makefile.in b/wm/windowmaker/patches/patch-WindowMaker_Defaults_Makefile.in deleted file mode 100644 index ac631771e6e..00000000000 --- a/wm/windowmaker/patches/patch-WindowMaker_Defaults_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-WindowMaker_Defaults_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $ - ---- WindowMaker/Defaults/Makefile.in.orig 2015-08-11 18:52:19.000000000 +0000 -+++ WindowMaker/Defaults/Makefile.in -@@ -314,7 +314,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - wprefs_bindir = @wprefs_bindir@ - wprefs_datadir = @wprefs_datadir@ --defsdatadir = $(sysconfdir)/WindowMaker -+defsdatadir = $(datadir)/examples/WindowMaker - defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL - wpexecbindir = @wprefs_bindir@ - EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in |