From 62e5fa615e555d53b80b8595507d65f159a49adb Mon Sep 17 00:00:00 2001
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Mon, 30 Mar 2015 15:20:52 +0000
Subject: - Update to version 2.2.1 - Correct homepage address

FIXED: extraneous window border at top left of screen at startup.
FIXED: cannot find font with x11-servers/xorg-server 1.14.7_3,1
FIXED: port can be staged as non-privileged user

PR:		198793
Submitted by:	jimmy@mammothcheese.ca (maintainer)
---
 x11-wm/nickleby/Makefile             |  6 ++----
 x11-wm/nickleby/distinfo             |  4 ++--
 x11-wm/nickleby/files/patch-Makefile | 13 -------------
 x11-wm/nickleby/pkg-descr            |  2 +-
 4 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 x11-wm/nickleby/files/patch-Makefile

(limited to 'x11-wm')

diff --git a/x11-wm/nickleby/Makefile b/x11-wm/nickleby/Makefile
index c722180ede97..607b8f6fe0ac 100644
--- a/x11-wm/nickleby/Makefile
+++ b/x11-wm/nickleby/Makefile
@@ -2,18 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	nickleby
-PORTVERSION=	2.1
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.mammothcheese.ca/
 
 MAINTAINER=	jimmy@mammothcheese.ca
 COMMENT=	Simple window manager
 
-MAKE_ENV=	X11BASE=${LOCALBASE}
 USE_XORG=	x11
+DESTDIRNAME=	STAGEDIR
 
-MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_MAN="${INSTALL_MAN}"
 PLIST_FILES=	bin/nickleby \
 		man/man1/nickleby.1.gz
 
diff --git a/x11-wm/nickleby/distinfo b/x11-wm/nickleby/distinfo
index e4372ad0c0e1..881b1dadea40 100644
--- a/x11-wm/nickleby/distinfo
+++ b/x11-wm/nickleby/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nickleby-2.1.tar.gz) = fe553ab6b7cf64a31d98f397e641c29c84ad052e0d283abcb4e0bdb37f2e0215
-SIZE (nickleby-2.1.tar.gz) = 10687
+SHA256 (nickleby-2.2.1.tar.gz) = 2ee26fdb2a1a09f6cf4110c790e4b011beb30c47e19677dc6f4180cb92fb9330
+SIZE (nickleby-2.2.1.tar.gz) = 10511
diff --git a/x11-wm/nickleby/files/patch-Makefile b/x11-wm/nickleby/files/patch-Makefile
deleted file mode 100644
index 5a622366d95d..000000000000
--- a/x11-wm/nickleby/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./Makefile.orig	2007-10-17 09:12:58.000000000 +0200
-+++ ./Makefile	2014-04-22 09:57:02.793478004 +0200
-@@ -21,8 +21,8 @@
- 	${CC} ${CFLAGS} ${INC} -o nickleby nickleby.c ${LIB}
- 
- install: all
--	${INSTALL_PROGRAM} nickleby ${DEST}
--	${INSTALL_MAN} nickleby.1.gz ${PREFIX}/man/man1
-+	${INSTALL_PROGRAM} nickleby ${DESTDIR}${PREFIX}/bin
-+	${INSTALL_MAN} nickleby.1.gz ${DESTDIR}${PREFIX}/man/man1
- 
- clean:
- 	${RM} -f nickleby
diff --git a/x11-wm/nickleby/pkg-descr b/x11-wm/nickleby/pkg-descr
index 0085db25fa82..21c85cbf4429 100644
--- a/x11-wm/nickleby/pkg-descr
+++ b/x11-wm/nickleby/pkg-descr
@@ -2,4 +2,4 @@ Nickleby is a minimal window manager.  It has no menus, toolbars, nor
 icons, and it adds no window decoration to client windows other than two
 title bars, one at the top of windows, and one at the bottom of windows.
                               
-WWW: http://www.mammothcheese.ca/munger.html
+WWW: http://www.mammothcheese.ca/
-- 
cgit