Stagify, and fix dependencies to compat6x.

2 files changed, 20 insertions, 26 deletions

diff --git a/devel/eiffelstudio/Makefile b/devel/eiffelstudio/Makefile
index d33b817dacf8..0b3611fc81aa 100644
--- a/devel/eiffelstudio/Makefile
+++ b/devel/eiffelstudio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	eiffelstudio
 PORTVERSION=	5.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.rit.edu/pub/mirrors/ise/download/57/ \
 		ftp://ftp.inf.ethz.ch/pub/mirror/eiffel/57/ \
@@ -20,7 +20,7 @@ DISTNAME=	Eiffel${PORTVERSION:S/.//}_gpl_64493-freebsd-${EIFFEL_ARCH}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Complete Integrated Development Environment for Eiffel
 
-LIB_DEPENDS=	c.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS=	c.6:${PORTSDIR}/misc/compat6x
 
 USE_GNOME=	gtk20
 NO_BUILD=	yes
@@ -34,7 +34,6 @@ EIFFEL_HOST=	${OPSYS:tl}-${EIFFEL_ARCH}
 PLIST_SUB+=	EIFFEL_HOST="${EIFFEL_HOST}"
 SUB_LIST+=	EIFFEL_HOST="${EIFFEL_HOST}"
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # Try native version first, then try i386 compatibility framework.
@@ -56,20 +55,15 @@ PLIST_SUB+=	${arch:tu}="@comment "
 .endfor
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${CP} -R ${WRKSRC}/* ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-.for f in libgtk-x11-2.0.so.400 libgdk-x11-2.0.so.400 libatk-1.0.so.600 \
-    libgdk_pixbuf-2.0.so.400 libpangoxft-1.0.so.399 libpangox-1.0.so.399 \
-    libpango-1.0.so.399 libgobject-2.0.so.400 libgmodule-2.0.so.400 \
-    libgthread-2.0.so.400 libglib-2.0.so.400
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${CP} -R ${WRKSRC}/* ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+.for f in libgtk-x11-2.0.so.600 libgdk-x11-2.0.so.600 libatk-1.0.so.600 \
+    libgdk_pixbuf-2.0.so.600 libpangoxft-1.0.so.800 libpangox-1.0.so.800 \
+    libpango-1.0.so.800 libgobject-2.0.so.600 libgmodule-2.0.so.600 \
+    libgthread-2.0.so.600 libglib-2.0.so.600
 	${LN} -sf ${LOCALBASE}/lib/${f:C/\.[[:digit:]]+$//} \
-		${DATADIR}/studio/spec/${EIFFEL_HOST}/lib/${f}
+		${STAGEDIR}${DATADIR}/studio/spec/${EIFFEL_HOST}/lib/${f}
 .endfor
 
-post-install:
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
 .include <bsd.port.post.mk>
diff --git a/devel/eiffelstudio/pkg-plist b/devel/eiffelstudio/pkg-plist
index 02dfa18b65e6..90e5725db291 100644
--- a/devel/eiffelstudio/pkg-plist
+++ b/devel/eiffelstudio/pkg-plist
@@ -16976,21 +16976,21 @@ bin/eiffelstudio
 %%AMD64%%%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libebench.a
 %%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libfinalized.a
 %%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libfinalized.so
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgdk-x11-2.0.so.400
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgdk_pixbuf-2.0.so.400
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libglib-2.0.so.400
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgmodule-2.0.so.400
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgobject-2.0.so.400
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgthread-2.0.so.400
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgtk-x11-2.0.so.400
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgdk-x11-2.0.so.600
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgdk_pixbuf-2.0.so.600
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libglib-2.0.so.600
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgmodule-2.0.so.600
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgobject-2.0.so.600
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgthread-2.0.so.600
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libgtk-x11-2.0.so.600
 %%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libmtebench.a
 %%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libmtfinalized.a
 %%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libmtfinalized.so
 %%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libmtwkbench.a
 %%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libmtwkbench.so
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libpango-1.0.so.399
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libpangox-1.0.so.399
-%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libpangoxft-1.0.so.399
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libpango-1.0.so.800
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libpangox-1.0.so.800
+%%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libpangoxft-1.0.so.800
 %%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libwkbench.a
 %%DATADIR%%/studio/spec/%%EIFFEL_HOST%%/lib/libwkbench.so
 %%DATADIR%%/studio/wizards/new_projects/vision2.dsc