diff options
| author | mezz <mezz@FreeBSD.org> | 2004-12-20 14:02:51 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2004-12-20 14:02:51 +0800 |
| commit | 250c4112863bc910c426644f3d19dc3a2974d3b7 (patch) | |
| tree | b9b819edd6681be0e44fe4066e85e2fb659aaaa4 /x11-toolkits | |
| parent | 01a1bd9a1f2cf562d292d080c12f713d5aae192f (diff) | |
| download | freebsd-ports-gnome-250c4112863bc910c426644f3d19dc3a2974d3b7.tar.gz freebsd-ports-gnome-250c4112863bc910c426644f3d19dc3a2974d3b7.tar.zst freebsd-ports-gnome-250c4112863bc910c426644f3d19dc3a2974d3b7.zip | |
Clean up the pkg-plist voodoo:
- Create an empty lib/gtk-2.0/${GTK_VERSION}/engines directory for
gtk theme engine ports.
- Correct the removal of directories:
lib/gtk-2.0/${GTK_VERSION}/[loaders,immodules,engines]
lib/gtk-2.0/${GTK_VERSION}
lib/gtk-2.0
Bump PORTREVISION.
Reviewed by: marcus
Reported by: pointyhat via kris
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/pkg-plist | 10 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/pkg-plist | 10 |
4 files changed, 22 insertions, 14 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 785f2235d103..b3eef6f49b3c 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk PORTVERSION= 2.4.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ \ @@ -50,7 +50,8 @@ CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -PLIST_SUB= GTK_VERSION="2.4.0" +GTK_VERSION= 2.4.0 +PLIST_SUB= GTK_VERSION="${GTK_VERSION}" pre-everything:: .if !defined(WITH_DROPSHADOW) @@ -76,6 +77,7 @@ pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - ${MKDIR} ${PREFIX}/lib/gtk-2.0/modules + @${MKDIR} ${PREFIX}/lib/gtk-2.0/modules + @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines .include <bsd.port.mk> diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 0887242b64da..7e4a1740997d 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -455,10 +455,11 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 @unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true -@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders -@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules -@dirrm lib/gtk-2.0/%%GTK_VERSION%% -@dirrm lib/gtk-2.0 +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @@ -466,6 +467,7 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @dirrm include/gtk-2.0 @dirrm etc/gtk-2.0 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules +@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true @unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 785f2235d103..b3eef6f49b3c 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk PORTVERSION= 2.4.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ \ @@ -50,7 +50,8 @@ CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -PLIST_SUB= GTK_VERSION="2.4.0" +GTK_VERSION= 2.4.0 +PLIST_SUB= GTK_VERSION="${GTK_VERSION}" pre-everything:: .if !defined(WITH_DROPSHADOW) @@ -76,6 +77,7 @@ pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - ${MKDIR} ${PREFIX}/lib/gtk-2.0/modules + @${MKDIR} ${PREFIX}/lib/gtk-2.0/modules + @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines .include <bsd.port.mk> diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 0887242b64da..7e4a1740997d 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -455,10 +455,11 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 @unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true -@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders -@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules -@dirrm lib/gtk-2.0/%%GTK_VERSION%% -@dirrm lib/gtk-2.0 +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @@ -466,6 +467,7 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @dirrm include/gtk-2.0 @dirrm etc/gtk-2.0 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules +@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true @unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true |