Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- Makefile.orig 2013-01-14 00:44:43.000000000 +0000
- +++ Makefile 2013-01-14 00:28:22.000000000 +0000
- @@ -1,9 +1,8 @@
- # $NetBSD: Makefile,v 1.56 2012/12/16 01:52:36 obache Exp $
- #
- -PKGVER= 0.8.4
- +PKGVER= 0.8.8
- DISTNAME= compiz-${PKGVER}
- -PKGREVISION= 27
- CATEGORIES= wm x11
- MASTER_SITES= http://releases.compiz.org/${PKGVER}/
- @@ -13,7 +12,7 @@
- LICENSE= mit
- GNU_CONFIGURE= yes
- -USE_TOOLS+= intltool pkg-config msgfmt gmake
- +USE_TOOLS+= gmake intltool msgfmt msgmerge pkg-config xgettext
- USE_PKGLOCALEDIR= yes
- USE_LANGUAGES= c c++
- USE_LIBTOOL= yes
- @@ -56,7 +55,7 @@
- PKGCONFIG_OVERRIDE+= compiz.pc.in
- PKGCONFIG_OVERRIDE+= libdecoration/libdecoration.pc.in
- -CONFIGURE_ARGS+= --disable-inotify
- +#CONFIGURE_ARGS+= --disable-inotify
- PKG_SUPPORTED_OPTIONS= gnome kde
- PKG_SUGGESTED_OPTIONS= gnome
- @@ -72,38 +71,31 @@
- ${INSTALL_DATA} ${WRKSRC}/metadata/${schema} ${DESTDIR}${PREFIX}/share/gconf/schemas
- .endfor
- -.include "../../mk/bsd.options.mk"
- -
- -PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
- -
- # this is as much as needed for the basic window decorator
- +BUILD_DEPENDS+= pango-[0-9]*:../../devel/pango
- .include "../../graphics/cairo/buildlink3.mk"
- .include "../../x11/gtk2/buildlink3.mk"
- .include "../../devel/libwnck/buildlink3.mk"
- -.if !empty(PKG_OPTIONS:Mgnome)
- -CONFIGURE_ARGS+= --enable-librsvg
- -PLIST.gnome= yes
- -.include "../../x11/gnome-control-center/buildlink3.mk"
- -.include "../../wm/metacity/buildlink3.mk"
- -.include "../../graphics/librsvg/buildlink3.mk"
- -.endif
- +.include "options.mk"
- -.if !empty(PKG_OPTIONS:Mkde)
- -PLIST.kde= yes
- -.include "../../x11/kdebase3/buildlink3.mk"
- -.include "../../sysutils/dbus-qt3/buildlink3.mk"
- +.if $(OPSYS) != "Linux"
- +BUILDLINK_TRANSFORM= rm:-ldl
- .endif
- # While we don't use threads, we link against libpthread because
- -# some plugins do it.
- +# some plugins do it. Same for dlopen.
- .include "../../mk/pthread.buildlink3.mk"
- +.include "../../mk/dlopen.buildlink3.mk"
- +.include "../../devel/libinotify/buildlink3.mk"
- .include "../../audio/libcanberra/buildlink3.mk"
- .include "../../devel/GConf/schemas.mk"
- .include "../../graphics/png/buildlink3.mk"
- .include "../../sysutils/dbus/buildlink3.mk"
- +BUILD_DEPENDS+= glib2-[0-9]*:../../devel/glib2
- .include "../../sysutils/dbus-glib/buildlink3.mk"
- +BUILD_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
- .include "../../textproc/libxslt/buildlink3.mk"
- .include "../../x11/libXcomposite/buildlink3.mk"
- .include "../../x11/libXfixes/buildlink3.mk"
- --- PLIST.orig 2013-01-14 00:44:43.000000000 +0000
- +++ PLIST 2013-01-14 00:38:11.000000000 +0000
- @@ -21,6 +21,7 @@
- lib/compiz/libglib.la
- lib/compiz/libgnomecompat.la
- lib/compiz/libini.la
- +lib/compiz/libinotify.la
- ${PLIST.kde}lib/compiz/libkconfig.la
- lib/compiz/libminimize.la
- lib/compiz/libmove.la
- --- buildlink3.mk.orig 2013-01-14 00:44:43.000000000 +0000
- +++ buildlink3.mk 2013-01-13 21:51:20.000000000 +0000
- @@ -9,6 +9,27 @@
- BUILDLINK_ABI_DEPENDS.compiz+= compiz>=0.8.4nb25
- BUILDLINK_PKGSRCDIR.compiz?= ../../wm/compiz
- +pkgbase := compiz
- +.include "../../mk/pkg-build-options.mk"
- +
- +.if !empty(PKG_BUILD_OPTIONS:Mfuse)
- +.include "../../filesystems/fuse/buildlink3.mk"
- +.endif
- +
- +.if !empty(PKG_BUILD_OPTIONS:Mgnome)
- +.include "../../x11/gnome-control-center/buildlink3.mk"
- +.include "../../wm/metacity/buildlink3.mk"
- +.include "../../graphics/librsvg/buildlink3.mk"
- +.endif
- +
- +.if !empty(PKG_BUILD_OPTIONS:Mkde)
- +.include "../../x11/kdebase3/buildlink3.mk"
- +.endif
- +
- +#.if !empty(PKG_BUILD_OPTIONS:Mnls)
- +#.include "../../devel/gettext-lib/buildlink3.mk"
- +#.endif
- +
- .include "../../devel/libwnck/buildlink3.mk"
- .include "../../graphics/cairo/buildlink3.mk"
- .include "../../graphics/glu/buildlink3.mk"
- --- distinfo.orig 2013-01-14 00:44:43.000000000 +0000
- +++ distinfo 2013-01-14 00:29:04.000000000 +0000
- @@ -1,7 +1,7 @@
- $NetBSD: distinfo,v 1.10 2010/06/11 23:28:00 wiz Exp $
- -SHA1 (compiz-0.8.4.tar.gz) = 244ac823818209e44944d74df42d8986ec31d9dd
- -RMD160 (compiz-0.8.4.tar.gz) = 176bfa04b8ee3ee3c5b7e6f3c27c88d16c54ac63
- -Size (compiz-0.8.4.tar.gz) = 1755741 bytes
- -SHA1 (patch-aa) = 0772722aea9828c1f05f48ebbdad02387ae9c41a
- +SHA1 (compiz-0.8.8.tar.gz) = 01d065db07f6fd6bcad51811ffba69221aff656e
- +RMD160 (compiz-0.8.8.tar.gz) = 421d4f010d1e10d1562e86ea0112e9a8eca711e7
- +Size (compiz-0.8.8.tar.gz) = 1758943 bytes
- +SHA1 (patch-aa) = dff6929da74854df3b3a9f35b4d61267e89b10dd
- SHA1 (patch-ab) = ff3d5515111df0b5fbcdd9f9163a576ab76071ff
- --- patches/patch-aa.orig 2013-01-14 00:44:43.000000000 +0000
- +++ patches/patch-aa 2013-01-14 00:29:01.000000000 +0000
- @@ -1,5 +1,7 @@
- $NetBSD: patch-aa,v 1.4 2009/11/26 19:46:35 imil Exp $
- +Default to gtk-window-decorator.
- +
- --- metadata/decoration.xml.in.orig 2009-11-26 10:26:46.000000000 +0000
- +++ metadata/decoration.xml.in
- @@ -16,7 +16,7 @@
- # options.mk
- # $NetBSD$
- PKG_OPTIONS_VAR= PKG_OPTIONS.compiz
- PKG_SUPPORTED_OPTIONS= gnome kde # XXX fuse
- PKG_SUGGESTED_OPTIONS+= # blank
- PLIST_VARS+= gnome kde
- .include "../../mk/bsd.options.mk"
- # XXX configure needs fuse.pc, which isn't in NetBSD's base for some reason
- #.if !empty(PKG_OPTIONS:Mfuse)
- #.include "../../filesystems/fuse/buildlink3.mk"
- #CONFIGURE_ARGS+= --enable-fuse
- #.else
- #CONFIGURE_ARGS+= --disable-fuse
- #.endif
- .if !empty(PKG_OPTIONS:Mgnome)
- CONFIGURE_ARGS+= --enable-librsvg
- PLIST.gnome= yes
- .include "../../x11/gnome-control-center/buildlink3.mk"
- .include "../../wm/metacity/buildlink3.mk"
- .include "../../graphics/librsvg/buildlink3.mk"
- .endif
- .if !empty(PKG_OPTIONS:Mkde)
- PLIST.kde= yes
- .include "../../x11/kdebase3/buildlink3.mk"
- .include "../../sysutils/dbus-qt3/buildlink3.mk"
- .endif
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement