Stageify, and misc small cleanups.

Move net/libgweather3 -> net/libgweather.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18965 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 17 insertions, 24 deletions

diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 1f25bdd89..9c7433754 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -1,7 +1,6 @@
-
 # Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/lang/gjs/Makefile 18581 2013-06-23 10:50:00Z kwm $
+#   $MCom$
 
 PORTNAME=	gjs
 PORTVERSION=	1.34.0
@@ -17,11 +16,10 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 
 CONFLICTS_BUILD=spidermonkey17-1.7.*
 
-NO_STAGE=	yes
 USE_XZ=		yes
 USES=		gettext gmake pathfix pkgconfig shebangfix
 USE_PYTHON_BUILD=yes
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
 		intlhack ltverhack
 USE_LDCONFIG=	yes
@@ -30,4 +28,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 SHEBANG_FILES=	scripts/make-tests
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gjs-1.0/*.so
+
 .include <bsd.port.mk>
diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist
index 1a5a0558e..203ac5252 100644
--- a/lang/gjs/pkg-plist
+++ b/lang/gjs/pkg-plist
@@ -28,39 +28,28 @@ include/gjs-1.0/gjs/jsapi-util.h
 include/gjs-1.0/gjs/mem.h
 include/gjs-1.0/gjs/native.h
 include/gjs-1.0/gjs/type-module.h
-lib/gjs-1.0/cairoNative.a
 lib/gjs-1.0/cairoNative.la
 lib/gjs-1.0/cairoNative.so
-lib/gjs-1.0/console.a
 lib/gjs-1.0/console.la
 lib/gjs-1.0/console.so
-lib/gjs-1.0/dbusNative.a
 lib/gjs-1.0/dbusNative.la
 lib/gjs-1.0/dbusNative.so
-lib/gjs-1.0/debugger.a
 lib/gjs-1.0/debugger.la
 lib/gjs-1.0/debugger.so
-lib/gjs-1.0/formatNative.a
 lib/gjs-1.0/formatNative.la
 lib/gjs-1.0/formatNative.so
-lib/gjs-1.0/gettextNative.a
 lib/gjs-1.0/gettextNative.la
 lib/gjs-1.0/gettextNative.so
-lib/gjs-1.0/langNative.a
 lib/gjs-1.0/langNative.la
 lib/gjs-1.0/langNative.so
-lib/gjs-1.0/mainloop.a
 lib/gjs-1.0/mainloop.la
 lib/gjs-1.0/mainloop.so
-lib/gjs-1.0/system.a
 lib/gjs-1.0/system.la
 lib/gjs-1.0/system.so
 lib/gjs/girepository-1.0/GjsPrivate-1.0.typelib
-lib/libgjs-dbus.a
 lib/libgjs-dbus.la
 lib/libgjs-dbus.so
 lib/libgjs-dbus.so.0
-lib/libgjs.a
 lib/libgjs.la
 lib/libgjs.so
 lib/libgjs.so.0
diff --git a/lang/vala-vapigen/Makefile b/lang/vala-vapigen/Makefile
index 89c298072..ca89701fd 100644
--- a/lang/vala-vapigen/Makefile
+++ b/lang/vala-vapigen/Makefile
@@ -1,5 +1,5 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD: head/lang/vala-vapigen/Makefile 313633 2013-03-08 10:51:34Z kwm $
+# $FreeBSD$
 #   $MCom$
 
 PORTREVISION=	0
@@ -7,7 +7,7 @@ CATEGORIES=	devel gnome
 PKGNAMESUFFIX=	-vapigen
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	The vapigen program from vala
+COMMENT=	Vapigen program from vala
 
 MASTERDIR=	${.CURDIR}/../vala
 BUILD_WRKSRC=	${WRKSRC}/vapigen
diff --git a/lang/vala-vapigen/pkg-plist b/lang/vala-vapigen/pkg-plist
index b95270d07..52bf13b41 100644
--- a/lang/vala-vapigen/pkg-plist
+++ b/lang/vala-vapigen/pkg-plist
@@ -7,6 +7,8 @@ bin/vapigen-%%VERSION%%
 lib/vala-%%VERSION%%/gen-introspect-%%VERSION%%
 libdata/pkgconfig/vapigen-%%VERSION%%.pc
 libdata/pkgconfig/vapigen.pc
+man/man1/vala-gen-introspect.1.gz
+man/man1/vapigen.1.gz
 share/aclocal/vapigen.m4
 %%DATADIR%%/Makefile.vapigen
 @dirrm lib/vala-%%VERSION%%
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index c8a107a82..2002ebe4f 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,5 +1,5 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD: head/lang/vala/Makefile 313635 2013-03-08 11:32:11Z bapt $
+# $FreeBSD$
 #   $MCom$
 
 PORTNAME=	vala
@@ -12,7 +12,6 @@ COMMENT=	Programming language and compiler that converts Vala code into C code
 
 LICENSE=	LGPL21
 
-NO_STAGE=	yes
 USES=		bison gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomeprefix libxslt
@@ -21,7 +20,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-MAN1?=		valac.1 valac-${VALA_VER}.1
 VALA_VER=	${PORTVERSION:R}
 
 PLIST_SUB=	VERSION=${VALA_VER}
@@ -31,7 +29,6 @@ LIB_DEPENDS+=	libvala-${VALA_VER}.so:${PORTSDIR}/lang/vala
 CONFIGURE_ARGS+=--enable-vapigen
 BUILD_DEPENDS+=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
 RUN_DEPENDS+=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
-MAN1=		vala-gen-introspect.1 vapigen.1
 .else
 CONFIGURE_ARGS+=--disable-vapigen
 .endif
@@ -54,13 +51,14 @@ pre-build:
 		${GMAKE} gen-introspect
 
 post-install:
-	@cd ${WRKSRC}/gobject-introspection && ${GMAKE} install
+	@cd ${WRKSRC}/gobject-introspection && DESTDIR=${STAGEDIR} ${GMAKE} install
 	@${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \
-		 ${PREFIX}/man/man1/
+		 ${STAGEDIR}${PREFIX}/man/man1/
 .else
 post-install:
 	${LN} -fs ${PREFIX}/libdata/pkgconfig/libvala-${VALA_VER}.pc \
-		${PREFIX}/libdata/pkgconfig/vala-1.0.pc
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/vala-1.0.pc
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 241299a6c..c47d38df5 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -11,6 +11,8 @@ lib/libvala-%%VERSION%%.so
 lib/libvala-%%VERSION%%.so.0
 libdata/pkgconfig/libvala-%%VERSION%%.pc
 libdata/pkgconfig/vala-1.0.pc
+man/man1/valac-%%VERSION%%.1.gz
+man/man1/valac.1.gz
 share/aclocal/vala.m4
 share/devhelp/books/vala-%%VERSION%%/attributes.html
 share/devhelp/books/vala-%%VERSION%%/classes.html