Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build the updates ssh-askpass program and add the man page to the xbase set.

This commit is contained in:
mbalmer 2011-04-03 13:29:45 +00:00
parent 786f64be87
commit a5ce577b9d
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distrib/sets/lists/xbase/mi
View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.107 2011/03/06 22:15:29 mrg Exp $
# $NetBSD: mi,v 1.108 2011/04/03 13:29:45 mbalmer Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@ -2510,6 +2510,7 @@
./usr/X11R7/man/cat1/setxkbmap.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/showrgb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/smproxy.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/ssh-askpass.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/startx.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/sxpm.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/twm.0 -unknown- .cat,xorg
@ -2647,6 +2648,7 @@
./usr/X11R7/man/html1/setxkbmap.html -unknown- html,xorg
./usr/X11R7/man/html1/showrgb.html -unknown- html,xorg
./usr/X11R7/man/html1/smproxy.html -unknown- html,xorg
./usr/X11R7/man/html1/ssh-askpass.html -unknown- html,xorg
./usr/X11R7/man/html1/startx.html -unknown- html,xorg
./usr/X11R7/man/html1/sxpm.html -unknown- html,xorg
./usr/X11R7/man/html1/twm.html -unknown- html,xorg
@ -2785,6 +2787,7 @@
./usr/X11R7/man/man1/setxkbmap.1 -unknown- .man,xorg
./usr/X11R7/man/man1/showrgb.1 -unknown- .man,xorg
./usr/X11R7/man/man1/smproxy.1 -unknown- .man,xorg
./usr/X11R7/man/man1/ssh-askpass.1 -unknown- .man,xorg
./usr/X11R7/man/man1/startx.1 -unknown- .man,xorg
./usr/X11R7/man/man1/sxpm.1 -unknown- .man,xorg
./usr/X11R7/man/man1/twm.1 -unknown- .man,xorg

16
external/mit/xorg/bin/ssh-askpass/Makefile vendored
View File

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:34 apb Exp $
NOMAN= yes
# $NetBSD: Makefile,v 1.3 2011/04/03 13:29:45 mbalmer Exp $
.include <bsd.own.mk>
@ -8,6 +6,7 @@ PROG= ssh-askpass
SRCS= drawing.c dynlist.c resources.c x11-ssh-askpass.c
APPDEFS= SshAskpass.ad
DATE= February 14, 2001
BUILDSYMLINKS= SshAskpass-default.ad SshAskpass.ad
@ -29,13 +28,20 @@ FILESNAME_SshAskpass.ad=SshAskpass-default.ad
CPPFLAGS+= -I.
DPSRCS+= SshAskpass_ad.h
CLEANFILES+= SshAskpass_ad.h
SRCPATH= ${X11SRCDIR.local}/programs/x11-ssh-askpass
ssh-askpass.1: x11-ssh-askpass.man.in
sed -e 's#@NAME@#$(PROG)#g' -e 's#@VERSION@#$(VERSION)#g' \
-e 's#@DATE@#$(DATE)#g' < ${SRCPATH}/x11-ssh-askpass.man.in > $@
SshAskpass_ad.h: SshAskpass.ad
${_MKTARGET_CREATE}
rm -f ${.TARGET}
${TOOL_SED} -n '/^[^!]/s/.*/"&",/p' <${.ALLSRC} > ${.TARGET}
LDADD+= -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
LDADD+= -lXt -lSM -lICE -lXinerama -lXext -lX11
DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXINERAMA} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.local}/programs/x11-ssh-askpass

18
x11/bin/ssh-askpass/Makefile
View File

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:39 apb Exp $
NOMAN= yes
# $NetBSD: Makefile,v 1.7 2011/04/03 13:29:45 mbalmer Exp $
.include <bsd.own.mk>
@ -8,6 +6,7 @@ PROG= ssh-askpass
SRCS= drawing.c dynlist.c resources.c x11-ssh-askpass.c
APPDEFS= SshAskpass.ad
DATE= February 14, 2001
BUILDSYMLINKS= SshAskpass-default.ad SshAskpass.ad
@ -19,15 +18,22 @@ FILES= SshAskpass-1337.ad SshAskpass-NeXTish.ad \
CPPFLAGS+= -I.
DPSRCS+= SshAskpass_ad.h
CLEANFILES+= SshAskpass_ad.h
SRCPATH= ${X11SRCDIR.local}/programs/x11-ssh-askpass
ssh-askpass.1: x11-ssh-askpass.man.in
sed -e 's#@NAME@#$(PROG)#g' -e 's#@VERSION@#$(VERSION)#g' \
-e 's#@DATE@#$(DATE)#g' < ${SRCPATH}/x11-ssh-askpass.man.in > $@
SshAskpass_ad.h: SshAskpass.ad
${_MKTARGET_CREATE}
rm -f ${.TARGET}
${TOOL_SED} -n '/^[^!]/s/.*/"&",/p' <${.ALLSRC} > ${.TARGET}
LDADD+= -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
LDADD+= -lXt -lSM -lICE -lXinerama -lXext -lX11
DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXINERAMA} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.local}/programs/x11-ssh-askpass
.PATH: ${SRCPATH}
.include <bsd.x11.mk>
.include <bsd.prog.mk>