Date: Sat, 23 Mar 2013 04:25:17 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/177273: x11/xtrlock: Update to version 2.2 Message-ID: <20130323042517.ced774e59623ada14f38182e@yahoo.com> Resent-Message-ID: <201303221940.r2MJe2PK033352@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177273
>Category: ports
>Synopsis: x11/xtrlock: Update to version 2.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 22 19:40:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 2.2
Remove file:
files/Makefile
files/patch-xtrlock.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11/xtrlock/Makefile x11/xtrlock/Makefile
--- /usr/ports/x11/xtrlock/Makefile 2012-11-08 10:11:32.000000000 +0900
+++ x11/xtrlock/Makefile 2013-03-03 04:28:30.000000000 +0900
@@ -1,29 +1,40 @@
-# New ports collection makefile for: xtrlock
-# Date created: 18 May 2004
-# Whom: Alexey Mikhailov <karma@ez.pereslavl.ru>
-#
+# Created by: Alexey Mikhailov <karma@ez.pereslavl.ru>
# $FreeBSD: head/x11/xtrlock/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
PORTNAME= xtrlock
-PORTVERSION= 2.0.14
+PORTVERSION= 2.2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/x/xtrlock/
-DISTNAME= ${PORTNAME}_2.0-${PORTVERSION:E}
+MASTER_SITES= DEBIAN
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= X Transparent Lock
-LICENSE= GPLv2 # or higher
-LICENSE_FILE= ${WRKSRC}/debian/copyright
+LICENSE= GPLv2 # (or later)
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_XORG= x11
-WRKSRC= ${WRKDIR}/${PORTNAME}-2.0
-MAKEFILE= ${FILESDIR}/Makefile
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lcrypt
MAN1= xtrlock.1
PLIST_FILES= bin/xtrlock
+post-extract:
+ @${LN} -sf xtrlock.man ${WRKSRC}/xtrlock.1
+
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|<crypt.h>|<unistd.h>| ; \
+ s|<values.h>|<limits.h>|' ${WRKSRC}/xtrlock.c
+
+do-build:
+ (cd ${WRKSRC} && ${CC} ${CFLAGS} -o xtrlock xtrlock.c ${LDFLAGS})
+
+do-install:
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} xtrlock ${PREFIX}/bin)
+ (cd ${WRKSRC} && ${INSTALL_MAN} xtrlock.1 ${MANPREFIX}/man/man1)
+
.include <bsd.port.mk>
diff -urN /usr/ports/x11/xtrlock/distinfo x11/xtrlock/distinfo
--- /usr/ports/x11/xtrlock/distinfo 2012-11-08 10:11:32.000000000 +0900
+++ x11/xtrlock/distinfo 2013-03-03 04:13:08.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (xtrlock_2.0-14.tar.gz) = 2b25b6b91c33e61f1b9f6acf292cc34c58d8f04b00e4e3d2689c1b13c6714fbe
-SIZE (xtrlock_2.0-14.tar.gz) = 7746
+SHA256 (xtrlock_2.2.tar.gz) = eed63851f4ad9f3026fd0a73767c8d2e5e2b973e050d271be6ec5086faa11ef6
+SIZE (xtrlock_2.2.tar.gz) = 20716
diff -urN /usr/ports/x11/xtrlock/files/Makefile x11/xtrlock/files/Makefile
--- /usr/ports/x11/xtrlock/files/Makefile 2012-11-08 10:11:32.000000000 +0900
+++ x11/xtrlock/files/Makefile 1970-01-01 09:00:00.000000000 +0900
@@ -1,39 +0,0 @@
-# Makefile for xtrlock - X Transparent Lock
-# This Makefile provided for those of you who lack a functioning xmkmf.
-#
-# Copyright (C)1993,1994 Ian Jackson
-#
-# This is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# $FreeBSD: head/x11/xtrlock/files/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
-
-LDLIBS=-lX11 -lcrypt
-CC?=gcc
-CFLAGS+=-I${LOCALBASE}/include -L${LOCALBASE}/lib
-INSTALL=install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTPGMFLAGS = -s -o root -m4111
-OBJS=xtrlock.o
-
-xtrlock: xtrlock.o
- ${CC} ${CFLAGS} ${LDLIBS} -o xtrlock ${OBJS}
-
-xtrlock.o: xtrlock.c lock.bitmap mask.bitmap patchlevel.h
- ${CC} -c ${CFLAGS} xtrlock.c
-
-install: xtrlock install.man
- $(INSTALL_PROGRAM) $(INSTPGMFLAGS) xtrlock ${PREFIX}/bin
-
-install.man:
- $(INSTALL) -m 644 xtrlock.man ${PREFIX}/man/man1/xtrlock.1
-
-all: xtrlock
diff -urN /usr/ports/x11/xtrlock/files/patch-xtrlock.c x11/xtrlock/files/patch-xtrlock.c
--- /usr/ports/x11/xtrlock/files/patch-xtrlock.c 2012-11-08 10:11:32.000000000 +0900
+++ x11/xtrlock/files/patch-xtrlock.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,18 +0,0 @@
-
-$FreeBSD: head/x11/xtrlock/files/patch-xtrlock.c 300897 2012-07-14 14:29:18Z beat $
-
---- xtrlock.c.orig Sun Aug 22 18:08:41 2004
-+++ xtrlock.c Sun Aug 22 18:08:58 2004
-@@ -31,11 +31,9 @@
- #include <grp.h>
- #include <limits.h>
- #include <string.h>
--#include <crypt.h>
- #include <unistd.h>
- #include <math.h>
- #include <ctype.h>
--#include <values.h>
-
- #ifdef SHADOW_PWD
- #include <shadow.h>
-
diff -urN /usr/ports/x11/xtrlock/pkg-descr x11/xtrlock/pkg-descr
--- /usr/ports/x11/xtrlock/pkg-descr 2012-11-08 10:11:32.000000000 +0900
+++ x11/xtrlock/pkg-descr 2013-03-03 04:34:06.000000000 +0900
@@ -1 +1,3 @@
A minimal xlock with minimum usage of resources.
+
+WWW: http://packages.qa.debian.org/x/xtrlock.html
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130323042517.ced774e59623ada14f38182e>