Bump PKGREVISION of x11/xlockmore to 1. Changes include:

 * Move the sound files to the standard location for xlock sound files.
 * On NetBSD, use ossplay instead of audioplay if USE_OSS is defined.

Also split out a xlockmore Makefile.common to be used in a forthcoming
"xlockmore-lite" package.

3 files changed, 112 insertions, 72 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 6c22f2a6ae5..25a5220a82c 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,78 +1,38 @@
-# $NetBSD: Makefile,v 1.58 2003/05/09 22:26:55 hubertf Exp $
-# FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
-#
-
-DISTNAME=       xlockmore-5.08.1
-CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
-		${MASTER_SITE_XCONTRIB:=applications/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://www.tux.org/~bagleyd/xlockmore.html
-COMMENT=	Like the XLock session locker/screen saver, but with more
-
-USE_BUILDLINK2=	yes
+# $NetBSD: Makefile,v 1.59 2003/06/30 07:28:59 jlam Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
+# XLOCK_LIGHT will be deprecated, but support it for a while longer
+# until users figure out to install xlockmore-lite instead of xlockmore
+#
 .if defined(XLOCK_LIGHT)
-CONFIGURE_ARGS+=--without-gltt --without-ttf --without-opengl --without-mesa \
-		--without-xpm # --without-cxx XXX doesn't work
-CONFIGURE_ENV+= CXX="${CC}"	# no dependency on libstdc++
+pre-extract:
+	@${ECHO} ""
+	@${ECHO} "***************************************************"
+	@${ECHO} "*** You want to install xlockmore-lite instead. ***"
+	@${ECHO} "***************************************************"
+	@${ECHO} ""
+
+.  include "../xlockmore-lite/Makefile"
 .else
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-CONFIGURE_ARGS+= --with-mesagl
-.endif
 
-.if !exists(${X11BASE}/lib/libXdpms.a)
-XLOCK_NO_DPMS=	YES
-.endif
+.include "Makefile.common"
 
-GNU_CONFIGURE=	YES
-USE_X11BASE=	YES
-DEFINES=	-DDEFAULT_SOUND_DIR=\"${PREFIX}/lib/X11/xlock/sounds/\" \
-		-DDEF_MODULEPATH=\"lib/X11/xlock/modules\"
-CC+=		${DEFINES}
-CXX+=		${DEFINES}
+PKGREVISION=	1
+COMMENT=	like the XLock session-locker/screensaver, but with more
 
-CONFIGURE_ARGS+= --without-motif --without-sx \
-		--without-editres --without-dtsaver --without-rplay \
-		--without-nas --without-gtk
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+= --enable-def_play='/usr/bin/audioplay ${PREFIX}/lib/X11/xlockmore/'
-.endif
+CONFIGURE_ARGS+=	--with-mesagl
 
-.if defined(XLOCK_NO_DPMS)
-CONFIGURE_ARGS+= --without-dpms
-.endif
-
-post-patch:
-		for i in xlock/resource.c ; do \
-			f=${WRKSRC}/$$i ; \
-			[ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
-			${SED} \
-				-e 's|@PREFIX@|${PREFIX}|g' \
-				<$$f.BAK >$$f ; \
-		done
-.if defined(XLOCK_DEFAULT_MODE) && ${XLOCK_DEFAULT_MODE} != ""
-		cd ${WRKSRC}/xlock; \
-			[ -f XLock.ad.BAK ] || ${MV} XLock.ad XLock.ad.BAK ; \
-			${SED} \
-				-e 's/^\(XLock.mode:[ 	]*\).*/\1${XLOCK_DEFAULT_MODE}/' \
-				XLock.ad.BAK >XLock.ad
-.endif
-
-post-install:
-		${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/xlockmore
-		${INSTALL_DATA}	\
-			${WRKSRC}/sounds/thank-you.au	\
-			${WRKSRC}/sounds/identify-please.au	\
-			${WRKSRC}/sounds/not-programmed.au	\
-			${WRKSRC}/sounds/complete.au	\
-				${PREFIX}/lib/X11/xlockmore
+# xlock is installed setuid-root, so mark it as such in the binary package.
+#
+USE_PKGINSTALL=		YES
+SPECIAL_PERMS=		${PREFIX}/bin/xlock ${SETUID_ROOT_PERMS}
 
 .include "../../audio/esound/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
+
+.endif	# XLOCK_LIGHT
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
new file mode 100644
index 00000000000..e424a4430cb
--- /dev/null
+++ b/x11/xlockmore/Makefile.common
@@ -0,0 +1,79 @@
+# $NetBSD: Makefile.common,v 1.1 2003/06/30 07:29:00 jlam Exp $
+
+DISTNAME=       xlockmore-5.08.1
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
+		${MASTER_SITE_XCONTRIB:=applications/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	hubertf@netbsd.org
+HOMEPAGE=	http://www.tux.org/~bagleyd/xlockmore.html
+
+CONFLICTS+=	xlockmore-[0-9]* xlockmore-lite-[0-9]*
+
+DISTINFO_FILE?=		${.CURDIR}/../xlockmore/distinfo
+PATCHDIR?=		${.CURDIR}/../xlockmore/patches
+PLIST_SRC?=		${.CURDIR}/../xlockmore/PLIST
+
+USE_BUILDLINK2=		YES
+USE_X11BASE=		YES
+
+.include "../../mk/bsd.prefs.mk"
+
+XLOCK_SOUNDDIR=		${PREFIX}/lib/X11/xlock/sounds
+XLOCK_MODULEDIR=	${PREFIX}/lib/X11/xlock/modules
+
+.if !exists(${X11BASE}/lib/libXdpms.a)
+XLOCK_NO_DPMS=		YES
+.endif
+
+DEFINES+=		-DDEF_MODULEPATH=\"${XLOCK_MODULEDIR}\"
+CPPFLAGS+=		${DEFINES}
+CXXFLAGS+=		${DEFINES}
+
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=        --without-motif
+CONFIGURE_ARGS+=        --without-editres
+CONFIGURE_ARGS+=        --without-dtsaver
+CONFIGURE_ARGS+=        --without-rplay
+CONFIGURE_ARGS+=        --without-nas
+CONFIGURE_ARGS+=        --without-gtk
+
+.if ${OPSYS} == "NetBSD"
+.  if defined(USE_OSS)
+.    include "../../audio/oss/buildlink2.mk"
+BUILDLINK_DEPENDS.oss=	oss-[0-9]*
+XLOCK_AUDIOPLAY?=	${BUILDLINK_PREFIX.oss}/bin/ossplay
+.  else
+XLOCK_AUDIOPLAY?=	/usr/bin/audioplay
+.  endif
+CONFIGURE_ARGS+=	--enable-def-play="${XLOCK_AUDIOPLAY}"
+.endif
+
+.if defined(XLOCK_NO_DPMS) && !empty(XLOCK_NO_DPMS:M[yY][eE][sS])
+CONFIGURE_ARGS+=	--without-dpms
+.endif
+
+# Set the complete paths to the sound files and set the default xlock
+# mode/screensaver.
+#
+post-patch:
+	cd ${WRKSRC}/xlock;						\
+	${MV} -f XLock.ad XLock.ad.presed;				\
+	${SED}	-e "s|/usr/lib/|${PREFIX}/lib/|g"			\
+		XLock.ad.presed > XLock.ad;				\
+	${RM} -f XLock.ad.presed
+.if defined(XLOCK_DEFAULT_MODE) && !empty(XLOCK_DEFAULT_MODE)
+	cd ${WRKSRC}/xlock;						\
+	${MV} -f XLock.ad XLock.ad.presed;				\
+		-e "s|^\(Xlock.mode:[ 	]*\).*|\1${XLOCK_DEFAULT_MODE}|" \
+		XLock.ad.presed > XLock.ad;				\
+	${RM} -f XLock.ad.presed
+.endif
+
+post-install:
+	${INSTALL_DATA_DIR} ${XLOCK_SOUNDDIR}
+	cd ${WRKSRC}/sounds;						\
+	for file in *.au; do						\
+		${INSTALL_DATA} $$file ${XLOCK_SOUNDDIR};		\
+	done
diff --git a/x11/xlockmore/PLIST b/x11/xlockmore/PLIST
index c8f9cf9c3eb..27d7c3f2f75 100644
--- a/x11/xlockmore/PLIST
+++ b/x11/xlockmore/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:16 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/06/30 07:29:01 jlam Exp $
 bin/xlock
 lib/X11/app-defaults/XLock
-lib/X11/xlockmore/complete.au
-lib/X11/xlockmore/identify-please.au
-lib/X11/xlockmore/not-programmed.au
-lib/X11/xlockmore/thank-you.au
+lib/X11/xlock/sounds/complete.au
+lib/X11/xlock/sounds/identify-please.au
+lib/X11/xlock/sounds/not-programmed.au
+lib/X11/xlock/sounds/thank-you.au
 man/man1/xlock.1
-@dirrm lib/X11/xlockmore
+@dirrm lib/X11/xlock/sounds
+@dirrm lib/X11/xlock