diff options
-rw-r--r-- | archivers/file-roller/Makefile | 24 | ||||
-rw-r--r-- | archivers/file-roller/distinfo | 6 | ||||
-rw-r--r-- | archivers/file-roller/files/patch-src_fr-enum-types.c | 11 | ||||
-rw-r--r-- | archivers/file-roller/pkg-plist | 9 | ||||
-rw-r--r-- | multimedia/cheese/Makefile | 2 | ||||
-rw-r--r-- | multimedia/cheese/distinfo | 6 | ||||
-rw-r--r-- | x11-themes/gnome-themes/Makefile | 2 | ||||
-rw-r--r-- | x11-themes/gnome-themes/distinfo | 6 | ||||
-rw-r--r-- | x11-themes/gnome-themes/pkg-plist | 8 |
9 files changed, 45 insertions, 29 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index b9663d86d520..4ca6b12fcb38 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -7,7 +7,7 @@ # PORTNAME= file-roller -PORTVERSION= 2.26.2 +PORTVERSION= 2.26.3 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= GNOME @@ -16,6 +16,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An archive manager for zip files, tar, etc +OPTIONS= NAUTILUS "Enable Nautilus extension" on + RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar USE_LDCONFIG= yes @@ -24,27 +26,35 @@ USE_GETTEXT= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \ - gnomedocutils +USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +PORTDOCS= AUTHORS NEWS README TODO ChangeLog GCONF_SCHEMAS= file-roller.schemas +.include <bsd.port.pre.mk> + +.if !defined(WITHOUT_NAUTILUS) +USE_GNOME+= nautilus2 +PLIST_SUB+= NAUTILUS="" +.else +PLIST_SUB+= NAUTILUS="@comment " +CONFIGURE_ARGS+= --disable-nautilus-actions +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/src/fr-command-tar.c - @${FIND} ${WRKSRC} -name "fr-command-*.c" | ${XARGS} ${REINPLACE_CMD} \ - -e 's|atoll|fr_atoll|g' post-install: @-update-desktop-database .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} -.for f in AUTHORS NEWS README TODO +.for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index bc912b9e44ca..65bcd8a96ce5 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/file-roller-2.26.2.tar.bz2) = 9d4575665dcbf063a062aa5a776eca68 -SHA256 (gnome2/file-roller-2.26.2.tar.bz2) = e93055dfb149396903204539d0754a9e3b76e52e7668ac2f744b0820041a61ac -SIZE (gnome2/file-roller-2.26.2.tar.bz2) = 1565897 +MD5 (gnome2/file-roller-2.26.3.tar.bz2) = 1876e9807a12c37f9bb2d00807905755 +SHA256 (gnome2/file-roller-2.26.3.tar.bz2) = 06ec16ab8b1c9d0a1b3d40d2d63cd8170776bcc44ffa1f48e0403a9e23aef769 +SIZE (gnome2/file-roller-2.26.3.tar.bz2) = 1561967 diff --git a/archivers/file-roller/files/patch-src_fr-enum-types.c b/archivers/file-roller/files/patch-src_fr-enum-types.c new file mode 100644 index 000000000000..d1d08ea534a3 --- /dev/null +++ b/archivers/file-roller/files/patch-src_fr-enum-types.c @@ -0,0 +1,11 @@ +--- src/fr-enum-types.c.orig 2009-06-30 20:34:58.000000000 +1000 ++++ src/fr-enum-types.c 2009-06-30 20:35:02.000000000 +1000 +@@ -4,7 +4,7 @@ + #include <glib-object.h> + + /* enumerations from "../../src/typedefs.h" */ +-#include "../../src/typedefs.h" ++#include "typedefs.h" + GType + fr_compression_get_type (void) + { diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 4855c34757f7..394d0d64f1ab 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -1,12 +1,8 @@ bin/file-roller -lib/nautilus/extensions-2.0/libnautilus-fileroller.la -lib/nautilus/extensions-2.0/libnautilus-fileroller.so +%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-fileroller.la +%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-fileroller.so libexec/file-roller/isoinfo.sh share/applications/file-roller.desktop -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO %%DATADIR%%/icons/hicolor/16x16/actions/add-files-to-archive.png %%DATADIR%%/icons/hicolor/16x16/actions/add-folder-to-archive.png %%DATADIR%%/icons/hicolor/16x16/actions/extract-archive.png @@ -271,7 +267,6 @@ share/omf/file-roller/file-roller-vi.omf @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/applications @dirrm libexec/file-roller @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile index 7962688f216a..5349a6612e62 100644 --- a/multimedia/cheese/Makefile +++ b/multimedia/cheese/Makefile @@ -7,7 +7,7 @@ # PORTNAME= cheese -PORTVERSION= 2.26.2 +PORTVERSION= 2.26.3 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo index eb6e4ca8dec2..b1d2fb36ace8 100644 --- a/multimedia/cheese/distinfo +++ b/multimedia/cheese/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/cheese-2.26.2.tar.bz2) = 9dee43671f0660e73524724174569331 -SHA256 (gnome2/cheese-2.26.2.tar.bz2) = b211582271eaf5158cdd06d5c12926d98b8cd02fc1c65b485e35e9b6c3a12c45 -SIZE (gnome2/cheese-2.26.2.tar.bz2) = 3239592 +MD5 (gnome2/cheese-2.26.3.tar.bz2) = c00fbf9e79e39cb95af57c0a6cf9ce88 +SHA256 (gnome2/cheese-2.26.3.tar.bz2) = 4abcc6c34530b19a477e9431a120b0b2a296f4f4cbc20d5cb9e5ddad50347003 +SIZE (gnome2/cheese-2.26.3.tar.bz2) = 3213208 diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index 0d67f6972ae8..b4ad6f422ee4 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -7,7 +7,7 @@ # PORTNAME= gnome-themes -PORTVERSION= 2.26.2 +PORTVERSION= 2.26.3 CATEGORIES= x11-themes gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 1f26799c5510..ba6514bf3224 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-themes-2.26.2.tar.bz2) = ffc7037085f1ae898be45fe699ea13ad -SHA256 (gnome2/gnome-themes-2.26.2.tar.bz2) = 423dfc65ab4988f946077483359fdff05b481eca03c01fccdad7c21911ed93f4 -SIZE (gnome2/gnome-themes-2.26.2.tar.bz2) = 1603539 +MD5 (gnome2/gnome-themes-2.26.3.tar.bz2) = a50f65ef5bab0579160ab3ec114d0757 +SHA256 (gnome2/gnome-themes-2.26.3.tar.bz2) = 83d9a2b9794b2a232e480bff7c20b1cd4b4f8b7b56cc6150779a51786d12e19d +SIZE (gnome2/gnome-themes-2.26.3.tar.bz2) = 1596594 diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index ee279b1f72d6..172f9aea2a18 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -2722,9 +2722,9 @@ share/themes/Mist/index.theme share/themes/Mist/metacity-1/metacity-theme-1.xml share/themes/Simple/gtk-2.0/gtkrc @dirrm share/themes/Simple/gtk-2.0 -@dirrm share/themes/Simple +@dirrmtry share/themes/Simple @dirrm share/themes/Mist/metacity-1 -@dirrm share/themes/Mist +@dirrmtry share/themes/Mist @dirrm share/themes/LowContrastLargePrint/pixmaps @dirrm share/themes/LowContrastLargePrint/gtk-2.0 @dirrm share/themes/LowContrastLargePrint @@ -2751,12 +2751,12 @@ share/themes/Simple/gtk-2.0/gtkrc @dirrm share/themes/Glider/metacity-1 @dirrm share/themes/Glider/gtk-2.0 @dirrm share/themes/Glider -@dirrm share/themes/Crux +@dirrmtry share/themes/Crux @dirrm share/themes/ClearlooksClassic/metacity-1 @dirrm share/themes/ClearlooksClassic/gtk-2.0 @dirrm share/themes/ClearlooksClassic @dirrm share/themes/Clearlooks/metacity-1 -@dirrm share/themes/Clearlooks +@dirrmtry share/themes/Clearlooks @dirrmtry share/themes @dirrm share/icons/Mist/scalable/status @dirrm share/icons/Mist/scalable/places |