diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-20 14:08:37 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-20 14:08:37 +0800 |
| commit | 24b7217053da1c5820d41971c1a881e1aebe9244 (patch) | |
| tree | fd0ebac83af9a6e0c474fec892370f01f9e12ba7 /x11-toolkits | |
| parent | c9f87300bacedf93de44152b3b10440030695773 (diff) | |
| download | marcuscom-ports-24b7217053da1c5820d41971c1a881e1aebe9244.tar marcuscom-ports-24b7217053da1c5820d41971c1a881e1aebe9244.tar.gz marcuscom-ports-24b7217053da1c5820d41971c1a881e1aebe9244.tar.bz2 marcuscom-ports-24b7217053da1c5820d41971c1a881e1aebe9244.tar.lz marcuscom-ports-24b7217053da1c5820d41971c1a881e1aebe9244.tar.xz marcuscom-ports-24b7217053da1c5820d41971c1a881e1aebe9244.tar.zst marcuscom-ports-24b7217053da1c5820d41971c1a881e1aebe9244.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
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3265 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 7 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/pkg-plist | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 7563afa83..354d95aed 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtk PORTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ ftp://ftp.gtk.org/pub/gtk/v2.5/ \ @@ -48,7 +49,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) @@ -74,6 +76,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 9cac4ab04..7522b3560 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -473,11 +473,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%%/engines -@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 @@ -485,6 +485,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 |