- Convert to USES=autoreconf

- Use CXX compiler for OBJCXX so libtool recognises it.  On FreeBSD 8 and 9
  configure would set OBJCXX to g++ while CXX was c++.
- Add NLS option
- Add missing Xorg dependencies to MANAGER option
- Combine post-extract, post-patch and post-configure into post-patch

PR:		194068

1 files changed, 16 insertions, 45 deletions

diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 52b323dbd3ef..29c2ddbe88f0 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	boinc-client
 PORTVERSION=	7.2.33
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://rene-ladan.nl/pub/distfiles/
@@ -14,8 +14,7 @@ COMMENT=	Berkeley Open Infrastructure for Network Computing client
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		dos2unix gmake libtool pkgconfig tar:xz
-USE_AUTOTOOLS=	autoconf:env automake:env libtoolize:env
+USES=		autoreconf dos2unix gmake libtool pkgconfig tar:xz
 USE_LDCONFIG=	yes
 DOS2UNIX_GLOB=	*.xpm
 
@@ -33,10 +32,11 @@ SUB_LIST=	BOINC_CLIENT_HOME="${BOINC_CLIENT_HOME}" \
 		PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}"
 
 CONFIGURE_ARGS=	--disable-server
+CONFIGURE_ENV=	OBJCXX="${CXX}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=		CLIENT MANAGER X11 LINUX USER SKINS
+OPTIONS_DEFINE=		CLIENT MANAGER NLS X11 LINUX USER SKINS
 OPTIONS_DEFAULT=	CLIENT MANAGER X11 USER
 OPTIONS_GROUP=		SCRIPT
 OPTIONS_GROUP_SCRIPT=	NO_GUI_RPC NO_NET_INFO
@@ -46,7 +46,6 @@ X11_DESC=		Build graphics API
 LINUX_DESC=		Accept Linux science applications
 USER_DESC=		Create/check BOINC client user and directory
 SKINS_DESC=		Install more skins for BOINC manager
-#OPTIMIZE_DESC=		Enable compiler optimization flags
 SCRIPT_DESC=		Command line options in script
 NO_GUI_RPC_DESC=	Disable GUI RPC and socket (breaks boinc_curses)
 NO_NET_INFO_DESC=	Do not send host address and name to servers
@@ -59,7 +58,7 @@ MANAGER_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
 MANAGER_CONFIGURE_ON=	--with-sqlite3-prefix=${LOCALBASE}
 MANAGER_CONFIGURE_OFF=	--with-wx-config=false --without-x
 MANAGER_CONFIGURE_ENABLE=manager
-MANAGER_USE=		XORG=x11 WX=2.8
+MANAGER_USE=		XORG=x11,xext,xscrnsaver WX=2.8
 
 CLIENT_CONFIGURE_ENABLE=client
 CLIENT_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
@@ -69,15 +68,13 @@ CLIENT_USE=		RC_SUBR=boinc-client
 LINUX_CONFIGURE_ON=	--with-boinc-alt-platform=i686-pc-linux-gnu
 LINUX_USE=		LINUX=yes
 
-#OPTIMIZE_CONFIGURE_ENBABLE=	optimize
-
 X11_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 X11_USE=		GL=glut XORG=xmu,xi
+X11_CONFIGURE_OFF=	ax_cv_check_glut_libglut=no
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANAGER}
-#PORT_OPTIONS+=	CLIENT X11
 WX_CONF_ARGS=	absolute
 WX_UNICODE=	yes
 . if ${OSVERSION} < 900506 || (${OSVERSION} >= 1000000 && ${OSVERSION} < 1000002)
@@ -91,15 +88,6 @@ SUB_LIST+=	OPTION_MANAGER=""
 .if ${PORT_OPTIONS:MCLIENT}
 SUB_LIST+=	OPTION_NO_GUI_RPC=${PORT_OPTIONS:MNO_GUI_RPC:S/^NO_GUI_RPC$/--no_gui_rpc/} \
 		OPTION_NO_NET_INFO=${PORT_OPTIONS:MNO_NET_INFO:S/^NO_NET_INFO$/--suppress_net_info/}
-#.else
-#PORT_OPTIONS:=	${PORT_OPTIONS:NUSER}
-.endif
-
-# XXX NLS is not filled in by OPTIONS_SUB ?
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUSER}
@@ -108,15 +96,18 @@ SUB_LIST+=	OPTION_USER="true"
 SUB_LIST+=	OPTION_USER=""
 .endif
 
-PORT_OPTIONS:=	${PORT_OPTIONS:O:u}
-
+post-patch:
+	@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|' \
+		${WRKSRC}/client/hostinfo_unix.cpp
+	@${REINPLACE_CMD} -e 's|client/scripts||' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|$$$$mydir/$$$$ldir|&/LC_MESSAGES|' \
+		${WRKSRC}/locale/Makefile.am
 # avoid build conflict with archivers/libzip
-post-extract:
-	${MV} ${WRKSRC}/zip/unzip/zip.h ${WRKSRC}/zip/unzip/boinczip.h
-	${MV} ${WRKSRC}/zip/zip/zip.h ${WRKSRC}/zip/zip/boinczip.h
-	${REINPLACE_CMD} -e 's|zip/zip.h|zip/boinczip.h|' \
+	@${MV} ${WRKSRC}/zip/unzip/zip.h ${WRKSRC}/zip/unzip/boinczip.h
+	@${MV} ${WRKSRC}/zip/zip/zip.h ${WRKSRC}/zip/zip/boinczip.h
+	@${REINPLACE_CMD} -e 's|zip/zip.h|zip/boinczip.h|' \
 	    ${WRKSRC}/zip/boinc_zip.cpp
-	${REINPLACE_CMD} -e 's|"zip.h"|"boinczip.h"|' \
+	@${REINPLACE_CMD} -e 's|"zip.h"|"boinczip.h"|' \
 	    ${WRKSRC}/zip/unzip/crc32.c ${WRKSRC}/zip/unzip/ttyio.c \
 	    ${WRKSRC}/zip/zip/deflate.c ${WRKSRC}/zip/zip/trees.c \
 	    ${WRKSRC}/zip/zip/unix/z_unix.c ${WRKSRC}/zip/zip/util.c \
@@ -124,26 +115,6 @@ post-extract:
 	    ${WRKSRC}/zip/zip/zip.c ${WRKSRC}/zip/zip/zipfile.c \
 	    ${WRKSRC}/zip/zip/zipup.c
 
-post-patch:
-	${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|' \
-		${WRKSRC}/client/hostinfo_unix.cpp
-
-pre-configure:
-	(cd ${WRKSRC} ; ./_autosetup)
-
-post-configure:
-	@${REINPLACE_CMD} -e 's|client/scripts||' ${WRKSRC}/Makefile.in
-.if ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|$$$$mydir/$$$$ldir|&/LC_MESSAGES|' \
-	    ${WRKSRC}/locale/Makefile.in
-.else
-	@${REINPLACE_CMD} -e 's| locale||' ${WRKSRC}/Makefile.in
-.endif
-.if ! ${PORT_OPTIONS:MX11}
-	@${REINPLACE_CMD} -e 's|@BUILD_GRAPHICS_API_TRUE@|#&|' \
-	    ${WRKSRC}/api/Makefile.in
-.endif
-
 post-install:
 .if ${PORT_OPTIONS:MMANAGER} || ${PORT_OPTIONS:MX11}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc