diff options
-rw-r--r-- | wm/dwm/Makefile | 20 | ||||
-rw-r--r-- | wm/dwm/distinfo | 10 | ||||
-rw-r--r-- | wm/dwm/options.mk | 5 |
3 files changed, 21 insertions, 14 deletions
diff --git a/wm/dwm/Makefile b/wm/dwm/Makefile index deb6aafc0d4..8f9cfea7710 100644 --- a/wm/dwm/Makefile +++ b/wm/dwm/Makefile @@ -1,30 +1,38 @@ -# $NetBSD: Makefile,v 1.14 2012/10/08 12:42:19 asau Exp $ +# $NetBSD: Makefile,v 1.15 2015/11/11 16:12:10 leot Exp $ # -DISTNAME= dwm-6.0 +DISTNAME= dwm-6.1 CATEGORIES= wm MASTER_SITES= http://dl.suckless.org/dwm/ -MAINTAINER= leot1990@users.sourceforge.net +MAINTAINER= leot@NetBSD.org HOMEPAGE= http://dwm.suckless.org/ COMMENT= Dynamic window manager LICENSE= mit NO_CONFIGURE= yes +USE_LANGUAGES= c99 # Adjust config.mk SUBST_CLASSES+= makefile -SUBST_STAGE.makefile= pre-build +SUBST_STAGE.makefile= pre-patch SUBST_MESSAGE.makefile= Fixing config.mk SUBST_FILES.makefile= config.mk SUBST_SED.makefile= -e 's,/usr/local,${PREFIX},g' SUBST_SED.makefile+= -e 's,share/man,${PKGMANDIR},g' SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},' -SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,' -SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,' +SUBST_SED.makefile+= -e 's,^CFLAGS *= ,CFLAGS += ,' +SUBST_SED.makefile+= -e 's,^LDFLAGS *= ,LDFLAGS += ,' +SUBST_SED.makefile+= -e 's/-I$${FREETYPEINC}/$${FREETYPEINC}/' +SUBST_SED.makefile+= -e 's,^FREETYPEINC *=.*,FREETYPEINC != freetype-config --cflags,' SUBST_SED.makefile+= -e 's/cc/${CC:Q}/' INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "options.mk" + +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/dwm/distinfo b/wm/dwm/distinfo index e8a8a555a47..65806df60e8 100644 --- a/wm/dwm/distinfo +++ b/wm/dwm/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.14 2015/11/02 23:42:51 agc Exp $ +$NetBSD: distinfo,v 1.15 2015/11/11 16:12:10 leot Exp $ -SHA1 (dwm-6.0.tar.gz) = 35346f873a27f219ae266594b3690407f95d06ef -RMD160 (dwm-6.0.tar.gz) = 6ecd03a2fc8a6f9fd436e8f58dedc305c4a5bbf7 -SHA512 (dwm-6.0.tar.gz) = 895d1d363b3756c9ba19dbf06af34be753c1ae5971d540113d7f8901ad174c2e5944ef769b43e65f7b700f34832bb24082bc91d999b287610c9925182ce70c00 -Size (dwm-6.0.tar.gz) = 20810 bytes +SHA1 (dwm-6.1.tar.gz) = 3f41d930d46b6705a76d860d12bf3feffc614581 +RMD160 (dwm-6.1.tar.gz) = 63f1cee521608362e41c346fb2f8544dfa4f936b +SHA512 (dwm-6.1.tar.gz) = 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1 +Size (dwm-6.1.tar.gz) = 25887 bytes diff --git a/wm/dwm/options.mk b/wm/dwm/options.mk index 82b223a6c2f..af71025a9ce 100644 --- a/wm/dwm/options.mk +++ b/wm/dwm/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2011/06/17 11:59:57 obache Exp $ +# $NetBSD: options.mk,v 1.3 2015/11/11 16:12:10 leot Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dwm PKG_SUPPORTED_OPTIONS= xinerama @@ -16,9 +16,8 @@ PKG_SUGGESTED_OPTIONS= xinerama . include "../../x11/libXinerama/buildlink3.mk" .else SUBST_CLASSES+= options -SUBST_STAGE.options= pre-build +SUBST_STAGE.options= pre-patch SUBST_MESSAGE.options= Toggle the Xinerama support SUBST_FILES.options= config.mk SUBST_SED.options+= -e '/^XINERAMA/d' -. include "../../x11/libX11/buildlink3.mk" .endif |