Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Aug 2014 07:45:34 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r364946 - in head/x11/i3lock: . files
Message-ID:  <201408150745.s7F7jYkU004483@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Fri Aug 15 07:45:34 2014
New Revision: 364946
URL: http://svnweb.freebsd.org/changeset/ports/364946
QAT: https://qat.redports.org/buildarchive/r364946/

Log:
  x11/i3lock: Fix staging orphan, assign port to submitter
  
  Details:
    * Change license from BSD to BSD3CLAUSE
    * Use @mode instead of CHMOD
    * Add DOCS to options
    * strip executable
    * Move patch actions to Makefile
    * Fix WWW
    * Fix orphaned etc/pam.3/i3lock
    * Fix LIB_DEPENDS format
    * Pass maintainership to Horia
  
  PR:		190992
  Submitted by:	Horia Racoviceanu
  Approved by:	maintainer timeout (2 months)

Deleted:
  head/x11/i3lock/files/
Modified:
  head/x11/i3lock/Makefile
  head/x11/i3lock/pkg-descr

Modified: head/x11/i3lock/Makefile
==============================================================================
--- head/x11/i3lock/Makefile	Fri Aug 15 07:31:47 2014	(r364945)
+++ head/x11/i3lock/Makefile	Fri Aug 15 07:45:34 2014	(r364946)
@@ -3,19 +3,19 @@
 
 PORTNAME=	i3lock
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://i3wm.org/${PORTNAME}/
 
-MAINTAINER=	dhn@FreeBSD.org
+MAINTAINER=	horia@racoviceanu.com
 COMMENT=	Slightly improved screen locker based on slock
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcairo.so.2:${PORTSDIR}/graphics/cairo \
+LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
 		libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \
-		libev.so.4:${PORTSDIR}/devel/libev \
+		libev.so:${PORTSDIR}/devel/libev \
 		libxkbfile.so:${PORTSDIR}/x11/libxkbfile \
 		libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon
 
@@ -23,14 +23,27 @@ MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${
 		X11INC="${LOCALBASE}/include" CC="${CC}" \
 		MANDIR="${MANPREFIX}/man"
 
-PLIST_FILES=	bin/i3lock \
+PLIST_FILES=	"@mode 4755" bin/i3lock @mode \
 		man/man1/i3lock.1.gz
 
 LDFLAGS+=	${ICONV_LIB}
 USE_XORG=	x11 xcb xt xproto xext
 USES=		gmake iconv pkgconfig tar:bzip2
 
+PORTDOCS=	CHANGELOG README
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|.*pam.d/i3lock.*|	$$(INSTALL)\
+		-m 644 i3lock.1 $$(DESTDIR)$$(PREFIX)/man/man1|; \
+		/pam.d/d' \
+		${WRKSRC}/Makefile
+
 post-install:
-	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/i3lock
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/i3lock
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11/i3lock/pkg-descr
==============================================================================
--- head/x11/i3lock/pkg-descr	Fri Aug 15 07:31:47 2014	(r364945)
+++ head/x11/i3lock/pkg-descr	Fri Aug 15 07:45:34 2014	(r364946)
@@ -8,4 +8,4 @@ you have entered a password when resumin
 
 i3lock was forked from slock-0.9
 
-WWW:	http://i3.zekjur.net/i3lock/
+WWW: http://i3wm.org/i3lock/



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