Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Oct 2012 02:56:52 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/172511: x11/lupe: Update MASTER_SITES
Message-ID:  <20121009025652.1d6d07eac6d6b3c8543bde4a@yahoo.com>
Resent-Message-ID: <201210081810.q98IAJgK086503@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         172511
>Category:       ports
>Synopsis:       x11/lupe: Update MASTER_SITES
>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:   Mon Oct 08 18:10:18 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES and WWW: line
- Support PLIST_FILES
- Fix build with clang

New file:
files/patch-avionics.c
files/patch-lupe.c
files/patch-option.c

Remove file:
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11/lupe/Makefile x11/lupe/Makefile
--- /usr/ports/x11/lupe/Makefile	2012-09-30 12:40:44.000000000 +0900
+++ x11/lupe/Makefile	2012-10-07 20:06:23.000000000 +0900
@@ -4,22 +4,41 @@
 PORTNAME=	lupe
 PORTVERSION=	0.08c
 CATEGORIES=	x11 accessibility
-MASTER_SITES=	http://www.oersted.co.jp/~yav/soft/
-DISTNAME=	lupe008c
+MASTER_SITES=	http://www2s.biglobe.ne.jp/~yav/soft/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Real-time magnifying glass for X11
 
-WRKSRC=		${WRKDIR}/lupe
-USE_IMAKE=	yes
+OPTIONS_DEFINE=	DOCS
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 USE_XORG=	x11 xext
-XMKMF=		xmkmf
-MAN1=		lupe.1
+GNU_CONFIGURE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lXext -lm
+
+MAN1=		${PORTNAME}.1
+PORTDOCS=	${PORTNAME}.doc
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.options.mk>
+
+post-extract:
+	@${LN} -sf ${PORTNAME}.man ${WRKSRC}/${PORTNAME}.1
+
+do-build:
+	(cd ${WRKSRC} \
+		&& ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME} *.c ${LDFLAGS})
 
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/lupe.doc ${DOCSDIR}
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} ${PORTNAME}.1 ${MANPREFIX}/man/man1)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}.doc ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11/lupe/files/patch-avionics.c x11/lupe/files/patch-avionics.c
--- /usr/ports/x11/lupe/files/patch-avionics.c	1970-01-01 09:00:00.000000000 +0900
+++ x11/lupe/files/patch-avionics.c	2012-10-07 20:04:43.000000000 +0900
@@ -0,0 +1,13 @@
+--- avionics.c.orig	1999-05-29 18:08:12.000000000 +0900
++++ avionics.c	2012-10-07 20:03:12.000000000 +0900
+@@ -16,6 +16,10 @@
+ #include <stdlib.h>
+ #endif
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ #include "extern.h"
+ #include "timer.h"
+ 
diff -urN /usr/ports/x11/lupe/files/patch-lupe.c x11/lupe/files/patch-lupe.c
--- /usr/ports/x11/lupe/files/patch-lupe.c	1970-01-01 09:00:00.000000000 +0900
+++ x11/lupe/files/patch-lupe.c	2012-10-07 20:04:18.000000000 +0900
@@ -0,0 +1,22 @@
+--- lupe.c.orig	1999-05-29 18:08:12.000000000 +0900
++++ lupe.c	2012-10-07 20:03:55.000000000 +0900
+@@ -19,6 +19,10 @@
+ #include "version.h"
+ #include "timer.h"
+ 
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
++
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #else
+@@ -339,7 +343,7 @@
+   photo_delay *= 1000;		/* sec. to millisec. */
+ }
+ 
+-void main(argc, argv)
++int main(argc, argv)
+      int argc;
+      char **argv;
+ {
diff -urN /usr/ports/x11/lupe/files/patch-option.c x11/lupe/files/patch-option.c
--- /usr/ports/x11/lupe/files/patch-option.c	1970-01-01 09:00:00.000000000 +0900
+++ x11/lupe/files/patch-option.c	2012-10-07 20:04:32.000000000 +0900
@@ -0,0 +1,13 @@
+--- option.c.orig	1999-05-29 18:08:12.000000000 +0900
++++ option.c	2012-10-07 20:02:51.000000000 +0900
+@@ -13,6 +13,10 @@
+ #include <stdlib.h>
+ #endif
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ #include "extern.h"
+ 
+ #define OPT_FUNC	1
diff -urN /usr/ports/x11/lupe/pkg-descr x11/lupe/pkg-descr
--- /usr/ports/x11/lupe/pkg-descr	1998-02-08 04:55:58.000000000 +0900
+++ x11/lupe/pkg-descr	2012-10-07 20:11:47.000000000 +0900
@@ -1,8 +1,6 @@
 Lupe is a magnifying glass for X Window System.
-Lupe is like xmag but it updates the image in real-time
-and needs more processor power.
 
-See man page for details.
+Lupe is like xmag but it updates the image in real-time and needs
+more processor power.
 
-Orignal lupe written by UHD98984@pcvan.or.jp .
-This port is done by kazu@jp.freebsd.org .
+WWW: http://www2s.biglobe.ne.jp/~yav/soft/indexe.html
diff -urN /usr/ports/x11/lupe/pkg-plist x11/lupe/pkg-plist
--- /usr/ports/x11/lupe/pkg-plist	2008-07-10 03:01:56.000000000 +0900
+++ x11/lupe/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,3 +0,0 @@
-bin/lupe
-%%PORTDOCS%%%%DOCSDIR%%/lupe.doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:



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