svn commit: r353110 - head/devel/ORBit2

[Tijl Coosemans]

Author: tijl
Date: Tue May  6 17:15:47 2014
New Revision: 353110
URL: http://svnweb.freebsd.org/changeset/ports/353110
QAT: https://qat.redports.org/buildarchive/r353110/

Log:
  - Convert to USES=libtool tar:bzip2.
  - Use @sample.

Modified:
  head/devel/ORBit2/Makefile
  head/devel/ORBit2/pkg-plist

Modified: head/devel/ORBit2/Makefile
==============================================================================
--- head/devel/ORBit2/Makefile	Tue May  6 17:14:39 2014	(r353109)
+++ head/devel/ORBit2/Makefile	Tue May  6 17:15:47 2014	(r353110)
@@ -4,7 +4,7 @@
 
 PORTNAME=	ORBit2
 PORTVERSION=	2.14.19
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,14 +12,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	High-performance CORBA ORB with support for the C language
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-USES=		gettext pathfix pkgconfig gmake
+GNU_CONFIGURE=	yes
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig
+USE_GNOME=	libidl referencehack
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	libidl ltverhack referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -32,11 +32,8 @@ post-patch:
 		${WRKSRC}/configure ${WRKSRC}/linc2/src/Makefile.in
 
 post-install:
-	@${ECHO_CMD} "ORBIIOPIPv4=0" > ${STAGEDIR}${PREFIX}/etc/orbit2rc.default
-	@${ECHO_CMD} "ORBIIOPIPv6=0" >> ${STAGEDIR}${PREFIX}/etc/orbit2rc.default
-	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/orbit2rc ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/orbit2rc.default ${STAGEDIR}${PREFIX}/etc/orbit2rc ; \
-	fi
+	@${ECHO_CMD} "ORBIIOPIPv4=0" > ${STAGEDIR}${PREFIX}/etc/orbit2rc.sample
+	@${ECHO_CMD} "ORBIIOPIPv6=0" >> ${STAGEDIR}${PREFIX}/etc/orbit2rc.sample
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/orbit-2.0/idl-backends
 
 .include <bsd.port.mk>

Modified: head/devel/ORBit2/pkg-plist
==============================================================================
--- head/devel/ORBit2/pkg-plist	Tue May  6 17:14:39 2014	(r353109)
+++ head/devel/ORBit2/pkg-plist	Tue May  6 17:15:47 2014	(r353110)
@@ -1,9 +1,7 @@
 bin/linc-cleanup-sockets
 bin/orbit-idl-2
 bin/orbit2-config
- at unexec if cmp -s %D/etc/orbit2rc.default %D/etc/orbit2rc; then rm -f %D/etc/orbit2rc; fi
-etc/orbit2rc.default
- at exec if [ ! -f %D/etc/orbit2rc ] ; then cp -p %D/%F %B/orbit2rc; fi
+ at sample etc/orbit2rc.sample
 include/orbit-2.0/ORBitservices/CosNaming.h
 include/orbit-2.0/ORBitservices/CosNaming_impl.h
 include/orbit-2.0/ORBitservices/orbit-imodule.h
@@ -53,14 +51,17 @@ lib/libORBit-2.a
 lib/libORBit-2.la
 lib/libORBit-2.so
 lib/libORBit-2.so.0
+lib/libORBit-2.so.0.1.0
 lib/libORBit-imodule-2.a
 lib/libORBit-imodule-2.la
 lib/libORBit-imodule-2.so
 lib/libORBit-imodule-2.so.0
+lib/libORBit-imodule-2.so.0.0.0
 lib/libORBitCosNaming-2.a
 lib/libORBitCosNaming-2.la
 lib/libORBitCosNaming-2.so
 lib/libORBitCosNaming-2.so.0
+lib/libORBitCosNaming-2.so.0.1.0
 lib/libname-server-2.a
 libdata/pkgconfig/ORBit-2.0.pc
 libdata/pkgconfig/ORBit-CosNaming-2.0.pc