Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 May 2014 13:31:30 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r353463 - in head/security/openssh-askpass: . files
Message-ID:  <201405091331.s49DVUgG064561@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri May  9 13:31:29 2014
New Revision: 353463
URL: http://svnweb.freebsd.org/changeset/ports/353463
QAT: https://qat.redports.org/buildarchive/r353463/

Log:
  Support stage

Modified:
  head/security/openssh-askpass/Makefile
  head/security/openssh-askpass/files/Makefile.in

Modified: head/security/openssh-askpass/Makefile
==============================================================================
--- head/security/openssh-askpass/Makefile	Fri May  9 13:29:06 2014	(r353462)
+++ head/security/openssh-askpass/Makefile	Fri May  9 13:31:29 2014	(r353463)
@@ -14,28 +14,23 @@ COMMENT=	Graphical password applet for e
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/README
 
+USES=		uidfix
 USE_XORG=	x11 xt sm ice
 DOCSDIR=	${PREFIX}/share/doc/ssh-askpass
 PLIST_FILES=	bin/x11-ssh-askpass \
 		bin/ssh-askpass \
-		lib/X11/app-defaults/SshAskpass
+		lib/X11/app-defaults/SshAskpass \
+		man/man1/ssh-askpass.1.gz \
+		man/man1/x11-ssh-askpass.1.gz
 PORTDOCS=	README TODO ChangeLog
 
-MAN1=		x11-ssh-askpass.1
-MLINKS=		x11-ssh-askpass.1 ssh-askpass.1
-
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-extract:
 	${INSTALL_DATA} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/security/openssh-askpass/files/Makefile.in
==============================================================================
--- head/security/openssh-askpass/files/Makefile.in	Fri May  9 13:29:06 2014	(r353462)
+++ head/security/openssh-askpass/files/Makefile.in	Fri May  9 13:31:29 2014	(r353463)
@@ -41,10 +41,10 @@ ssh-askpass: ${PROG}
 	ln -s -f $? $@
 
 beforeinstall:
-	mkdir -p ${FILESDIR}
+	mkdir -p ${DESTDIR}${FILESDIR}
 
 afterinstall:
-	ln -s -f ${PROG} ${BINDIR}/ssh-askpass
-	ln -s -f ${PROG}.1 ${MANDIR}1/ssh-askpass.1
+	ln -s -f ${PROG} ${DESTDIR}${BINDIR}/ssh-askpass
+	ln -s -f ${PROG}.1 ${DESTDIR}${MANDIR}1/ssh-askpass.1
 
 .include <bsd.prog.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405091331.s49DVUgG064561>