Bug 172511 - x11/lupe: Update MASTER_SITES
Summary: x11/lupe: Update MASTER_SITES
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Marcelo Araujo
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-08 19:10 UTC by tkato432
Modified: 2013-01-21 03:45 UTC (History)
0 users

See Also:


Attachments
file.diff (3.97 KB, patch)
2012-10-08 19:10 UTC, tkato432
no flags Details | Diff
x11_lupe.diff (4.04 KB, patch)
2012-10-26 18:47 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2012-10-08 19:10:18 UTC
- 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
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-10-08 19:11:51 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants his PRs (via the GNATS Auto Assign Tool)
Comment 2 tkato432 2012-10-26 18:47:25 UTC
Remake of the patch against current tree.
Comment 3 Baptiste Daroussin freebsd_committer freebsd_triage 2012-10-29 09:38:40 UTC
Responsible Changed
From-To: miwi->freebsd-ports-bugs

Reassign to the heap miwi being overloaded for now
Comment 4 Marcelo Araujo freebsd_committer freebsd_triage 2012-12-11 13:04:04 UTC
Responsible Changed
From-To: freebsd-ports-bugs->araujo

I'll take it.
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-01-21 03:29:47 UTC
Author: araujo
Date: Mon Jan 21 03:29:37 2013
New Revision: 310737
URL: http://svnweb.freebsd.org/changeset/ports/310737

Log:
  - Update MASTER_SITES and WWWW line.
  - Support PLIST_FILES.
  - Fix build with clang.
  
  PR:		ports/172511
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/x11/lupe/files/
  head/x11/lupe/files/patch-avionics.c   (contents, props changed)
  head/x11/lupe/files/patch-lupe.c   (contents, props changed)
  head/x11/lupe/files/patch-option.c   (contents, props changed)
Deleted:
  head/x11/lupe/pkg-plist
Modified:
  head/x11/lupe/Makefile
  head/x11/lupe/pkg-descr   (contents, props changed)

Modified: head/x11/lupe/Makefile
==============================================================================
--- head/x11/lupe/Makefile	Mon Jan 21 03:28:11 2013	(r310736)
+++ head/x11/lupe/Makefile	Mon Jan 21 03:29:37 2013	(r310737)
@@ -4,25 +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
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-11-26
+OPTIONS_DEFINE=	DOCS
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-WRKSRC=		${WRKDIR}/lupe
-USE_IMAKE=	yes
 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>

Added: head/x11/lupe/files/patch-avionics.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/lupe/files/patch-avionics.c	Mon Jan 21 03:29:37 2013	(r310737)
@@ -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"
+ 

Added: head/x11/lupe/files/patch-lupe.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/lupe/files/patch-lupe.c	Mon Jan 21 03:29:37 2013	(r310737)
@@ -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;
+ {

Added: head/x11/lupe/files/patch-option.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/lupe/files/patch-option.c	Mon Jan 21 03:29:37 2013	(r310737)
@@ -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

Modified: head/x11/lupe/pkg-descr
==============================================================================
--- head/x11/lupe/pkg-descr	Mon Jan 21 03:28:11 2013	(r310736)
+++ head/x11/lupe/pkg-descr	Mon Jan 21 03:29:37 2013	(r310737)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Marcelo Araujo freebsd_committer freebsd_triage 2013-01-21 03:45:46 UTC
State Changed
From-To: open->closed

Committed. Thanks!