svn commit: r337074 - in head: japanese/xlockmore x11/xlockmore x11/xlockmore/files

[Jason Helfman]

Author: jgh
Date: Fri Dec 20 19:01:37 2013
New Revision: 337074
URL: http://svnweb.freebsd.org/changeset/ports/337074

Log:
  - update to 5.43 [1]
  - convert to new lib_depends format
  - convert to staging (thanks bapt@!)
  
  PR:	184940 [1]
  Submitted by:	umeno at rr.iij4u.or.jp [1]

Deleted:
  head/x11/xlockmore/files/patch-configure
Modified:
  head/japanese/xlockmore/Makefile
  head/x11/xlockmore/Makefile
  head/x11/xlockmore/distinfo

Modified: head/japanese/xlockmore/Makefile
==============================================================================
--- head/japanese/xlockmore/Makefile	Fri Dec 20 18:57:13 2013	(r337073)
+++ head/japanese/xlockmore/Makefile	Fri Dec 20 19:01:37 2013	(r337074)
@@ -10,5 +10,4 @@ MASTERDIR=	${.CURDIR}/../../x11/xlockmor
 WITH_MB=	yes
 XLOCKMORE_LANG=	ja
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/x11/xlockmore/Makefile
==============================================================================
--- head/x11/xlockmore/Makefile	Fri Dec 20 18:57:13 2013	(r337073)
+++ head/x11/xlockmore/Makefile	Fri Dec 20 19:01:37 2013	(r337074)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xlockmore
-PORTVERSION=	5.42
+PORTVERSION=	5.43
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
@@ -20,10 +20,9 @@ CONFIGURE_ARGS=	--without-motif --withou
 USE_GNOME=	#
 USE_XORG=	x11 xaw ice
 
-LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
 
-MAN1=		xlock.1
-PLIST_FILES=	bin/xlock lib/X11/app-defaults/XLock
+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
@@ -45,7 +44,10 @@ OPTIONS_RADIO_ONE=	PAM XLOCK_GROUP
 
 NO_OPTIONS_SORT=yes
 
-NO_STAGE=	yes
+MAKE_ARGS+=	bindir=${STAGEDIR}${PREFIX}/bin \
+		mandir=${STAGEDIR}${PREFIX}/man/man1 \
+		xapploaddir=${STAGEDIR}${PREFIX}/lib/X11/app-defaults
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKERBEROS4}
@@ -123,7 +125,7 @@ CONFIGURE_ARGS+=	--enable-customization
 .endif
 
 .if ${PORT_OPTIONS:MMAGICK}
-LIB_DEPENDS+=	MagickCore:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickCore.so:${PORTSDIR}/graphics/ImageMagick
 .else
 CONFIGURE_ARGS+=	--without-magick
 .endif

Modified: head/x11/xlockmore/distinfo
==============================================================================
--- head/x11/xlockmore/distinfo	Fri Dec 20 18:57:13 2013	(r337073)
+++ head/x11/xlockmore/distinfo	Fri Dec 20 19:01:37 2013	(r337074)
@@ -1,2 +1,2 @@
-SHA256 (xlockmore-5.42.tar.bz2) = 1fe4170e35c9a41744effcff7ed790ffefba024db398f9cf19092a91f465b19f
-SIZE (xlockmore-5.42.tar.bz2) = 1963974
+SHA256 (xlockmore-5.43.tar.bz2) = 29911f21aaf682aa61f358ca36dadf20091ad919d19b4d55e3f4c8503ab266d0
+SIZE (xlockmore-5.43.tar.bz2) = 1965448