Fri Feb 26 10:38:36 2016 UTC ()
Use OPSYSVARS.


(jperkin)
diff -r1.114 -r1.115 pkgsrc/wm/metacity/Makefile
diff -r1.21 -r1.22 pkgsrc/wm/notion/Makefile
cvs diff -r1.114 -r1.115 pkgsrc/wm/metacity/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/metacity/Attic/Makefile 2015/04/25 14:24:59 1.114
+++ pkgsrc/wm/metacity/Attic/Makefile 2016/02/26 10:38:36 1.115
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.114 2015/04/25 14:24:59 tnn Exp $ 1# $NetBSD: Makefile,v 1.115 2016/02/26 10:38:36 jperkin Exp $
2 2
3DISTNAME= metacity-2.34.13 3DISTNAME= metacity-2.34.13
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= wm x11 gnome 5CATEGORIES= wm x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.34/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.34/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/softwaremap/projects/Metacity/ 10HOMEPAGE= http://www.gnome.org/softwaremap/projects/Metacity/
11COMMENT= GNOME-compliant window manager 11COMMENT= GNOME-compliant window manager
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_PKGLOCALEDIR= YES 14USE_PKGLOCALEDIR= YES
@@ -20,30 +20,28 @@ PKGCONFIG_OVERRIDE= src/libmetacity-priv @@ -20,30 +20,28 @@ PKGCONFIG_OVERRIDE= src/libmetacity-priv
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23.if ${X11_TYPE} != "native" 23.if ${X11_TYPE} != "native"
24.include "../../x11/libXinerama/buildlink3.mk" 24.include "../../x11/libXinerama/buildlink3.mk"
25.elif !exists(${X11BASE}/lib/libXinerama.so) 25.elif !exists(${X11BASE}/lib/libXinerama.so)
26CONFIGURE_ARGS+= --disable-xinerama 26CONFIGURE_ARGS+= --disable-xinerama
27.endif 27.endif
28 28
29.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/libXdamage.so) 29.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/libXdamage.so)
30CONFIGURE_ARGS+= --disable-compositor 30CONFIGURE_ARGS+= --disable-compositor
31.endif 31.endif
32 32
33CFLAGS.SunOS+= -std=c99 -D__EXTENSIONS__ 33CFLAGS.SunOS+= -std=c99 -D__EXTENSIONS__
34.if ${OPSYS} == "SunOS" 34BUILDLINK_TRANSFORM.SunOS+= rm:-ansi
35BUILDLINK_TRANSFORM+= rm:-ansi 
36.endif 
37 35
38BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool 36BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
39 37
40BUILDLINK_API_DEPENDS.glib2+= glib2>=2.25.10 38BUILDLINK_API_DEPENDS.glib2+= glib2>=2.25.10
41BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.24.0 39BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.24.0
42BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.7 40BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.7
43 41
44BUILDLINK_DEPMETHOD.libXt?= build 42BUILDLINK_DEPMETHOD.libXt?= build
45 43
46.include "../../audio/libcanberra/buildlink3.mk" 44.include "../../audio/libcanberra/buildlink3.mk"
47.include "../../devel/glib2/schemas.mk" 45.include "../../devel/glib2/schemas.mk"
48.include "../../devel/gettext-lib/buildlink3.mk" 46.include "../../devel/gettext-lib/buildlink3.mk"
49.include "../../devel/pango/buildlink3.mk" 47.include "../../devel/pango/buildlink3.mk"
cvs diff -r1.21 -r1.22 pkgsrc/wm/notion/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/notion/Makefile 2015/06/14 21:02:46 1.21
+++ pkgsrc/wm/notion/Makefile 2016/02/26 10:38:36 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.21 2015/06/14 21:02:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.22 2016/02/26 10:38:36 jperkin Exp $
2 2
3DISTNAME= notion-3-2015061300 3DISTNAME= notion-3-2015061300
4PKGNAME= ${DISTNAME:S/3-/3./} 4PKGNAME= ${DISTNAME:S/3-/3./}
5CATEGORIES= wm 5CATEGORIES= wm
6MASTER_SITES= ${MASTER_SITE_GITHUB:=raboof/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=raboof/}
7GITHUB_TAG= ${DISTNAME:S/notion-//} 7GITHUB_TAG= ${DISTNAME:S/notion-//}
8 8
9MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://notion.sourceforge.net/ 10HOMEPAGE= http://notion.sourceforge.net/
11COMMENT= Tiling window manager based on ion3 11COMMENT= Tiling window manager based on ion3
12LICENSE= ion-license AND gnu-lgpl-v2.1 12LICENSE= ion-license AND gnu-lgpl-v2.1
13 13
14# notion is based on ion3 14# notion is based on ion3
@@ -53,34 +53,30 @@ EGFILES+= look_greyviolet.lua @@ -53,34 +53,30 @@ EGFILES+= look_greyviolet.lua
53EGFILES+= look_ios.lua 53EGFILES+= look_ios.lua
54EGFILES+= look_newviolet.lua 54EGFILES+= look_newviolet.lua
55EGFILES+= look_simpleblue.lua 55EGFILES+= look_simpleblue.lua
56EGFILES+= lookcommon_clean.lua 56EGFILES+= lookcommon_clean.lua
57EGFILES+= lookcommon_emboss.lua 57EGFILES+= lookcommon_emboss.lua
58 58
59PKG_SYSCONFSUBDIR= notion 59PKG_SYSCONFSUBDIR= notion
60INSTALLATION_DIRS= ${EGDIR} 60INSTALLATION_DIRS= ${EGDIR}
61 61
62.for f in ${EGFILES} 62.for f in ${EGFILES}
63CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 63CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
64.endfor 64.endfor
65 65
66.include "../../mk/bsd.prefs.mk" 
67 
68.if ${OPSYS} == "SunOS" 
69# Abuse buildlink to add required libraries. 66# Abuse buildlink to add required libraries.
70BUILDLINK_TRANSFORM+= opt:-Wl,--as-needed:-lsocket 67BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--as-needed:-lsocket
71BUILDLINK_TRANSFORM+= rm:-Wl,-whole-archive 68BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-whole-archive
72BUILDLINK_TRANSFORM+= rm:-Wl,-no-whole-archive 69BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-no-whole-archive
73.endif 
74 70
75post-install: 71post-install:
76 cd ${WRKSRC} && pax -rw contrib ${DESTDIR}${EGDIR} 72 cd ${WRKSRC} && pax -rw contrib ${DESTDIR}${EGDIR}
77 73
78.include "../../devel/gettext-lib/buildlink3.mk" 74.include "../../devel/gettext-lib/buildlink3.mk"
79.include "../../lang/lua/buildlink3.mk" 75.include "../../lang/lua/buildlink3.mk"
80.include "../../x11/libX11/buildlink3.mk" 76.include "../../x11/libX11/buildlink3.mk"
81.include "../../x11/libSM/buildlink3.mk" 77.include "../../x11/libSM/buildlink3.mk"
82.include "../../x11/libXext/buildlink3.mk" 78.include "../../x11/libXext/buildlink3.mk"
83.include "../../x11/libXinerama/buildlink3.mk" 79.include "../../x11/libXinerama/buildlink3.mk"
84.include "../../x11/libXrandr/buildlink3.mk" 80.include "../../x11/libXrandr/buildlink3.mk"
85.include "../../mk/dlopen.buildlink3.mk" 81.include "../../mk/dlopen.buildlink3.mk"
86.include "../../mk/bsd.pkg.mk" 82.include "../../mk/bsd.pkg.mk"