- update to 5.46

- patches dropped as they were worked in upstream
- drop old MASTER_SITES

4 files changed, 5 insertions, 49 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index cbb74044e8be..824147233fb4 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -2,16 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	xlockmore
-PORTVERSION=	5.45
+PORTVERSION=	5.46
 CATEGORIES?=	x11
-MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/xlockmore-old/${PORTNAME}-${PORTVERSION}/ \
-		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
-		LOCAL/ehaupt
+MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Like XLock session locker/screen saver, but just more
 
-USES=		tar:bzip2
+USES=		tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-motif --without-ttf --without-editres \
 		--without-dtsaver --without-rplay --without-nas \
@@ -21,7 +19,6 @@ USE_GNOME=	#
 USE_XORG=	x11 xaw ice
 
 LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
-CONFIGURE_ENV+=	ac_freetype_includes="${LOCALBASE}/include/freetype2"
 
 OPTIONS_DEFINE=	MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \
 		KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index b809c54d6988..f895ac2ad1f1 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xlockmore-5.45.tar.bz2) = 7f81a80cb486c05269d71e9cc2d9c51645b59f09779fc24d01b858b7563015f7
-SIZE (xlockmore-5.45.tar.bz2) = 1968176
+SHA256 (xlockmore-5.46.tar.xz) = 32b3be122c4fde5ae70dba5899bbcc20cd7e80119e246d79455d84046d6d40df
+SIZE (xlockmore-5.46.tar.xz) = 1610356
diff --git a/x11/xlockmore/files/patch-modes-Makefile.in b/x11/xlockmore/files/patch-modes-Makefile.in
deleted file mode 100644
index 009b80692eb2..000000000000
--- a/x11/xlockmore/files/patch-modes-Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-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/files/patch-xlock-XLock.ad b/x11/xlockmore/files/patch-xlock-XLock.ad
deleted file mode 100644
index dcdd5974be42..000000000000
--- a/x11/xlockmore/files/patch-xlock-XLock.ad
+++ /dev/null
@@ -1,15 +0,0 @@
---- xlock/XLock.ad.orig	Fri Dec 14 17:51:13 2001
-+++ xlock/XLock.ad	Mon Apr 15 16:08:11 2002
-@@ -61,10 +61,10 @@
- 
- ! For marquee & nose modes
- !XLock.program: fortune -o
--XLock.program: fortune -s
-+!XLock.program: fortune -s
- !XLock.program: fortune
- !XLock.program: /usr/games/fortune -o
--!XLock.program: /usr/games/fortune -s
-+XLock.program: /usr/games/fortune -s
- !XLock.program: /usr/games/fortune
- !XLock.program: finger
- !XLock.messagesfile: fortune.dat