svn commit: r425632 - head/x11-toolkits/Xaw3d

[Dmitry Marakasov]

Author: amdmi3
Date: Mon Nov  7 15:47:41 2016
New Revision: 425632
URL: https://svnweb.freebsd.org/changeset/ports/425632

Log:
  - Make NLS support non-optional; the option affects list of installed headers and supported library functions, and disabling it makes third party ports (games/xgospell, for example) fail

Modified:
  head/x11-toolkits/Xaw3d/Makefile
  head/x11-toolkits/Xaw3d/pkg-descr
  head/x11-toolkits/Xaw3d/pkg-plist

Modified: head/x11-toolkits/Xaw3d/Makefile
==============================================================================
--- head/x11-toolkits/Xaw3d/Makefile	Mon Nov  7 15:27:12 2016	(r425631)
+++ head/x11-toolkits/Xaw3d/Makefile	Mon Nov  7 15:47:41 2016	(r425632)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Xaw3d
 PORTVERSION=	1.5E
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://slackware.cs.utah.edu/pub/slackware/slackware64-13.1/source/x/xaw3d/
 
@@ -13,7 +13,7 @@ COMMENT=	3-D Athena Widget set that look
 LICENSE=	MIT
 
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
-USES=		imake
+USES=		gettext imake
 USE_XORG=	x11 xext xmu xt sm ice xpm
 USE_LDCONFIG=	yes
 
@@ -21,19 +21,12 @@ SUB_FILES=	pkg-message
 XAWVER=		8
 SUB_LIST=	XAWVER="${XAWVER}"
 
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
-NLS_USES=	gettext
+OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/X11/Xaw3d
 	@cd ${WRKSRC}/X11/Xaw3d; ${LN} -sf ../../*.h .
 
-post-extract-NLS-off:
-	@${REINPLACE_CMD} -e '/LINTLIBS =/s/=.*/=/' \
-		-e '/#ifdef XawI18nDefines/s//#if 0/' \
-		${WRKSRC}/Imakefile
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libXaw3d.so
 

Modified: head/x11-toolkits/Xaw3d/pkg-descr
==============================================================================
--- head/x11-toolkits/Xaw3d/pkg-descr	Mon Nov  7 15:27:12 2016	(r425631)
+++ head/x11-toolkits/Xaw3d/pkg-descr	Mon Nov  7 15:47:41 2016	(r425632)
@@ -1,4 +1,2 @@
 Xaw3d is a Xaw (Athena Widget Set) replacement that looks
 three-dimensional.  The author is Kalib Keithley (kaleb at x.org).
-
-LICENSE: X11

Modified: head/x11-toolkits/Xaw3d/pkg-plist
==============================================================================
--- head/x11-toolkits/Xaw3d/pkg-plist	Mon Nov  7 15:27:12 2016	(r425631)
+++ head/x11-toolkits/Xaw3d/pkg-plist	Mon Nov  7 15:47:41 2016	(r425632)
@@ -27,10 +27,10 @@ include/X11/Xaw3d/List.h
 include/X11/Xaw3d/ListP.h
 include/X11/Xaw3d/MenuButtoP.h
 include/X11/Xaw3d/MenuButton.h
-%%NLS%%include/X11/Xaw3d/MultiSink.h
-%%NLS%%include/X11/Xaw3d/MultiSinkP.h
-%%NLS%%include/X11/Xaw3d/MultiSrc.h
-%%NLS%%include/X11/Xaw3d/MultiSrcP.h
+include/X11/Xaw3d/MultiSink.h
+include/X11/Xaw3d/MultiSinkP.h
+include/X11/Xaw3d/MultiSrc.h
+include/X11/Xaw3d/MultiSrcP.h
 include/X11/Xaw3d/Paned.h
 include/X11/Xaw3d/PanedP.h
 include/X11/Xaw3d/Panner.h
@@ -73,10 +73,10 @@ include/X11/Xaw3d/Toggle.h
 include/X11/Xaw3d/ToggleP.h
 include/X11/Xaw3d/Tree.h
 include/X11/Xaw3d/TreeP.h
-%%NLS%%include/X11/Xaw3d/VendorEP.h
+include/X11/Xaw3d/VendorEP.h
 include/X11/Xaw3d/Viewport.h
 include/X11/Xaw3d/ViewportP.h
 include/X11/Xaw3d/Xaw3dP.h
-%%NLS%%include/X11/Xaw3d/XawImP.h
+include/X11/Xaw3d/XawImP.h
 include/X11/Xaw3d/XawInit.h
 %%PORTDOCS%%share/doc/Xaw3d/README.XAW3D