svn commit: r355799 - in head/net-mgmt/ap-utils: . files

[Antoine Brodin]

Author: antoine
Date: Fri May 30 08:05:02 2014
New Revision: 355799
URL: http://svnweb.freebsd.org/changeset/ports/355799
QAT: https://qat.redports.org/buildarchive/r355799/

Log:
  - Stage support
  - Use options hepers where possible
  
  Submitted by:	maintainer

Added:
  head/net-mgmt/ap-utils/files/patch-configure   (contents, props changed)
  head/net-mgmt/ap-utils/files/patch-lib__ap_search.c
     - copied, changed from r355798, head/net-mgmt/ap-utils/files/patch-aa
Deleted:
  head/net-mgmt/ap-utils/files/patch-aa
Modified:
  head/net-mgmt/ap-utils/Makefile
  head/net-mgmt/ap-utils/pkg-plist

Modified: head/net-mgmt/ap-utils/Makefile
==============================================================================
--- head/net-mgmt/ap-utils/Makefile	Fri May 30 08:01:55 2014	(r355798)
+++ head/net-mgmt/ap-utils/Makefile	Fri May 30 08:05:02 2014	(r355799)
@@ -5,42 +5,32 @@ PORTNAME=	ap-utils
 PORTVERSION=	1.4.1
 PORTREVISION=	4
 CATEGORIES=	net-mgmt
-MASTER_SITES=	 SF
+MASTER_SITES=	SF
 
 MAINTAINER=	david at catwhisker.org
-COMMENT=	A set of utilities to configure and monitor wireless access points
+COMMENT=	Set of utilities to configure and monitor wireless access points
 
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USES=		iconv
+USES=		iconv tar:bzip2
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lintl -L${LOCALBASE}/lib
-MAN8=		ap-trapd.8 ap-mrtg.8 ap-config.8
-
-NO_STAGE=	yes
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
+NLS_CONFIGURE_WITHOUT=	--disable-nls
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
+.if ! ${PORT_OPTIONS:MNLS}
 BROKEN=		Does not build without gettext
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|_nl_domain_bindings|libintl_nl_domain_bindings|' ${WRKSRC}/configure
-
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/Documentation && \
-		${INSTALL_DATA} FAQ Ovislink-HOWTO.html HARDWARE-NOTES README.ap-gl ${DOCSDIR}
-.endif
+		${INSTALL_DATA} FAQ Ovislink-HOWTO.html HARDWARE-NOTES README.ap-gl ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/net-mgmt/ap-utils/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/ap-utils/files/patch-configure	Fri May 30 08:05:02 2014	(r355799)
@@ -0,0 +1,36 @@
+--- ./configure.orig	2004-05-16 14:10:31.000000000 +0000
++++ ./configure	2014-05-30 08:01:14.000000000 +0000
+@@ -6840,7 +6840,6 @@
+ /* end confdefs.h.  */
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -6850,7 +6849,7 @@
+ main ()
+ {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+   ;
+   return 0;
+ }
+@@ -6886,7 +6885,6 @@
+ /* end confdefs.h.  */
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -6896,7 +6894,7 @@
+ main ()
+ {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+   ;
+   return 0;
+ }

Copied and modified: head/net-mgmt/ap-utils/files/patch-lib__ap_search.c (from r355798, head/net-mgmt/ap-utils/files/patch-aa)
==============================================================================
--- head/net-mgmt/ap-utils/files/patch-aa	Fri May 30 08:01:55 2014	(r355798, copy source)
+++ head/net-mgmt/ap-utils/files/patch-lib__ap_search.c	Fri May 30 08:05:02 2014	(r355799)
@@ -1,5 +1,5 @@
---- lib/ap_search.c.orig	Tue May  4 11:18:09 2004
-+++ lib/ap_search.c	Fri Jul 30 22:29:37 2004
+--- ./lib/ap_search.c.orig	2004-05-04 15:18:09.000000000 +0000
++++ ./lib/ap_search.c	2014-05-30 08:01:14.000000000 +0000
 @@ -34,6 +34,7 @@
  #include <sys/socket.h>
  #endif

Modified: head/net-mgmt/ap-utils/pkg-plist
==============================================================================
--- head/net-mgmt/ap-utils/pkg-plist	Fri May 30 08:01:55 2014	(r355798)
+++ head/net-mgmt/ap-utils/pkg-plist	Fri May 30 08:05:02 2014	(r355799)
@@ -1,6 +1,9 @@
 bin/ap-config
 bin/ap-mrtg
 bin/ap-gl
+man/man8/ap-trapd.8.gz
+man/man8/ap-mrtg.8.gz
+man/man8/ap-config.8.gz
 sbin/ap-trapd
 %%NLS%%share/locale/fr/LC_MESSAGES/ap-utils.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/ap-utils.mo