Attachment 143734 Details for Bug 190992 – Fix orphaned file

[patch] Fix orphaned file

i3lock.diff (text/plain), 2.36 KB, created by Horia Racoviceanu on 2014-06-13 08:06:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Horia Racoviceanu

Created: 2014-06-13 08:06:29 UTC

Size: 2.36 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 357645)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	i3lock
> PORTVERSION=	2.5
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	x11
> MASTER_SITES=	http://i3wm.org/${PORTNAME}/
> 
>@@ -10,7 +10,7 @@
> MAINTAINER=	dhn@FreeBSD.org
> COMMENT=	Slightly improved screen locker based on slock
> 
>-LICENSE=	BSD
>+LICENSE=	BSD3CLAUSE
> 
> LIB_DEPENDS=	libcairo.so.2:${PORTSDIR}/graphics/cairo \
> 		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
>@@ -23,15 +23,27 @@
> 		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
>-USE_BZIP2=	yes
>-USES=		gmake iconv pkgconfig
>+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>
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 357645)
>+++ files/patch-Makefile	(working copy)
>@@ -1,15 +0,0 @@
>---- ./Makefile.orig	2012-04-01 13:14:28.000000000 +0200
>-+++ ./Makefile	2012-04-08 13:39:09.000000000 +0200
>-@@ -42,9 +42,10 @@
>- 
>- install: all
>- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
>--	$(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/pam.d
>-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)$(SYSCONFDIR)/pam.d
>- 	$(INSTALL) -m 755 i3lock $(DESTDIR)$(PREFIX)/bin/i3lock
>--	$(INSTALL) -m 644 i3lock.pam $(DESTDIR)$(SYSCONFDIR)/pam.d/i3lock
>-+	$(INSTALL) -m 644 i3lock.pam $(DESTDIR)$(PREFIX)$(SYSCONFDIR)/pam.d/i3lock
>-+	$(INSTALL) -m 644 i3lock.1 $(DESTDIR)$(PREFIX)/man/man1
>- 
>- uninstall:
>- 	rm -f $(DESTDIR)$(PREFIX)/bin/i3lock
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 357645)
>+++ pkg-descr	(working copy)
>@@ -8,4 +8,4 @@
> 
> i3lock was forked from slock-0.9
> 
>-WWW:	http://i3.zekjur.net/i3lock/
>+WWW: http://i3wm.org/i3lock/

Actions: View | Diff

Attachments on bug 190992: 143734