[Midnightbsd-cvs] mports [18798] trunk/x11-toolkits/Xaw3d: fix plist

[laffer1 at midnightbsd.org]

Revision: 18798
          http://svnweb.midnightbsd.org/mports/?rev=18798
Author:   laffer1
Date:     2015-05-04 19:10:35 -0400 (Mon, 04 May 2015)
Log Message:
-----------
fix plist

Modified Paths:
--------------
    trunk/x11-toolkits/Xaw3d/Makefile
    trunk/x11-toolkits/Xaw3d/pkg-plist

Added Paths:
-----------
    trunk/x11-toolkits/Xaw3d/files/patch-Box.c

Modified: trunk/x11-toolkits/Xaw3d/Makefile
===================================================================
--- trunk/x11-toolkits/Xaw3d/Makefile	2015-05-04 23:04:01 UTC (rev 18797)
+++ trunk/x11-toolkits/Xaw3d/Makefile	2015-05-04 23:10:35 UTC (rev 18798)
@@ -2,18 +2,18 @@
 
 PORTNAME=	Xaw3d
 PORTVERSION=	1.5E
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.visi.com/users/hawkeyd/X/ \
-		ftp.slackware.com/pub/slackware/slackware_source/x/xaw3d/
+MASTER_SITES=	http://slackware.cs.utah.edu/pub/slackware/slackware64-13.1/source/x/xaw3d/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	3-D Athena Widget set that looks like Motif
+
 LICENSE=	mit
 
+OPTIONS_DEFINE=	DOCS NLS
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
-USE_GCC=	any
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xmu xt sm ice xpm
 USE_LDCONFIG=	yes
 
@@ -20,13 +20,13 @@
 BUILD_DEPENDS+=	${LOCALBASE}/lib/X11/config/Imake.tmpl:${PORTSDIR}/x11/xorg-cf-files
 
 SUB_FILES=	pkg-message
-XAWVER=		8
+XAWVER=		8.0
 SUB_LIST=	XAWVER="${XAWVER}"
 
 .include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
@@ -33,18 +33,17 @@
 .endif
 
 post-extract:
-	${MKDIR} ${WRKSRC}/X11/Xaw3d
-	cd ${WRKSRC}/X11/Xaw3d; ${LN} -sf ../../*.h .
+	@${MKDIR} ${WRKSRC}/X11/Xaw3d
+	@cd ${WRKSRC}/X11/Xaw3d; ${LN} -sf ../../*.h .
 .if ! ${PORT_OPTIONS:MNLS}
-	${REINPLACE_CMD} -e '/LINTLIBS =/s/=.*/=/' \
+	@${REINPLACE_CMD} -e '/LINTLIBS =/s/=.*/=/' \
 		-e '/#ifdef XawI18nDefines/s//#if 0/' \
 		${WRKSRC}/Imakefile
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${DOCSDIR}/
-.endif
+	(cd ${PREFIX}/lib && ${LN} -sf libXaw3d.so.8 libXaw3d.so)
 
 .include <bsd.port.mk>

Added: trunk/x11-toolkits/Xaw3d/files/patch-Box.c
===================================================================
--- trunk/x11-toolkits/Xaw3d/files/patch-Box.c	                        (rev 0)
+++ trunk/x11-toolkits/Xaw3d/files/patch-Box.c	2015-05-04 23:10:35 UTC (rev 18798)
@@ -0,0 +1,24 @@
+*** Box.c~	1996-10-15 10:41:18.000000000 -0400
+--- Box.c	2007-04-21 14:12:44.000000000 -0400
+***************
+*** 353,360 ****
+  	else {
+  	    width = preferred_width;
+  	    do { /* find some width big enough to stay within this height */
+! 		width *= 2;
+! 		if (width > constraint->width) width = constraint->width;
+  		DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE);
+  	    } while (preferred_height > constraint->height &&
+  		     width < constraint->width);
+--- 353,363 ----
+  	else {
+  	    width = preferred_width;
+  	    do { /* find some width big enough to stay within this height */
+! 		if (width > constraint->width/2) /* avoid short int overflow */
+! 		    width = constraint->width;
+! 		else
+! 		    width *= 2;
+! 
+  		DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE);
+  	    } while (preferred_height > constraint->height &&
+  		     width < constraint->width);


Property changes on: trunk/x11-toolkits/Xaw3d/files/patch-Box.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-toolkits/Xaw3d/pkg-plist
===================================================================
--- trunk/x11-toolkits/Xaw3d/pkg-plist	2015-05-04 23:04:01 UTC (rev 18797)
+++ trunk/x11-toolkits/Xaw3d/pkg-plist	2015-05-04 23:10:35 UTC (rev 18798)
@@ -1,6 +1,6 @@
 lib/libXaw3d.a
 lib/libXaw3d.so
-lib/libXaw3d.so.8
+lib/libXaw3d.so.8.0
 include/X11/Xaw3d/AllWidgets.h
 include/X11/Xaw3d/AsciiSink.h
 include/X11/Xaw3d/AsciiSinkP.h
@@ -80,5 +80,3 @@
 %%NLS%%include/X11/Xaw3d/XawImP.h
 include/X11/Xaw3d/XawInit.h
 %%PORTDOCS%%share/doc/Xaw3d/README.XAW3D
- at dirrm include/X11/Xaw3d
-%%PORTDOCS%%@dirrm share/doc/Xaw3d