Attachment #128660 for bug #172511




PORTNAME=	lupe
PORTVERSION=	0.08c
CATEGORIES=	x11 accessibility
MASTER_SITES=	http://www2s.biglobe.ne.jp/~yav/soft/
DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Real-time magnifying glass for X11

OPTIONS_DEFINE=	DOCS

WRKSRC=		${WRKDIR}/${PORTNAME}

USE_XORG=	x11 xext
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})

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>

Line 0 Link Here

(-)x11/lupe/files/patch-avionics.c (+13 lines)
	1	--- avionics.c.orig 1999-05-29 18:08:12.000000000 +0900
	2	+++ avionics.c 2012-10-07 20:03:12.000000000 +0900
	3	@@ -16,6 +16,10 @@
	4	#include <stdlib.h>
	5	#endif
	6
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	+
	11	#include "extern.h"
	12	#include "timer.h"
	13




--- 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;
 {

Line 0 Link Here

(-)x11/lupe/files/patch-option.c (+13 lines)
	1	--- option.c.orig 1999-05-29 18:08:12.000000000 +0900
	2	+++ option.c 2012-10-07 20:02:51.000000000 +0900
	3	@@ -13,6 +13,10 @@
	4	#include <stdlib.h>
	5	#endif
	6
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	+
	11	#include "extern.h"
	12
	13	#define OPT_FUNC 1

Lines 1-8 Link Here

(-)x11/lupe/pkg-descr (-5 / +3 lines)
1	Lupe is a magnifying glass for X Window System.	1	Lupe is a magnifying glass for X Window System.
2	Lupe is like xmag but it updates the image in real-time
3	and needs more processor power.
4		2
5	See man page for details.	3	Lupe is like xmag but it updates the image in real-time and needs
		4	more processor power.
6		5
7	Orignal lupe written by UHD98984@pcvan.or.jp .	6	WWW: http://www2s.biglobe.ne.jp/~yav/soft/indexe.html
8	This port is done by kazu@jp.freebsd.org .

Lines 1-3 Link Here

(-)x11/lupe/pkg-plist (-3 lines)
1	bin/lupe
2	%%PORTDOCS%%%%DOCSDIR%%/lupe.doc
3	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 172511

Lines 4-25 Link Here

(-)x11/lupe/Makefile (-10 / +29 lines)
4	PORTNAME= lupe	4	PORTNAME= lupe
5	PORTVERSION= 0.08c	5	PORTVERSION= 0.08c
6	CATEGORIES= x11 accessibility	6	CATEGORIES= x11 accessibility
7	MASTER_SITES= http://www.oersted.co.jp/~yav/soft/	7	MASTER_SITES= http://www2s.biglobe.ne.jp/~yav/soft/
8	DISTNAME= lupe008c	8	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Real-time magnifying glass for X11	11	COMMENT= Real-time magnifying glass for X11
12		12
13	WRKSRC= ${WRKDIR}/lupe	13	OPTIONS_DEFINE= DOCS
14	USE_IMAKE= yes	14
		15	WRKSRC= ${WRKDIR}/${PORTNAME}
		16
15	USE_XORG= x11 xext	17	USE_XORG= x11 xext
16	XMKMF= xmkmf	18	GNU_CONFIGURE= yes
17	MAN1= lupe.1	19
		20	CPPFLAGS+= -I${LOCALBASE}/include
		21	LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lXext -lm
		22
		23	MAN1= ${PORTNAME}.1
		24	PORTDOCS= ${PORTNAME}.doc
		25	PLIST_FILES= bin/${PORTNAME}
		26
		27	.include <bsd.port.options.mk>
		28
		29	post-extract:
		30	@${LN} -sf ${PORTNAME}.man ${WRKSRC}/${PORTNAME}.1
		31
		32	do-build:
		33	(cd ${WRKSRC} \
		34	&& ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME} *.c ${LDFLAGS})
18		35
19	post-install:	36	do-install:
20	.if !defined(NOPORTDOCS)	37	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
21	${MKDIR} ${DOCSDIR}	38	(cd ${WRKSRC} && ${INSTALL_MAN} ${PORTNAME}.1 ${MANPREFIX}/man/man1)
22	${INSTALL_MAN} ${WRKSRC}/lupe.doc ${DOCSDIR}	39	.if ${PORT_OPTIONS:MDOCS}
		40	@${MKDIR} ${DOCSDIR}
		41	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}.doc ${DOCSDIR})
23	.endif	42	.endif
24		43
25	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Line 0 Link Here

(-)x11/lupe/files/patch-lupe.c (+22 lines)
	1	--- lupe.c.orig 1999-05-29 18:08:12.000000000 +0900
	2	+++ lupe.c 2012-10-07 20:03:55.000000000 +0900
	3	@@ -19,6 +19,10 @@
	4	#include "version.h"
	5	#include "timer.h"
	6
	7	+#ifdef HAVE_STDLIB_H
	8	+#include <stdlib.h>
	9	+#endif
	10	+
	11	#ifdef HAVE_STRING_H
	12	#include <string.h>
	13	#else
	14	@@ -339,7 +343,7 @@
	15	photo_delay = 1000; / sec. to millisec. */
	16	}
	17
	18	-void main(argc, argv)
	19	+int main(argc, argv)
	20	int argc;
	21	char **argv;
	22	{