Module Name: src
Committed By: bouyer
Date: Thu May 19 19:42:34 UTC 2011
Modified Files:
src/distrib/sets/lists/xbase [netbsd-5]: mi
src/external/mit/xorg/bin/ssh-askpass [netbsd-5]: Makefile
src/x11/bin/ssh-askpass [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by mbalmer in ticket #1592):
external/mit/xorg/bin/ssh-askpass/Makefile: revision 1.3
distrib/sets/lists/xbase/mi: revision 1.108
x11/bin/ssh-askpass/Makefile: revision 1.7
Build the updates ssh-askpass program and add the man page to the xbase set.
To generate a diff of this commit:
cvs rdiff -u -r1.69.2.5 -r1.69.2.6 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.2 -r1.2.2.1 src/external/mit/xorg/bin/ssh-askpass/Makefile
cvs rdiff -u -r1.6 -r1.6.2.1 src/x11/bin/ssh-askpass/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.69.2.5 src/distrib/sets/lists/xbase/mi:1.69.2.6
--- src/distrib/sets/lists/xbase/mi:1.69.2.5 Wed Oct 14 18:10:21 2009
+++ src/distrib/sets/lists/xbase/mi Thu May 19 19:42:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.69.2.5 2009/10/14 18:10:21 snj Exp $
+# $NetBSD: mi,v 1.69.2.6 2011/05/19 19:42:33 bouyer Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2112,6 +2112,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
@@ -2234,6 +2235,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
@@ -2357,6 +2359,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
Index: src/external/mit/xorg/bin/ssh-askpass/Makefile
diff -u src/external/mit/xorg/bin/ssh-askpass/Makefile:1.2 src/external/mit/xorg/bin/ssh-askpass/Makefile:1.2.2.1
--- src/external/mit/xorg/bin/ssh-askpass/Makefile:1.2 Sat Oct 25 22:27:34 2008
+++ src/external/mit/xorg/bin/ssh-askpass/Makefile Thu May 19 19:42:33 2011
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:34 apb Exp $
-
-NOMAN= yes
+# $NetBSD: Makefile,v 1.2.2.1 2011/05/19 19:42:33 bouyer Exp $
.include <bsd.own.mk>
@@ -8,6 +6,7 @@
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 @@
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
Index: src/x11/bin/ssh-askpass/Makefile
diff -u src/x11/bin/ssh-askpass/Makefile:1.6 src/x11/bin/ssh-askpass/Makefile:1.6.2.1
--- src/x11/bin/ssh-askpass/Makefile:1.6 Sat Oct 25 22:27:39 2008
+++ src/x11/bin/ssh-askpass/Makefile Thu May 19 19:42:34 2011
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:39 apb Exp $
-
-NOMAN= yes
+# $NetBSD: Makefile,v 1.6.2.1 2011/05/19 19:42:34 bouyer Exp $
.include <bsd.own.mk>
@@ -8,6 +6,7 @@
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 @@
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>
