[Midnightbsd-cvs] mports [17080] trunk/x11-wm/libcompizconfig: libcompizconfig 0.8.8

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 13 23:12:32 EDT 2014 

Revision: 17080
          http://svnweb.midnightbsd.org/mports/?rev=17080
Author:   laffer1
Date:     2014-09-13 23:12:31 -0400 (Sat, 13 Sep 2014)
Log Message:
-----------
libcompizconfig 0.8.8

Modified Paths:
--------------
    trunk/x11-wm/libcompizconfig/Makefile
    trunk/x11-wm/libcompizconfig/distinfo
    trunk/x11-wm/libcompizconfig/files/patch-src-main.c
    trunk/x11-wm/libcompizconfig/pkg-descr
    trunk/x11-wm/libcompizconfig/pkg-plist

Modified: trunk/x11-wm/libcompizconfig/Makefile
===================================================================
--- trunk/x11-wm/libcompizconfig/Makefile	2014-09-14 03:10:35 UTC (rev 17079)
+++ trunk/x11-wm/libcompizconfig/Makefile	2014-09-14 03:12:31 UTC (rev 17080)
@@ -1,42 +1,51 @@
-# New ports collection makefile for:	libcompizconfig
-# Date created:				2007-08-16
-# Whom:					Robert Noland <rnoland at 2hip.net>
-#
 # $MidnightBSD$
 # $FreeBSD: ports/x11-wm/libcompizconfig/Makefile,v 1.5 2008/04/19 17:55:55 miwi Exp $
 #
 
 PORTNAME=	libcompizconfig
-PORTVERSION=	0.6.0
-#PORTREVISION=	0
+PORTVERSION=	0.8.8
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
+MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	An alternative configuration system for Compiz
+COMMENT=	Alternative configuration system for Compiz
 LICENSE=	gpl2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
 
-USE_GNOME=	gnomehack intltool libxml2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USE_GNOME=	intltool libxml2
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd6.0
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
+OPTIONS_DEFINE=	INOTIFY
+OPTIONS_DEFAULT=	INOTIFY
+INOTIFY_DESC?=	Enable inotify support
+
+INOTIFY_LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+INOTIFY_LDFLAGS=	-linotify
+
+.include <bsd.port.pre.mk>
+
 post-patch:
+.if empty(PORT_OPTIONS:MINOTIFY)
+	@${REINPLACE_CMD} -e 's|sys/inotify.h||' ${WRKSRC}/configure
+.endif
+	@echo "OSVERSION=${OSVERSION}"
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|'	\
 		${WRKSRC}/src/main.c			\
 		${WRKSRC}/src/lists.c			\
-		${WRKSRC}/src/compiz.c			\
 		${WRKSRC}/src/filewatch.c		\
 		${WRKSRC}/src/ini.c			\
 		${WRKSRC}/backend/ini.c
 
-.include <bsd.port.mk>
+post-install:
+.for l in compizconfig/backends/libini.so compiz/libccp.so libcompizconfig.so.0.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}
+.endfor
+
+.include <bsd.port.post.mk>

Modified: trunk/x11-wm/libcompizconfig/distinfo
===================================================================
--- trunk/x11-wm/libcompizconfig/distinfo	2014-09-14 03:10:35 UTC (rev 17079)
+++ trunk/x11-wm/libcompizconfig/distinfo	2014-09-14 03:12:31 UTC (rev 17080)
@@ -1,3 +1,2 @@
-SHA256 (libcompizconfig-0.6.0.tar.bz2) = 32cec7f2c6d8af1d331afa1985ad14706c5c744b6e6e4656985e8b8793b8e5dc
-RMD160 (libcompizconfig-0.6.0.tar.bz2) = b38f9525878455534ebcc737b11521b49fb8f478
-SIZE (libcompizconfig-0.6.0.tar.bz2) = 321353
+SHA256 (libcompizconfig-0.8.8.tar.bz2) = 50a81aba31d9517587f7d046b7161eb4204ddceb422d09d036a412bb80381490
+SIZE (libcompizconfig-0.8.8.tar.bz2) = 318176

