[pkgsrc/trunk]: pkgsrc/x11/xdm3d * Add missing DEPENDs

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f20a32af5cd
branches:  trunk
changeset: 536677:7f20a32af5cd
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu Dec 20 11:56:45 2007 +0000

description:
* Add missing DEPENDs
* install 'chooser' more conditionally
* DESTDIR ready

diffstat:

 x11/xdm3d/Makefile |  49 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 19 deletions(-)

diffs (85 lines):

diff -r 296756adb6bb -r 7f20a32af5cd x11/xdm3d/Makefile
--- a/x11/xdm3d/Makefile        Thu Dec 20 03:38:42 2007 +0000
+++ b/x11/xdm3d/Makefile        Thu Dec 20 11:56:45 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:28 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/12/20 11:56:45 obache Exp $
 
 DISTNAME=              xdm3d-1.0
 PKGREVISION=           1
@@ -9,8 +9,6 @@
 HOMEPAGE=              http://www.hijinks.com/~spade/linux/XBanner/
 COMMENT=               Replacement for xdm with 3D effects
 
-BROKEN_IN=             pkgsrc-2006Q1 pkgsrc-2006Q4
-
 WRKSRC=                        ${WRKDIR}/xdm
 NO_INSTALL_MANPAGES=   yes
 USE_IMAKE=             yes
@@ -18,6 +16,8 @@
 PLIST_SRC=             ${WRKDIR}/PLIST-src
 INSTALLATION_DIRS=     bin
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .if exists(${X11BASE}/lib/X11/xdm)
@@ -29,30 +29,41 @@
 .endif
 
 do-install:
-       echo "${X11BASE} ${XDMDIR}"
-       ${INSTALL_PROGRAM} ${WRKSRC}/xdm ${PREFIX}/bin/xdm3d
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/xdm3d
-       ${INSTALL_DATA} ${XDMDIR}/GiveConsole ${PREFIX}/share/xdm3d
-       ${INSTALL_DATA} ${XDMDIR}/TakeConsole ${PREFIX}/share/xdm3d
-       ${INSTALL_DATA} ${XDMDIR}/Xaccess ${PREFIX}/share/xdm3d
-       ${INSTALL_DATA} ${XDMDIR}/Xservers ${PREFIX}/share/xdm3d
-       ${INSTALL_DATA} ${XDMDIR}/Xsession ${PREFIX}/share/xdm3d
+       ${ECHO} "${X11BASE} ${XDMDIR}"
+       ${INSTALL_PROGRAM} ${WRKSRC}/xdm ${DESTDIR}${PREFIX}/bin/xdm3d
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/xdm3d
+       ${INSTALL_DATA} ${XDMDIR}/GiveConsole ${DESTDIR}${PREFIX}/share/xdm3d
+       ${INSTALL_DATA} ${XDMDIR}/TakeConsole ${DESTDIR}${PREFIX}/share/xdm3d
+       ${INSTALL_DATA} ${XDMDIR}/Xaccess ${DESTDIR}${PREFIX}/share/xdm3d
+       ${INSTALL_DATA} ${XDMDIR}/Xservers ${DESTDIR}${PREFIX}/share/xdm3d
+       ${INSTALL_DATA} ${XDMDIR}/Xsession ${DESTDIR}${PREFIX}/share/xdm3d
        @if [ -r ${XDMDIR}/Xsetup ]; then                       \
-               ${INSTALL_DATA} ${XDMDIR}/Xsetup ${PREFIX}/share/xdm3d; \
+               ${INSTALL_DATA} ${XDMDIR}/Xsetup ${DESTDIR}${PREFIX}/share/xdm3d; \
                sedexpr='-e s|^share/xdm3d/Xsetup_0$$|@comment\ &|';    \
        elif [ -r ${XDMDIR}/Xsetup_0 ]; then            \
-               ${INSTALL_DATA} ${XDMDIR}/Xsetup_0 ${PREFIX}/share/xdm3d; \
+               ${INSTALL_DATA} ${XDMDIR}/Xsetup_0 ${DESTDIR}${PREFIX}/share/xdm3d; \
                sedexpr='-e s|^share/xdm3d/Xsetup$$|@comment\ &|';      \
        fi;                                                             \
        ${SED} "$$sedexpr" ${PKGDIR}/PLIST > ${PLIST_SRC}
-       ${INSTALL_PROGRAM} ${XDMDIR}/chooser ${PREFIX}/share/xdm3d
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/xdm3d/authdir
-       ${CHMOD} 700 ${PREFIX}/share/xdm3d/authdir
+       @if [ -r ${XDMDIR}/chooser ]; then                              \
+               ${INSTALL_PROGRAM} ${XDMDIR}/chooser ${DESTDIR}${PREFIX}/share/xdm3d;           \
+       elif [ -r ${X11BASE}/libexec/cooser ]; then                     \
+               ${INSTALL_PROGRAM} ${X11BASE}/libexec/chooser ${DESTDIR}${PREFIX}/share/xdm3d;  \
+       else                                                            \
+               ${INSTALL_PROGRAM} ${WRKSRC}/chooser ${DESTDIR}${PREFIX}/share/xdm3d;           \
+       fi
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/xdm3d/authdir
+       ${CHMOD} 700 ${DESTDIR}${PREFIX}/share/xdm3d/authdir
        ${SED} -e 's@${XDMDIR}@${PREFIX}/share/xdm3d@' < \
                ${XDMDIR}/xdm-config > \
-               ${PREFIX}/share/xdm3d/xdm-config
-       ${INSTALL_DATA} ${WRKSRC}/Xresources.3D ${PREFIX}/share/xdm3d/Xresources
+               ${DESTDIR}${PREFIX}/share/xdm3d/xdm-config
+       ${INSTALL_DATA} ${WRKSRC}/Xresources.3D ${DESTDIR}${PREFIX}/share/xdm3d/Xresources
        ${ECHO} 'DisplayManager*loginmoveInterval:              10' >> \
-               ${PREFIX}/share/xdm3d/xdm-config
+               ${DESTDIR}${PREFIX}/share/xdm3d/xdm-config
 
+.include "../../x11/libXau/buildlink3.mk"
+.include "../../x11/libXdmcp/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"