From owner-svn-ports-head@FreeBSD.ORG Wed Apr 30 05:47:10 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 606AF101; Wed, 30 Apr 2014 05:47:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40EFB109E; Wed, 30 Apr 2014 05:47:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3U5lALB061014; Wed, 30 Apr 2014 05:47:10 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3U5l9dp061012; Wed, 30 Apr 2014 05:47:09 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404300547.s3U5l9dp061012@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 30 Apr 2014 05:47:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352671 - head/x11-wm/compiz X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Apr 2014 05:47:10 -0000 Author: bapt Date: Wed Apr 30 05:47:09 2014 New Revision: 352671 URL: http://svnweb.freebsd.org/changeset/ports/352671 QAT: https://qat.redports.org/buildarchive/r352671/ Log: Fix packaging with pkg_install by workarounding a pkg_install bug While here: - s/disable-kde3/disable-kde/ - Remove .la files, they are useless here Reported by: bar Modified: head/x11-wm/compiz/Makefile head/x11-wm/compiz/pkg-plist Modified: head/x11-wm/compiz/Makefile ============================================================================== --- head/x11-wm/compiz/Makefile Wed Apr 30 04:47:25 2014 (r352670) +++ head/x11-wm/compiz/Makefile Wed Apr 30 05:47:09 2014 (r352671) @@ -2,7 +2,7 @@ PORTNAME= compiz PORTVERSION= 0.8.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ @@ -18,12 +18,14 @@ RUN_DEPENDS= glxinfo:${PORTSDIR}/graphic XORG_CAT= app GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gettext gmake libtool:keepla pathfix tar:bzip2 +USES= gettext gmake libtool pathfix tar:bzip2 USE_GL= glu USE_GNOME= gconf2 libxslt USE_XORG= glproto ice sm xcomposite xdamage xext xfixes xinerama \ xrandr xrender USE_LDCONFIG= yes +# Workaround buggy pkg_install +PLIST_SUB= RESETPREFIX=${PREFIX} GCONF_SCHEMAS= gwd.schemas \ compiz-annotate.schemas \ @@ -59,7 +61,7 @@ GCONF_SCHEMAS= gwd.schemas \ compiz-wobbly.schemas \ compiz-zoom.schemas -CONFIGURE_ARGS= --disable-kde4 --disable-kde3 +CONFIGURE_ARGS= --disable-kde4 --disable-kde LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} OPTIONS_DEFINE= SVG GTK2 METACITY GNOME DBUS FUSE Modified: head/x11-wm/compiz/pkg-plist ============================================================================== --- head/x11-wm/compiz/pkg-plist Wed Apr 30 04:47:25 2014 (r352670) +++ head/x11-wm/compiz/pkg-plist Wed Apr 30 05:47:09 2014 (r352671) @@ -9,94 +9,64 @@ include/compiz/compiz-plugin.h include/compiz/compiz-scale.h include/compiz/decoration.h lib/compiz/libannotate.a -lib/compiz/libannotate.la lib/compiz/libannotate.so lib/compiz/libblur.a -lib/compiz/libblur.la lib/compiz/libblur.so lib/compiz/libclone.a -lib/compiz/libclone.la lib/compiz/libclone.so lib/compiz/libcommands.a -lib/compiz/libcommands.la lib/compiz/libcommands.so lib/compiz/libcube.a -lib/compiz/libcube.la lib/compiz/libcube.so %%DBUS%%lib/compiz/libdbus.a -%%DBUS%%lib/compiz/libdbus.la %%DBUS%%lib/compiz/libdbus.so lib/compiz/libdecoration.a -lib/compiz/libdecoration.la lib/compiz/libdecoration.so lib/compiz/libfade.a -lib/compiz/libfade.la lib/compiz/libfade.so %%FUSE%%lib/compiz/libfs.a -%%FUSE%%lib/compiz/libfs.la %%FUSE%%lib/compiz/libfs.so lib/compiz/libgconf.a -lib/compiz/libgconf.la lib/compiz/libgconf.so lib/compiz/libglib.a -lib/compiz/libglib.la lib/compiz/libglib.so lib/compiz/libgnomecompat.a -lib/compiz/libgnomecompat.la lib/compiz/libgnomecompat.so lib/compiz/libini.a -lib/compiz/libini.la lib/compiz/libini.so lib/compiz/libminimize.a -lib/compiz/libminimize.la lib/compiz/libminimize.so lib/compiz/libmove.a -lib/compiz/libmove.la lib/compiz/libmove.so lib/compiz/libobs.a -lib/compiz/libobs.la lib/compiz/libobs.so lib/compiz/libplace.a -lib/compiz/libplace.la lib/compiz/libplace.so lib/compiz/libpng.a -lib/compiz/libpng.la lib/compiz/libpng.so lib/compiz/libregex.a -lib/compiz/libregex.la lib/compiz/libregex.so lib/compiz/libresize.a -lib/compiz/libresize.la lib/compiz/libresize.so lib/compiz/librotate.a -lib/compiz/librotate.la lib/compiz/librotate.so lib/compiz/libscale.a -lib/compiz/libscale.la lib/compiz/libscale.so lib/compiz/libscreenshot.a -lib/compiz/libscreenshot.la lib/compiz/libscreenshot.so %%SVG%%lib/compiz/libsvg.a -%%SVG%%lib/compiz/libsvg.la %%SVG%%lib/compiz/libsvg.so lib/compiz/libswitcher.a -lib/compiz/libswitcher.la lib/compiz/libswitcher.so lib/compiz/libvideo.a -lib/compiz/libvideo.la lib/compiz/libvideo.so lib/compiz/libwater.a -lib/compiz/libwater.la lib/compiz/libwater.so lib/compiz/libwobbly.a -lib/compiz/libwobbly.la lib/compiz/libwobbly.so lib/compiz/libzoom.a -lib/compiz/libzoom.la lib/compiz/libzoom.so lib/libdecoration.a -lib/libdecoration.la lib/libdecoration.so lib/libdecoration.so.0 lib/libdecoration.so.0.0.0 @@ -146,9 +116,8 @@ libdata/pkgconfig/libdecoration.pc %%GNOME%%share/gnome-control-center/keybindings/50-compiz-key.xml %%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%% %%GNOME%%window-manager-settings/libcompiz.a -%%GNOME%%window-manager-settings/libcompiz.la %%GNOME%%window-manager-settings/libcompiz.so -%%GNOME%%@cwd +%%GNOME%%@cwd %%RESETPREFIX%% share/applications/compiz.desktop share/locale/af/LC_MESSAGES/compiz.mo share/locale/ar/LC_MESSAGES/compiz.mo