Modified: trunk/x11-wm/libcompizconfig/files/patch-src-main.c
===================================================================
--- trunk/x11-wm/libcompizconfig/files/patch-src-main.c	2014-09-14 03:10:35 UTC (rev 17079)
+++ trunk/x11-wm/libcompizconfig/files/patch-src-main.c	2014-09-14 03:12:31 UTC (rev 17080)
@@ -1,22 +1,22 @@
---- src/main.c.orig	2007-08-12 15:59:57.000000000 -0400
-+++ src/main.c	2007-09-05 11:38:34.000000000 -0400
-@@ -550,7 +550,8 @@
+--- src/main.c.orig	2008-04-03 12:04:50.000000000 -0400
++++ src/main.c	2008-05-29 17:02:49.000000000 -0400
+@@ -549,7 +549,8 @@
  	asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so", 
  		  home, backend);
  	dlerror ();
--	dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_GLOBAL);
-+	dlhand = dlopen (dlname, RTLD_NOW | RTLD_GLOBAL);
-+	dlopen (dlname, RTLD_NOW | RTLD_GLOBAL);
+-	dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
++	dlhand = dlopen (dlname, RTLD_NOW | RTLD_LOCAL);
++	dlopen (dlname, RTLD_NOW | RTLD_LOCAL);
  	err = dlerror ();
      }
  
-@@ -559,7 +560,8 @@
- 	free (dlname);
+@@ -560,7 +561,8 @@
+         }
  	asprintf (&dlname, "%s/compizconfig/backends/lib%s.so", 
  		  LIBDIR, backend);
--	dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_GLOBAL);
-+	dlhand = dlopen (dlname, RTLD_NOW | RTLD_GLOBAL);
-+	dlopen (dlname, RTLD_NOW | RTLD_GLOBAL);
+-	dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
++	dlhand = dlopen (dlname, RTLD_NOW | RTLD_LOCAL);
++	dlopen (dlname, RTLD_NOW | RTLD_LOCAL);
  	err = dlerror ();
      }
  

Modified: trunk/x11-wm/libcompizconfig/pkg-descr
===================================================================
--- trunk/x11-wm/libcompizconfig/pkg-descr	2014-09-14 03:10:35 UTC (rev 17079)
+++ trunk/x11-wm/libcompizconfig/pkg-descr	2014-09-14 03:12:31 UTC (rev 17080)
@@ -13,5 +13,3 @@
 		manager like metacity or kwin.
  	- Its own Compiz configuration plugin "ccp" to provide all features
 		of libcompizconfig with compiz.
-
-WWW:	http://forums.compiz-fusion.org/

Modified: trunk/x11-wm/libcompizconfig/pkg-plist
===================================================================
--- trunk/x11-wm/libcompizconfig/pkg-plist	2014-09-14 03:10:35 UTC (rev 17079)
+++ trunk/x11-wm/libcompizconfig/pkg-plist	2014-09-14 03:12:31 UTC (rev 17080)
@@ -1,6 +1,6 @@
- at comment $FreeBSD: ports/x11-wm/libcompizconfig/pkg-plist,v 1.2 2007/10/29 19:22:40 flz Exp $
 include/compizconfig/ccs.h
 include/compizconfig/ccs-backend.h
+lib/libcompizconfig.so.0.0.0
 lib/libcompizconfig.so.0
 lib/libcompizconfig.so
 lib/libcompizconfig.la
@@ -12,10 +12,11 @@
 lib/compiz/libccp.la
 lib/compiz/libccp.a
 libdata/pkgconfig/libcompizconfig.pc
-share/compizconfig/global.xml
+share/compiz/ccp.xml
 etc/compizconfig/config
 @dirrmtry etc/compizconfig
- at dirrmtry share/compizconfig
+ at dirrmtry share/compiz
 @dirrmtry lib/compizconfig/backends
 @dirrmtry lib/compizconfig
 @dirrmtry include/compizconfig
+ at dirrmtry lib/compiz

More information about the Midnightbsd-cvs mailing list