[Midnightbsd-cvs] mports: x11/xlockmore: add license, update to 5.26.1

[laffer1 at midnightbsd.org]

Log Message:
-----------
add license, update to 5.26.1

Modified Files:
--------------
    mports/x11/xlockmore:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/xlockmore/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11/xlockmore/Makefile -L x11/xlockmore/Makefile -u -r1.4 -r1.5
--- x11/xlockmore/Makefile
+++ x11/xlockmore/Makefile
@@ -3,25 +3,24 @@
 # Whom:			smace
 #
 # $MidnightBSD$
-# $FreeBSD: ports/x11/xlockmore/Makefile,v 1.104 2007/02/02 17:06:22 pav Exp $
+# $FreeBSD: ports/x11/xlockmore/Makefile,v 1.115 2008/07/18 05:10:39 ehaupt Exp $
 #
 
 PORTNAME=	xlockmore
-PORTVERSION=	5.23
-PORTREVISION=	1
+PORTVERSION=	5.26.1
 CATEGORIES?=	x11
-MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
-		http://www.tux.org/~bagleyd/latest/
+MASTER_SITES=	ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
+		CRITICAL
 
-MAINTAINER?=	ports at MidinghtBSD.org
+MAINTAINER?=	ports at MidnightBSD.org
 COMMENT=	Like XLock session locker/screen saver, but just more
+LICENSE=	x11
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-gl --without-motif --without-sx \
+CONFIGURE_ARGS=	--without-gl --without-motif --without-sx --without-ttf \
 		--without-editres --without-dtsaver --without-rplay \
-		--without-nas --without-gtk --without-esound \
-		--without-gtk2
+		--without-nas --without-gtk --without-esound
 .if defined(MAKE_KERBEROS4)
 CONFIGURE_ARGS+=--enable-kerberos4
 KRB4LIB=	-lcom_err -lcrypto
@@ -31,9 +30,11 @@
 CFLAGS+=	-I${KRB5_HOME}/include
 KRB5LIB=	-L${KRB5_HOME}/lib
 .endif
-USE_XLIB=	yes
-USE_XPM=	yes
+USE_GNOME=	#
+USE_XORG=	x11 xaw ice
+
 MAN1=		xlock.1
+PLIST_FILES=	bin/xlock lib/X11/app-defaults/XLock
 
 OPTIONS=MESAGL			"Enable Mesa 3D (for GL modes)"		off \
 	MB			"Enable Xmb function series"		off \
@@ -42,24 +43,23 @@
 	NICE_ONLY		"Enable only low cpu modes"		off \
 	BLANK_ONLY		"Enable blank mode only (boring)"	off \
 	PAM			"Enable PAM authentication support"	off \
-	BAD_PAM			"Xlock will ask PAM with root rights"	off
-
-FAKE_OPTS=	prefixhack
+	BAD_PAM			"Xlock will ask PAM with root rights"	off \
+	GTK2			"Build Gtk2 graphical shell"		off \
+	XLOCK_GROUP		"Allow xlock group to logout"		off \
+	TIME_BOMB		"Allow autologout"			off \
+	CUSTOMIZATION		"Allow tune through resource file"	off
 
 .include <bsd.port.pre.mk>
 
-FAKE_MAKEARGS+=	xapploaddir=${FAKE_DESTDIR}${X11BASE_REL}/lib/X11/app-defaults \
-		mandir=${FAKE_DESTDIR}${MANPREFIX}/man/man1
-
 .if ${ARCH} == amd64
-WITH_MESAGL=	no
-.else
-WITH_MESAGL?=	yes
+.undef WITH_MESAGL
 .endif
-.if ${WITH_MESAGL} == yes
+
+.if defined(WITH_MESAGL)
 CONFIGURE_ARGS+=	--with-mesa
 MESALIB=${PTHREAD_LIBS}
 USE_GL=	yes
+CFLAGS+=	-I${LOCALBASE}/include/FTGL
 .else
 CONFIGURE_ARGS+=	--without-mesa --without-opengl
 .endif
@@ -74,6 +74,9 @@
 
 .if defined(WITH_PAM)
 CONFIGURE_ARGS+=	--enable-pam
+.if defined(WITH_XLOCK_GROUP)
+BROKEN=			PAM and xlock group simultaneously breaks the build
+.endif
 .endif
 
 .if defined(WITH_NICE_ONLY)
@@ -96,6 +99,32 @@
 CONFIGURE_ARGS+=	--enable-syslog
 .endif
 
+.if defined(WITH_GTK2)
+CONFIGURE_ARGS+=	--with-gtk2
+USE_GNOME+=	gtk20
+PLIST_FILES+=	bin/xglock share/xlock/xglockrc
+PLIST_DIRS+=	share/xlock
+.else
+CONFIGURE_ARGS+=	--without-gtk2
+.endif
+
+.if defined(WITH_XLOCK_GROUP)
+CONFIGURE_ARGS+=	--enable-xlock-group
+.if defined(WITH_PAM)
+BROKEN=			PAM and xlock group simultaneously breaks the build
+.endif
+.endif
+
+.if defined(WITH_TIME_BOMB)
+CONFIGURE_ARGS+=	--enable-bomb
+.else
+CONFIGURE_ARGS+=	--disable-bomb
+.endif
+
+.if defined(WITH_CUSTOMIZATION)
+CONFIGURE_ARGS+=	--enable-customization
+.endif
+
 CONFIGURE_ENV+=		XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}"
 
 .if defined(WITH_DISABLE_ALLOW_ROOT)
@@ -111,8 +140,10 @@
 	@${ECHO}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in
+
 post-configure:
 	${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile
-	
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11/xlockmore/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/xlockmore/distinfo -L x11/xlockmore/distinfo -u -r1.1 -r1.2
--- x11/xlockmore/distinfo
+++ x11/xlockmore/distinfo
@@ -1,3 +1,3 @@
-MD5 (xlockmore-5.23.tar.bz2) = bd962b1dfa55ede6137c100bde834ee1
-SHA256 (xlockmore-5.23.tar.bz2) = 3788eb9fa8d95e8be681508e980fa92d3001abed93b2e47e83cc3005c92d0c48
-SIZE (xlockmore-5.23.tar.bz2) = 1773160
+MD5 (xlockmore-5.26.1.tar.bz2) = db7faeb82074a5a1593ce60297c13f20
+SHA256 (xlockmore-5.26.1.tar.bz2) = 762e575ba95f96127a18ce0bc5ab9c0c685da5330105672bd7d36f5b0841a970
+SIZE (xlockmore-5.26.1.tar.bz2) = 1842373