From 767b5c2bdb1a97b48519a2d6bb9dde730c610d97 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Mon, 30 Jun 2014 21:47:55 +0000
Subject: [PATCH] - Convert x11-toolkits/neXtaw to USES=libtool and bump
 dependent ports - Add stage support to x11-fonts/nexfontsel

---
 x11-fonts/nexfontsel/Makefile             | 11 ++++-------
 x11-fonts/nexfontsel/pkg-plist            |  1 +
 x11-toolkits/neXtaw/Makefile              | 10 +++-------
 x11-toolkits/neXtaw/files/patch-configure | 10 ----------
 x11-toolkits/neXtaw/pkg-plist             |  4 ++--
 5 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 x11-toolkits/neXtaw/files/patch-configure

diff --git a/x11-fonts/nexfontsel/Makefile b/x11-fonts/nexfontsel/Makefile
index da980c84bd8c..b502f5be25fc 100644
--- a/x11-fonts/nexfontsel/Makefile
+++ b/x11-fonts/nexfontsel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nexfontsel
 PORTVERSION=	3.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/ \
 		${MASTER_SITE_LOCAL}
@@ -13,21 +13,18 @@ DISTNAME=	NeXFontSel-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NeXtaw based replacement for xfontsel
 
-LIB_DEPENDS=	neXtaw:${PORTSDIR}/x11-toolkits/neXtaw
+LIB_DEPENDS=	libneXtaw.so:${PORTSDIR}/x11-toolkits/neXtaw
 
 USES=		imake
 USE_XORG=	xaw
 
-MAN1=		nexfontsel.1
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CDEBUG|XCOMM CDEBUG|g ; \
 		s|= XawClientLibs|= -lneXtaw -lXmu -lXt -lX11|g' ${WRKSRC}/Imakefile
 
 post-install:
-	@${MKDIR} ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults
 	${INSTALL_DATA} ${WRKSRC}/NeXFontSel-ja.ad \
-		${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/NeXFontSel
+		${STAGEDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/NeXFontSel
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/nexfontsel/pkg-plist b/x11-fonts/nexfontsel/pkg-plist
index 510e43298726..0acf1f878aa6 100644
--- a/x11-fonts/nexfontsel/pkg-plist
+++ b/x11-fonts/nexfontsel/pkg-plist
@@ -1,5 +1,6 @@
 bin/nexfontsel
 lib/X11/app-defaults/NeXFontSel
 lib/X11/ja_JP.eucJP/app-defaults/NeXFontSel
+man/man1/nexfontsel.1.gz
 @dirrmtry lib/X11/ja_JP.eucJP/app-defaults
 @dirrmtry lib/X11/ja_JP.eucJP
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index f1795853d7ad..0e3c739363df 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -3,23 +3,19 @@
 
 PORTNAME=	neXtaw
 PORTVERSION=	0.15.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://siag.nu/pub/neXtaw/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Athena Widgets with N*XTSTEP appearance
 
-USE_AUTOTOOLS=	libtool
-USE_XORG=	xmu x11 xext
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		libtool
 USE_LDCONFIG=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|version-info.*$$|version-info 8:0:0|g' \
-		${WRKSRC}/X11/neXtaw/Makefile.in
+USE_XORG=	xmu x11 xext
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/x11-toolkits/neXtaw/files/patch-configure b/x11-toolkits/neXtaw/files/patch-configure
deleted file mode 100644
index 5c7864e614eb..000000000000
--- a/x11-toolkits/neXtaw/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sat Aug 23 07:48:47 2003
-+++ configure	Sat Aug 23 23:29:10 2003
-@@ -6668,6 +6668,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/neXtaw/pkg-plist b/x11-toolkits/neXtaw/pkg-plist
index 8065e4e33303..41fc8398770c 100644
--- a/x11-toolkits/neXtaw/pkg-plist
+++ b/x11-toolkits/neXtaw/pkg-plist
@@ -80,9 +80,9 @@ include/X11/neXtaw/XawInit.h
 include/X11/neXtaw/XawVersion.h
 include/X11/neXtaw/laygram.h
 lib/libneXtaw.a
-lib/libneXtaw.la
 lib/libneXtaw.so
-lib/libneXtaw.so.8
+lib/libneXtaw.so.0
+lib/libneXtaw.so.0.15.1
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/README