- remove groff dependency

- remove unneeded NULL cats
- use SUBST_CMD

ok naddy@ (MAINTAINER)
This commit is contained in:
jasper 2011-04-17 20:20:32 +00:00
parent 83ae3c3679
commit f7df30505d
3 changed files with 5 additions and 18 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2010/10/24 21:15:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2011/04/17 20:20:32 jasper Exp $
COMMENT= alternative xdm-invoked chooser
DISTNAME= xdmchoose-1.2.1
REVISION= 1
REVISION= 2
CATEGORIES= x11
HOMEPAGE= http://frmb.org/xdmchoose.html
@ -19,12 +19,11 @@ WANTLIB= X11 Xau Xdmcp Xpm c
MASTER_SITES= http://frmb.org/download/
USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
post-install:
@perl -i -pe 's!%%PREFIX%%!${TRUEPREFIX}!g' ${WRKSRC}/xdmchoose.conf
${SUBST_CMD} ${WRKSRC}/xdmchoose.conf
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xdmchoose
${INSTALL_DATA} ${WRKSRC}/xdmchoose.conf \
${PREFIX}/share/examples/xdmchoose/

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-chooser_c,v 1.1 2003/10/26 02:08:51 pvalchev Exp $
--- chooser.c.orig 2003-10-25 13:04:31.000000000 -0600
+++ chooser.c 2003-10-25 13:04:38.000000000 -0600
@@ -1010,7 +1010,7 @@ static void run_init_script (void)
return;
break;
case 0:
- execl (_globconfig.startscript, _globconfig.startscript, NULL);
+ execl (_globconfig.startscript, _globconfig.startscript, (void *)NULL);
_exit (-1);
break;
default:

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-xdmchoose_conf,v 1.2 2003/05/12 20:11:28 naddy Exp $
$OpenBSD: patch-xdmchoose_conf,v 1.3 2011/04/17 20:20:32 jasper Exp $
--- xdmchoose.conf.orig Mon May 12 12:17:11 2003
+++ xdmchoose.conf Mon May 12 12:19:52 2003
@@ -32,7 +32,7 @@ unknown.highlight "#f0f0ff"
@ -6,7 +6,7 @@ $OpenBSD: patch-xdmchoose_conf,v 1.2 2003/05/12 20:11:28 naddy Exp $
unknown.tentry "gray90"
-panel.background "xdmchoose-blur.xpm"
+panel.background "%%PREFIX%%/share/xdmchoose/xdmchoose-blur.xpm"
+panel.background "${PREFIX}/share/xdmchoose/xdmchoose-blur.xpm"
title.foreground "#000090"
title.text "X Window System"