6 files changed, 79 insertions, 20 deletions
diff --git a/x11/lupe/Makefile b/x11/lupe/Makefile
index 0c22b52c1aeb..2d550ee78c65 100644
--- a/x11/lupe/Makefile
+++ b/x11/lupe/Makefile
@@ -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>
diff --git a/x11/lupe/files/patch-avionics.c b/x11/lupe/files/patch-avionics.c
new file mode 100644
index 000000000000..81ab92c4b5a6
--- /dev/null
+++ b/x11/lupe/files/patch-avionics.c
@@ -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 --git a/x11/lupe/files/patch-lupe.c b/x11/lupe/files/patch-lupe.c
new file mode 100644
index 000000000000..43505614fbc5
--- /dev/null
+++ b/x11/lupe/files/patch-lupe.c
@@ -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 --git a/x11/lupe/files/patch-option.c b/x11/lupe/files/patch-option.c
new file mode 100644
index 000000000000..ea4c17e11767
--- /dev/null
+++ b/x11/lupe/files/patch-option.c
@@ -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 --git a/x11/lupe/pkg-descr b/x11/lupe/pkg-descr
index 741f4e4d702b..a95f483e61d4 100644
--- a/x11/lupe/pkg-descr
+++ b/x11/lupe/pkg-descr
@@ -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 --git a/x11/lupe/pkg-plist b/x11/lupe/pkg-plist
deleted file mode 100644
index 5e7f53dc601e..000000000000
--- a/x11/lupe/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/lupe
-%%PORTDOCS%%%%DOCSDIR%%/lupe.doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%