diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2006-12-12 12:33:37 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2006-12-12 12:33:37 +0000 |
| commit | 9a780fc8d7d5502d94cd357c61f054496917c4cc (patch) | |
| tree | 1783f431ee28d9fa74a74e5c22b49964ea48dfc3 /x11-fm | |
| parent | c50cf0fe193af4ed53a5d65b22c8f4e08968a52c (diff) | |
| download | ports-9a780fc8d7d5502d94cd357c61f054496917c4cc.tar.gz ports-9a780fc8d7d5502d94cd357c61f054496917c4cc.zip | |
Add proper gdm detection using code from x11/xfce4.
The port installation would fail if you did not have the etc/dm/Sessions directory.
Noticed by: rafan
Notes
Notes:
svn path=/head/; revision=179557
Diffstat (limited to 'x11-fm')
| -rw-r--r-- | x11-fm/rox-session/Makefile | 13 | ||||
| -rw-r--r-- | x11-fm/rox-session/pkg-plist | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile index b1d84dcb4114..dab57c48da82 100644 --- a/x11-fm/rox-session/Makefile +++ b/x11-fm/rox-session/Makefile @@ -23,6 +23,17 @@ SUB_FILES= rox-session rox.desktop .include <bsd.port.pre.mk> +.if exists(${LOCALBASE}/sbin/gdm) +WITH_GDM= yes +.endif + +.if defined(WITH_GDM) +RUN_DEPENDS+= ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm +PLIST_SUB+= GDM="" +.else +PLIST_SUB+= GDM="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -name *.orig | ${XARGS} ${RM} @@ -35,6 +46,8 @@ do-install: @${CP} -r ${WRKSRC}/ROX-Session ${PREFIX}/apps/ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/apps/ROX-Session @${INSTALL_SCRIPT} ${WRKDIR}/rox-session ${PREFIX}/sbin +.if defined(WITH_GDM) @${INSTALL_DATA} ${WRKDIR}/rox.desktop ${PREFIX}/etc/dm/Sessions +.endif .include <bsd.port.post.mk> diff --git a/x11-fm/rox-session/pkg-plist b/x11-fm/rox-session/pkg-plist index bfd70413bc2e..ab49338b2389 100644 --- a/x11-fm/rox-session/pkg-plist +++ b/x11-fm/rox-session/pkg-plist @@ -106,7 +106,7 @@ apps/ROX-Session/xsettings.pyo apps/ROX-Session/xxmlrpc.py apps/ROX-Session/xxmlrpc.pyc apps/ROX-Session/xxmlrpc.pyo -etc/dm/Sessions/rox.desktop +%%GDM%%etc/dm/Sessions/rox.desktop sbin/rox-session @dirrm apps/ROX-Session/tests @dirrm apps/ROX-Session/images |