cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need for shared-mime-info.

Browse Source 
Don't subst GTK_BINARY_VERSION; it's useless.
Sync WANTLIB.
@unexec-delete -> @unexec delete+update for removing the old immodules cache.
This commit is contained in:
ajacoutot 2013-01-23 10:06:15 +00:00
parent 6327b999bc
commit d723c91551
3 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
x11/gtk+3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.60 2013/01/22 08:31:34 landry Exp $
# $OpenBSD: Makefile,v 1.61 2013/01/23 10:06:15 ajacoutot Exp $
SHARED_ONLY= Yes
@ -11,15 +11,13 @@ EXTRACT_SUFX= .tar.xz
PKGNAME-main= gtk+3-${V}
PKGNAME-cups= gtk+3-cups-${V}
REVISION-main = 0
REVISION-cups = 0
REVISION-main= 1
REVISION-cups= 1
# grep ^GTK_BINARY_VERSION ${WRKSRC}/Makefile (after do-configure)
GTK_BINARY_VERSION=3.0.0
SUBST_VARS= GTK_BINARY_VERSION
# XXX temporary, remove the following line from PLIST-main
# XXX temporary, remove the following lines from PLIST-main
# (immodules.cache file moved, so give a change for people to update)
# @unexec rm -f ${SYSCONFDIR}/gtk-3.0/gtk.immodules
# @unexec-delete rm -f ${SYSCONFDIR}/gtk-3.0/gtk.immodules
# @unexec-update rm -f ${SYSCONFDIR}/gtk-3.0/gtk.immodules
CATEGORIES= x11 devel
@ -38,12 +36,12 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject
WANTLIB += drm expat ffi fontconfig freetype gdk_pixbuf-2.0 gio-2.0
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo cairo-gobject
WANTLIB += expat ffi fontconfig freetype gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs
WANTLIB += ICE SM dbus-1 harfbuzz icudata icule icuuc pthread
WANTLIB += xcb xcb-render xcb-shm z stdc++ atk-bridge-2.0 atspi
WANTLIB += xcb xcb-render xcb-shm z atk-bridge-2.0 atspi
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
@ -59,8 +57,7 @@ BUILD_DEPENDS +=textproc/docbook \
textproc/libxslt
RUN_DEPENDS-main= ${RUN_DEPENDS} \
x11/hicolor-icon-theme \
misc/shared-mime-info
x11/hicolor-icon-theme
LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/pango>=1.32.0 \
@ -120,6 +117,6 @@ FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/gtk+3
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-3.0/modules
rm ${PREFIX}/lib/gtk-3.0/${GTK_BINARY_VERSION}/{printbackends,immodules}/*.{a,la}
rm ${PREFIX}/lib/gtk-3.0/3.0.0/{printbackends,immodules}/*.{a,la}
.include <bsd.port.mk>

4
x11/gtk+3/pkg/PLIST-cups
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-cups,v 1.3 2012/09/21 13:20:19 ajacoutot Exp $
lib/gtk-3.0/${GTK_BINARY_VERSION}/printbackends/libprintbackend-cups.so
@comment $OpenBSD: PLIST-cups,v 1.4 2013/01/23 10:06:15 ajacoutot Exp $
lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.so

39
x11/gtk+3/pkg/PLIST-main
View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.15 2012/10/16 12:37:06 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.16 2013/01/23 10:06:15 ajacoutot Exp $
@conflict gtk+3-docs-*
@pkgpath x11/gtk+3,-docs
@unexec-delete rm -f ${SYSCONFDIR}/gtk-3.0/gtk.immodules
@unexec-delete rm -f %D/lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules.cache
@unexec-update rm -f ${SYSCONFDIR}/gtk-3.0/gtk.immodules
@unexec-delete rm -f %D/lib/gtk-3.0/3.0.0/immodules.cache
@bin bin/gtk-launch
@bin bin/gtk-query-immodules-3.0
@bin bin/gtk3-demo
@ -304,22 +305,22 @@ lib/girepository-1.0/Gdk-3.0.typelib
lib/girepository-1.0/GdkX11-3.0.typelib
lib/girepository-1.0/Gtk-3.0.typelib
lib/gtk-3.0/
lib/gtk-3.0/${GTK_BINARY_VERSION}/
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-am-et.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-cedilla.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-cyrillic-translit.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-inuktitut.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-ipa.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-multipress.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-thai.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-ti-er.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-ti-et.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-viqr.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-xim.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/printbackends/
lib/gtk-3.0/${GTK_BINARY_VERSION}/printbackends/libprintbackend-file.so
lib/gtk-3.0/${GTK_BINARY_VERSION}/printbackends/libprintbackend-lpr.so
lib/gtk-3.0/3.0.0/
lib/gtk-3.0/3.0.0/immodules/
lib/gtk-3.0/3.0.0/immodules/im-am-et.so
lib/gtk-3.0/3.0.0/immodules/im-cedilla.so
lib/gtk-3.0/3.0.0/immodules/im-cyrillic-translit.so
lib/gtk-3.0/3.0.0/immodules/im-inuktitut.so
lib/gtk-3.0/3.0.0/immodules/im-ipa.so
lib/gtk-3.0/3.0.0/immodules/im-multipress.so
lib/gtk-3.0/3.0.0/immodules/im-thai.so
lib/gtk-3.0/3.0.0/immodules/im-ti-er.so
lib/gtk-3.0/3.0.0/immodules/im-ti-et.so
lib/gtk-3.0/3.0.0/immodules/im-viqr.so
lib/gtk-3.0/3.0.0/immodules/im-xim.so
lib/gtk-3.0/3.0.0/printbackends/
lib/gtk-3.0/3.0.0/printbackends/libprintbackend-file.so
lib/gtk-3.0/3.0.0/printbackends/libprintbackend-lpr.so
lib/gtk-3.0/modules/
lib/libgailutil-3.a
lib/libgailutil-3.la
@ -1327,4 +1328,4 @@ share/themes/Emacs/gtk-3.0/
share/themes/Emacs/gtk-3.0/gtk-keys.css
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@exec %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules.cache
@exec %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/3.0.0/immodules.cache