diff options
author | Michael Johnson <ahze@FreeBSD.org> | 2005-06-30 12:22:32 +0000 |
---|---|---|
committer | Michael Johnson <ahze@FreeBSD.org> | 2005-06-30 12:22:32 +0000 |
commit | 4fb2a5e4a542dfa5dc1d2ae8eca6664e620a87df (patch) | |
tree | bdf48a9cc9b423a30eeb4cbb564fcc12448b2b65 /x11-themes | |
parent | b54ecc47e7cec157eaa7a8ab89f9ed2342f3fbda (diff) |
Notes
Diffstat (limited to 'x11-themes')
-rw-r--r-- | x11-themes/clearlooks-metacity/Makefile | 2 | ||||
-rw-r--r-- | x11-themes/clearlooks/Makefile | 16 | ||||
-rw-r--r-- | x11-themes/clearlooks/distinfo | 4 | ||||
-rw-r--r-- | x11-themes/clearlooks/pkg-plist | 2 |
4 files changed, 10 insertions, 14 deletions
diff --git a/x11-themes/clearlooks-metacity/Makefile b/x11-themes/clearlooks-metacity/Makefile index 2fe0839f3847..aefa16922b86 100644 --- a/x11-themes/clearlooks-metacity/Makefile +++ b/x11-themes/clearlooks-metacity/Makefile @@ -15,8 +15,6 @@ MASTER_SITE_SUBDIR= clearlooks MAINTAINER= ahze@FreeBSD.org COMMENT= Clearlooks Metacity theme -CONFLICTS= clearlooks-[0-9]* clearlooks-themes-[0-9]* - WRKSRC= ${WRKDIR}/Clearlooks/metacity-1/ USE_GNOME= metacity gnomeprefix USE_X_PREFIX= yes diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile index 9fd0bf2d0894..28ad5ff83903 100644 --- a/x11-themes/clearlooks/Makefile +++ b/x11-themes/clearlooks/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= clearlooks -PORTVERSION= 0.6.1 -PORTREVISION= 1 +PORTVERSION= 0.6.2 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= clearlooks @@ -16,17 +15,16 @@ DISTNAME= clearlooks-${PORTVERSION} MAINTAINER= ahze@FreeBSD.org COMMENT?= GTK+ 2.x engine based on Bluecurve -CONFLICTS= clearlooks-metacity-[0-9]* - USE_BZIP2= yes USE_LIBTOOL_VER=15 -USE_GNOME= gtk20 gnomehier +USE_GNOME= gtk20 USE_X_PREFIX= yes USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LDFLAGS="-L${X11BASE}/lib" +OPTIONS+= METACITY "Depend on MetaCity Theme" On .if defined(PORTNAME) && ${PORTNAME} == "clearlooks" OPTIONS+= ANIMATION "Enable experimental animated progressbars" Off .endif @@ -48,12 +46,16 @@ INSTALL_WRKSRC= ${WRKSRC}/themes PLIST_SUB+= ENGINE="@comment " .endif +.if !defined(WITHOUT_METACITY) +RUN_DEPENDS+= ${X11BASE}/share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/clearlooks-metacity +.endif + .if defined(WITH_ANIMATION) CONFIGURE_ARGS+= --enable-animation .endif .if ${PORTNAME} == "clearlooks" -pre-everything:: +3pre-everything:: @if [ -n "`${PKG_INFO} -xI '^gtk-engines2*[0-9]*'`" ]; then \ ${ECHO_MSG} ; \ ${ECHO_MSG} "Gnome/gtk-engine users should use ${PORTSDIR}/x11-themes/clearlooks-themes instead" ; \ @@ -67,7 +69,5 @@ post-patch: @${REINPLACE_CMD} -e 's|gtkrc||' \ ${WRKSRC}/themes/Clearlooks/gtk-2.0/Makefile.in .endif - @${REINPLACE_CMD} -e 's|$$(gnome_data)/themes/Clearlooks/metacity-1|${PREFIX}/share/gnome/themes/Clearlooks/metacity-1|' \ - ${WRKSRC}/themes/Clearlooks/metacity-1/Makefile.in .include <bsd.port.post.mk> diff --git a/x11-themes/clearlooks/distinfo b/x11-themes/clearlooks/distinfo index 3290144a697c..bcdbb12c5aab 100644 --- a/x11-themes/clearlooks/distinfo +++ b/x11-themes/clearlooks/distinfo @@ -1,2 +1,2 @@ -MD5 (clearlooks-0.6.1.tar.bz2) = b81c416ed81a418cad588c291b7c49a3 -SIZE (clearlooks-0.6.1.tar.bz2) = 275089 +MD5 (clearlooks-0.6.2.tar.bz2) = 451ef33d1bffa261c5cbe01182199f97 +SIZE (clearlooks-0.6.2.tar.bz2) = 271558 diff --git a/x11-themes/clearlooks/pkg-plist b/x11-themes/clearlooks/pkg-plist index 2758e366a762..c4cc9520fde9 100644 --- a/x11-themes/clearlooks/pkg-plist +++ b/x11-themes/clearlooks/pkg-plist @@ -36,7 +36,6 @@ share/themes/Clearlooks-Olive/gtk-2.0/gtkrc share/themes/Clearlooks-Quicksilver/gtk-2.0/gtkrc %%ENGINE%%share/themes/Clearlooks/gtk-2.0/gtkrc share/themes/Clearlooks/index.theme -share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml @dirrm share/themes/Clearlooks/gtk-2.0 @dirrm share/themes/Clearlooks-Quicksilver/gtk-2.0 @dirrm share/themes/Clearlooks-Quicksilver @@ -45,7 +44,6 @@ share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml @dirrm share/themes/Clearlooks-DeepSky/gtk-2.0 @dirrm share/themes/Clearlooks-DeepSky @dirrm share/themes/Clearlooks -@dirrm share/gnome/themes/Clearlooks/metacity-1 @dirrm share/gnome/themes/Clearlooks @dirrm share/icons/Clearlooks/24x24/gtk @dirrm share/icons/Clearlooks/24x24 |