Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Jan 13th, 2013  |  syntax: Diff  |  size: 5.64 KB  |  views: 6  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. --- Makefile.orig       2013-01-14 00:44:43.000000000 +0000
  2. +++ Makefile    2013-01-14 00:28:22.000000000 +0000
  3. @@ -1,9 +1,8 @@
  4.  # $NetBSD: Makefile,v 1.56 2012/12/16 01:52:36 obache Exp $
  5.  #
  6.  
  7. -PKGVER=                0.8.4
  8. +PKGVER=                0.8.8
  9.  DISTNAME=      compiz-${PKGVER}
  10. -PKGREVISION=   27
  11.  CATEGORIES=    wm x11
  12.  MASTER_SITES=  http://releases.compiz.org/${PKGVER}/
  13.  
  14. @@ -13,7 +12,7 @@
  15.  LICENSE=       mit
  16.  
  17.  GNU_CONFIGURE=         yes
  18. -USE_TOOLS+=            intltool pkg-config msgfmt gmake
  19. +USE_TOOLS+=            gmake intltool msgfmt msgmerge pkg-config xgettext
  20.  USE_PKGLOCALEDIR=      yes
  21.  USE_LANGUAGES=         c c++
  22.  USE_LIBTOOL=           yes
  23. @@ -56,7 +55,7 @@
  24.  PKGCONFIG_OVERRIDE+=   compiz.pc.in
  25.  PKGCONFIG_OVERRIDE+=   libdecoration/libdecoration.pc.in
  26.  
  27. -CONFIGURE_ARGS+=       --disable-inotify
  28. +#CONFIGURE_ARGS+=      --disable-inotify
  29.  
  30.  PKG_SUPPORTED_OPTIONS= gnome kde
  31.  PKG_SUGGESTED_OPTIONS= gnome
  32. @@ -72,38 +71,31 @@
  33.         ${INSTALL_DATA} ${WRKSRC}/metadata/${schema} ${DESTDIR}${PREFIX}/share/gconf/schemas
  34.  .endfor
  35.  
  36. -.include "../../mk/bsd.options.mk"
  37. -
  38. -PLIST_VARS+=           ${PKG_SUPPORTED_OPTIONS}
  39. -
  40.  # this is as much as needed for the basic window decorator
  41. +BUILD_DEPENDS+=        pango-[0-9]*:../../devel/pango
  42.  .include "../../graphics/cairo/buildlink3.mk"
  43.  .include "../../x11/gtk2/buildlink3.mk"
  44.  .include "../../devel/libwnck/buildlink3.mk"
  45.  
  46. -.if !empty(PKG_OPTIONS:Mgnome)
  47. -CONFIGURE_ARGS+=       --enable-librsvg
  48. -PLIST.gnome=           yes
  49. -.include "../../x11/gnome-control-center/buildlink3.mk"
  50. -.include "../../wm/metacity/buildlink3.mk"
  51. -.include "../../graphics/librsvg/buildlink3.mk"
  52. -.endif
  53. +.include "options.mk"
  54.  
  55. -.if !empty(PKG_OPTIONS:Mkde)
  56. -PLIST.kde=             yes
  57. -.include "../../x11/kdebase3/buildlink3.mk"
  58. -.include "../../sysutils/dbus-qt3/buildlink3.mk"
  59. +.if $(OPSYS) != "Linux"
  60. +BUILDLINK_TRANSFORM=   rm:-ldl
  61.  .endif
  62.  
  63.  # While we don't use threads, we link against libpthread because
  64. -# some plugins do it.
  65. +# some plugins do it. Same for dlopen.
  66.  .include "../../mk/pthread.buildlink3.mk"
  67. +.include "../../mk/dlopen.buildlink3.mk"
  68.  
  69. +.include "../../devel/libinotify/buildlink3.mk"
  70.  .include "../../audio/libcanberra/buildlink3.mk"
  71.  .include "../../devel/GConf/schemas.mk"
  72.  .include "../../graphics/png/buildlink3.mk"
  73.  .include "../../sysutils/dbus/buildlink3.mk"
  74. +BUILD_DEPENDS+=        glib2-[0-9]*:../../devel/glib2
  75.  .include "../../sysutils/dbus-glib/buildlink3.mk"
  76. +BUILD_DEPENDS+=        libxml2-[0-9]*:../../textproc/libxml2
  77.  .include "../../textproc/libxslt/buildlink3.mk"
  78.  .include "../../x11/libXcomposite/buildlink3.mk"
  79.  .include "../../x11/libXfixes/buildlink3.mk"
  80. --- PLIST.orig  2013-01-14 00:44:43.000000000 +0000
  81. +++ PLIST       2013-01-14 00:38:11.000000000 +0000
  82. @@ -21,6 +21,7 @@
  83.  lib/compiz/libglib.la
  84.  lib/compiz/libgnomecompat.la
  85.  lib/compiz/libini.la
  86. +lib/compiz/libinotify.la
  87.  ${PLIST.kde}lib/compiz/libkconfig.la
  88.  lib/compiz/libminimize.la
  89.  lib/compiz/libmove.la
  90. --- buildlink3.mk.orig  2013-01-14 00:44:43.000000000 +0000
  91. +++ buildlink3.mk       2013-01-13 21:51:20.000000000 +0000
  92. @@ -9,6 +9,27 @@
  93.  BUILDLINK_ABI_DEPENDS.compiz+= compiz>=0.8.4nb25
  94.  BUILDLINK_PKGSRCDIR.compiz?=   ../../wm/compiz
  95.  
  96. +pkgbase := compiz
  97. +.include "../../mk/pkg-build-options.mk"
  98. +
  99. +.if !empty(PKG_BUILD_OPTIONS:Mfuse)
  100. +.include "../../filesystems/fuse/buildlink3.mk"
  101. +.endif
  102. +
  103. +.if !empty(PKG_BUILD_OPTIONS:Mgnome)
  104. +.include "../../x11/gnome-control-center/buildlink3.mk"
  105. +.include "../../wm/metacity/buildlink3.mk"
  106. +.include "../../graphics/librsvg/buildlink3.mk"
  107. +.endif
  108. +
  109. +.if !empty(PKG_BUILD_OPTIONS:Mkde)
  110. +.include "../../x11/kdebase3/buildlink3.mk"
  111. +.endif
  112. +
  113. +#.if !empty(PKG_BUILD_OPTIONS:Mnls)
  114. +#.include "../../devel/gettext-lib/buildlink3.mk"
  115. +#.endif
  116. +
  117.  .include "../../devel/libwnck/buildlink3.mk"
  118.  .include "../../graphics/cairo/buildlink3.mk"
  119.  .include "../../graphics/glu/buildlink3.mk"
  120. --- distinfo.orig       2013-01-14 00:44:43.000000000 +0000
  121. +++ distinfo    2013-01-14 00:29:04.000000000 +0000
  122. @@ -1,7 +1,7 @@
  123.  $NetBSD: distinfo,v 1.10 2010/06/11 23:28:00 wiz Exp $
  124.  
  125. -SHA1 (compiz-0.8.4.tar.gz) = 244ac823818209e44944d74df42d8986ec31d9dd
  126. -RMD160 (compiz-0.8.4.tar.gz) = 176bfa04b8ee3ee3c5b7e6f3c27c88d16c54ac63
  127. -Size (compiz-0.8.4.tar.gz) = 1755741 bytes
  128. -SHA1 (patch-aa) = 0772722aea9828c1f05f48ebbdad02387ae9c41a
  129. +SHA1 (compiz-0.8.8.tar.gz) = 01d065db07f6fd6bcad51811ffba69221aff656e
  130. +RMD160 (compiz-0.8.8.tar.gz) = 421d4f010d1e10d1562e86ea0112e9a8eca711e7
  131. +Size (compiz-0.8.8.tar.gz) = 1758943 bytes
  132. +SHA1 (patch-aa) = dff6929da74854df3b3a9f35b4d61267e89b10dd
  133.  SHA1 (patch-ab) = ff3d5515111df0b5fbcdd9f9163a576ab76071ff
  134. --- patches/patch-aa.orig       2013-01-14 00:44:43.000000000 +0000
  135. +++ patches/patch-aa    2013-01-14 00:29:01.000000000 +0000
  136. @@ -1,5 +1,7 @@
  137.  $NetBSD: patch-aa,v 1.4 2009/11/26 19:46:35 imil Exp $
  138.  
  139. +Default to gtk-window-decorator.
  140. +
  141.  --- metadata/decoration.xml.in.orig    2009-11-26 10:26:46.000000000 +0000
  142.  +++ metadata/decoration.xml.in
  143.  @@ -16,7 +16,7 @@
  144.  
  145. # options.mk
  146.  
  147. # $NetBSD$
  148.  
  149. PKG_OPTIONS_VAR=        PKG_OPTIONS.compiz
  150. PKG_SUPPORTED_OPTIONS=  gnome kde # XXX fuse
  151. PKG_SUGGESTED_OPTIONS+= # blank
  152. PLIST_VARS+=            gnome kde
  153.  
  154. .include "../../mk/bsd.options.mk"
  155.  
  156. # XXX configure needs fuse.pc, which isn't in NetBSD's base for some reason
  157. #.if !empty(PKG_OPTIONS:Mfuse)
  158. #.include "../../filesystems/fuse/buildlink3.mk"
  159. #CONFIGURE_ARGS+=       --enable-fuse
  160. #.else
  161. #CONFIGURE_ARGS+=       --disable-fuse
  162. #.endif
  163.  
  164. .if !empty(PKG_OPTIONS:Mgnome)
  165. CONFIGURE_ARGS+=        --enable-librsvg
  166. PLIST.gnome=            yes
  167. .include "../../x11/gnome-control-center/buildlink3.mk"
  168. .include "../../wm/metacity/buildlink3.mk"
  169. .include "../../graphics/librsvg/buildlink3.mk"
  170. .endif
  171.  
  172. .if !empty(PKG_OPTIONS:Mkde)
  173. PLIST.kde=              yes
  174. .include "../../x11/kdebase3/buildlink3.mk"
  175. .include "../../sysutils/dbus-qt3/buildlink3.mk"
  176. .endif