From 1bd96dd54ff00cf2d4ffa568f940c8b563cb2c7c Mon Sep 17 00:00:00 2001
From: Jason Helfman <jgh@FreeBSD.org>
Date: Tue, 29 Apr 2014 22:47:23 +0000
Subject: [PATCH] - fix staging issue, bump portrevision as build behavior is
 changed - while here convert bzip2 to new uses framework

PR:             188779
Submitted by:   john.hein@microsemi.com (via mail)
---
 x11/xlockmore/Makefile                      | 13 ++++-------
 x11/xlockmore/files/patch-modes-Makefile.in | 26 +++++++++++++++++++++
 x11/xlockmore/pkg-plist                     | 10 ++++++++
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 x11/xlockmore/files/patch-modes-Makefile.in
 create mode 100644 x11/xlockmore/pkg-plist

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index bd2a99dcafee..5fab0f6e6dfe 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xlockmore
 PORTVERSION=	5.43
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
@@ -12,21 +12,20 @@ MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \
 MAINTAINER?=	jgh@FreeBSD.org
 COMMENT=	Like XLock session locker/screen saver, but just more
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-motif --without-ttf --without-editres \
 		--without-dtsaver --without-rplay --without-nas \
-		--without-gtk --without-esound
+		--without-gtk --without-esound --disable-setuid
 
 USE_GNOME=	#
 USE_XORG=	x11 xaw ice
 
 LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
 
-PLIST_FILES=	bin/xlock lib/X11/app-defaults/XLock man/man1/xlock.1.gz
-
 OPTIONS_DEFINE=	MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \
 		KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK
+OPTIONS_SUB=	yes
 
 MESAGL_DESC=	Mesa 3D (for GL modes)
 MB_DESC=	Xmb function series
@@ -48,7 +47,7 @@ NO_OPTIONS_SORT=yes
 MAKE_ARGS+=	bindir=${STAGEDIR}${PREFIX}/bin \
 		mandir=${STAGEDIR}${PREFIX}/man/man1 \
 		datarootdir=${STAGEDIR}${PREFIX}/share \
-		xapploaddir=${STAGEDIR}${PREFIX}/lib/X11/app-defaults
+		xapploaddir=${PREFIX}/lib/X11/app-defaults
 
 .include <bsd.port.options.mk>
 
@@ -106,8 +105,6 @@ CONFIGURE_ARGS+=	--enable-syslog
 .if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--with-gtk2
 USE_GNOME+=	gtk20
-PLIST_FILES+=	bin/xglock share/xlock/xglockrc
-PLIST_DIRS+=	share/xlock
 .else
 CONFIGURE_ARGS+=	--without-gtk2
 .endif
diff --git a/x11/xlockmore/files/patch-modes-Makefile.in b/x11/xlockmore/files/patch-modes-Makefile.in
new file mode 100644
index 000000000000..009b80692eb2
--- /dev/null
+++ b/x11/xlockmore/files/patch-modes-Makefile.in
@@ -0,0 +1,26 @@
+install to DESTDIR; this allows xapploaddir to only
+contain the <prefix> path and not the staging dir
+(it gets compiled into the binary via DEF_FILESEARCHPATH).
+
+--- modes/Makefile.in.orig	2013-02-21 07:56:39.000000000 -0700
++++ modes/Makefile.in	2014-04-29 10:44:15.000000000 -0600
+@@ -608,8 +608,8 @@
+ 	$(INSTALL_DATA) $(UTILDIR)xlock.man $(mandir)/xlock.1
+ 
+ install-ad :
+-	$(top_srcdir)/mkinstalldirs $(xapploaddir)
+-	$(INSTALL_DATA) $(UTILDIR)XLock.ad $(xapploaddir)/XLock
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
++	$(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)$(xapploaddir)/XLock
+ 
+ uninstall : uninstall-program uninstall-man uninstall-ad
+ 
+@@ -620,7 +620,7 @@
+ 	$(RM) $(mandir)/xlock.1
+ 
+ uninstall-ad :
+-	$(RM) $(xapploaddir)/XLock
++	$(RM) $(DESTDIR)$(xapploaddir)/XLock
+ 
+ install.program : install-program
+ 
diff --git a/x11/xlockmore/pkg-plist b/x11/xlockmore/pkg-plist
new file mode 100644
index 000000000000..9ed97584e69d
--- /dev/null
+++ b/x11/xlockmore/pkg-plist
@@ -0,0 +1,10 @@
+%%GTK2%%bin/xglock
+@mode 4111
+@owner root
+bin/xlock
+@mode
+@owner
+lib/X11/app-defaults/XLock
+man/man1/xlock.1.gz
+%%GTK2%%share/xlock/xglockrc
+%%GTK2%%@dirrm share/xlock