Stagify, use OPTIONS helpers, cleanup the port, augment port description.

4 files changed, 63 insertions, 72 deletions

diff --git a/sysutils/libieee1284/Makefile b/sysutils/libieee1284/Makefile
index 86ef53275a44..d68606b16376 100644
--- a/sysutils/libieee1284/Makefile
+++ b/sysutils/libieee1284/Makefile
@@ -3,51 +3,37 @@
 
 PORTNAME=	libieee1284
 PORTVERSION=	0.2.10
-PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cyberelk.net/tim/data/libieee1284/stable/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	IEEE1284 communications library
+COMMENT=	IEEE1284 communication library
 
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-ONLY_FOR_ARCHS=	i386
+LICENSE=	GPLv2
 
-.if defined(WITH_PYTHON)
-USE_PYTHON=	yes
-.endif
+ONLY_FOR_ARCHS=	i386
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+USES=		tar:bzip2
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 
-MAN3!=		${CAT} ${FILESDIR}/man3
+PORTDOCS=	README README.FreeBSD
 
-.if defined(WITH_PYTHON)
-CFLAGS+=	-I${PYTHON_INCLUDEDIR}
-LDFLAGS+=	-L${PYTHON_LIBDIR}
-CONFIGURE_ARGS+=--with-python=yes
-PLIST_SUB+=	PYTHON=""
-.else
-CONFIGURE_ARGS+=--with-python=no
-PLIST_SUB+=	PYTHON="@comment "
-.endif
+OPTIONS_DEFINE=	PYTHON
+OPTIONS_SUB=	yes
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	README README.FreeBSD
-.endif
+PYTHON_USE=	PYTHON=yes
+PYTHON_CFLAGS=	-I${PYTHON_INCLUDEDIR}
+PYTHON_LDFLAGS=	-L${PYTHON_LIBDIR}
+PYTHON_CONFIGURE_ON=	--with-python=yes
+PYTHON_CONFIGURE_OFF=	--with-python=no
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's,(objformat=).*,\1elf,' \
 		${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/sysutils/libieee1284/files/man3 b/sysutils/libieee1284/files/man3
deleted file mode 100644
index e3bf0fc8c7e6..000000000000
--- a/sysutils/libieee1284/files/man3
+++ /dev/null
@@ -1,39 +0,0 @@
-libieee1284.3
-parport.3
-parport_list.3
-ieee1284_find_ports.3
-ieee1284_free_ports.3
-ieee1284_get_deviceid.3
-ieee1284_open.3
-ieee1284_close.3
-ieee1284_ref.3
-ieee1284_unref.3
-ieee1284_claim.3
-ieee1284_release.3
-ieee1284_read_data.3
-ieee1284_write_data.3
-ieee1284_data_dir.3
-ieee1284_wait_data.3
-ieee1284_read_status.3
-ieee1284_wait_status.3
-ieee1284_read_control.3
-ieee1284_write_control.3
-ieee1284_frob_control.3
-ieee1284_do_nack_handshake.3
-ieee1284_negotiate.3
-ieee1284_terminate.3
-ieee1284_ecp_fwd_to_rev.3
-ieee1284_ecp_rev_to_fwd.3
-ieee1284_nibble_read.3
-ieee1284_compat_write.3
-ieee1284_byte_read.3
-ieee1284_epp_read_data.3
-ieee1284_epp_write_data.3
-ieee1284_epp_read_addr.3
-ieee1284_epp_write_addr.3
-ieee1284_ecp_read_data.3
-ieee1284_ecp_write_data.3
-ieee1284_ecp_read_addr.3
-ieee1284_ecp_write_addr.3
-ieee1284_get_irq_fd.3
-ieee1284_set_timeout.3
diff --git a/sysutils/libieee1284/pkg-descr b/sysutils/libieee1284/pkg-descr
index 070195667308..8e372e1a9bfe 100644
--- a/sysutils/libieee1284/pkg-descr
+++ b/sysutils/libieee1284/pkg-descr
@@ -1,3 +1,8 @@
-IEEE1284 communications library
+This library is intended to be used by applications that need to communicate
+with (or at least identify) devices that are attached via a parallel port.
+
+The aim of this library is to take all the worry about the above wrinkles
+from the application.  It will figure out which methods are appropriate for
+the currently running kernel (or operating system).
 
 WWW: http://cyberelk.net/tim/libieee1284/
diff --git a/sysutils/libieee1284/pkg-plist b/sysutils/libieee1284/pkg-plist
index b84bad9a90a1..efd6b84458cc 100644
--- a/sysutils/libieee1284/pkg-plist
+++ b/sysutils/libieee1284/pkg-plist
@@ -4,6 +4,45 @@ lib/libieee1284.a
 lib/libieee1284.la
 lib/libieee1284.so
 lib/libieee1284.so.5
+man/man3/ieee1284_byte_read.3.gz
+man/man3/ieee1284_claim.3.gz
+man/man3/ieee1284_close.3.gz
+man/man3/ieee1284_compat_write.3.gz
+man/man3/ieee1284_data_dir.3.gz
+man/man3/ieee1284_do_nack_handshake.3.gz
+man/man3/ieee1284_ecp_fwd_to_rev.3.gz
+man/man3/ieee1284_ecp_read_addr.3.gz
+man/man3/ieee1284_ecp_read_data.3.gz
+man/man3/ieee1284_ecp_rev_to_fwd.3.gz
+man/man3/ieee1284_ecp_write_addr.3.gz
+man/man3/ieee1284_ecp_write_data.3.gz
+man/man3/ieee1284_epp_read_addr.3.gz
+man/man3/ieee1284_epp_read_data.3.gz
+man/man3/ieee1284_epp_write_addr.3.gz
+man/man3/ieee1284_epp_write_data.3.gz
+man/man3/ieee1284_find_ports.3.gz
+man/man3/ieee1284_free_ports.3.gz
+man/man3/ieee1284_frob_control.3.gz
+man/man3/ieee1284_get_deviceid.3.gz
+man/man3/ieee1284_get_irq_fd.3.gz
+man/man3/ieee1284_negotiate.3.gz
+man/man3/ieee1284_nibble_read.3.gz
+man/man3/ieee1284_open.3.gz
+man/man3/ieee1284_read_control.3.gz
+man/man3/ieee1284_read_data.3.gz
+man/man3/ieee1284_read_status.3.gz
+man/man3/ieee1284_ref.3.gz
+man/man3/ieee1284_release.3.gz
+man/man3/ieee1284_set_timeout.3.gz
+man/man3/ieee1284_terminate.3.gz
+man/man3/ieee1284_unref.3.gz
+man/man3/ieee1284_wait_data.3.gz
+man/man3/ieee1284_wait_status.3.gz
+man/man3/ieee1284_write_control.3.gz
+man/man3/ieee1284_write_data.3.gz
+man/man3/libieee1284.3.gz
+man/man3/parport.3.gz
+man/man3/parport_list.3.gz
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/ieee1284module.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/ieee1284module.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/ieee1284module.so