diff --git a/x11/gnustep/back/Makefile b/x11/gnustep/back/Makefile index b5328d95597..56c743e0dfa 100644 --- a/x11/gnustep/back/Makefile +++ b/x11/gnustep/back/Makefile @@ -1,53 +1,33 @@ -# $OpenBSD: Makefile,v 1.20 2010/10/24 21:15:32 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2010/10/25 17:38:57 sebastia Exp $ COMMENT= GNUstep gui backend V= 0.18.0 DISTNAME= gnustep-back-${V} -REVISION= 2 +REVISION= 3 CATEGORIES= devel +HOMEPAGE= http://www.gnustep.org/ +MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/} + +MODULES= devel/gettext x11/gnustep +WANTLIB+= Xau Xdmcp Xft Xrender expat fontconfig pixman-1 +WANTLIB+= png cairo pthread-stubs xcb xcb-render xcb-shm +WANTLIB+= Xdamage Xfixes Xxf86vm drm glib-2.0 gobject-2.0 +WANTLIB+= gthread-2.0 intl gnustep-base gnustep-gui +WANTLIB+= GL X11 Xext Xmu Xt c freetype m objc pthread z +LIB_DEPENDS= ::graphics/cairo \ + ::x11/gnustep/base \ + ::x11/gnustep/gui + BACKENDV= ${V:C/([0-9])*[.]([0-9]*).*/\1\2/1} SUBST_VARS= BACKENDV -HOMEPAGE= http://www.gnustep.org/ - -WANTLIB= GL X11 Xt Xext Xmu c freetype m objc pthread z \ - pthread-stubs xcb gnustep-base gnustep-gui - -MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/} - -USE_GROFF = Yes -MODULES= x11/gnustep -LIB_DEPENDS= ::x11/gnustep/base \ - ::x11/gnustep/gui - CONFIGURE_STYLE=gnu CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lm" CONFIGURE_ARGS= --with-x \ - --disable-glitz + --disable-glitz \ + --enable-graphics=cairo -FLAVORS= cairo libart xlib -FLAVOR?= xlib - -.if ${FLAVOR:L} == "cairo" -CONFIGURE_ARGS+=--enable-graphics=cairo \ - --with-name=cairo -LIB_DEPENDS+= ::graphics/cairo -WANTLIB+= Xau Xdmcp Xft Xrender expat fontconfig pixman-1 \ - png cairo -.elif ${FLAVOR:L} == "libart" -CONFIGURE_ARGS+=--enable-graphics=art \ - --with-name=art -LIB_DEPENDS+= ::graphics/libart -WANTLIB += art_lgpl_2 -.elif ${FLAVOR:L} == "xlib" -CONFIGURE_ARGS+=--enable-graphics=xlib \ - --with-name=back -WANTLIB+= Xau Xdmcp Xft Xrender expat fontconfig -.else -ERRORS+= choose one backend FLAVOR: cairo, libart or xlib -.endif - .include diff --git a/x11/gnustep/back/pkg/MESSAGE b/x11/gnustep/back/pkg/MESSAGE deleted file mode 100644 index c96f36bb33b..00000000000 --- a/x11/gnustep/back/pkg/MESSAGE +++ /dev/null @@ -1,11 +0,0 @@ -To switch the default backend in GNUstep to the corresponding FLAVOR, -enter one of the following: - -* cairo: - defaults write NSGlobalDomain GSBackend cairo - -* libart: - defaults write NSGlobalDomain GSBackend art - -* xlib: - defaults write NSGlobalDomain GSBackend back diff --git a/x11/gnustep/back/pkg/PFRAG.cairo b/x11/gnustep/back/pkg/PFRAG.cairo deleted file mode 100644 index a7e893e5128..00000000000 --- a/x11/gnustep/back/pkg/PFRAG.cairo +++ /dev/null @@ -1,10 +0,0 @@ -@comment $OpenBSD: PFRAG.cairo,v 1.2 2008/12/23 15:25:51 ajacoutot Exp $ -lib/GNUstep/Bundles/libgnustep-cairo-${BACKENDV}.bundle/ -lib/GNUstep/Bundles/libgnustep-cairo-${BACKENDV}.bundle/Resources/ -lib/GNUstep/Bundles/libgnustep-cairo-${BACKENDV}.bundle/Resources/English.lproj/ -lib/GNUstep/Bundles/libgnustep-cairo-${BACKENDV}.bundle/Resources/English.lproj/nfontFaceNames.strings -lib/GNUstep/Bundles/libgnustep-cairo-${BACKENDV}.bundle/Resources/Info-gnustep.plist -lib/GNUstep/Bundles/libgnustep-cairo-${BACKENDV}.bundle/Resources/Swedish.lproj/ -lib/GNUstep/Bundles/libgnustep-cairo-${BACKENDV}.bundle/Resources/Swedish.lproj/nfontFaceNames.strings -lib/GNUstep/Bundles/libgnustep-cairo-${BACKENDV}.bundle/libgnustep-cairo-${BACKENDV}.so -lib/GNUstep/Bundles/libgnustep-cairo-${BACKENDV}.bundle/stamp.make diff --git a/x11/gnustep/back/pkg/PFRAG.libart b/x11/gnustep/back/pkg/PFRAG.libart deleted file mode 100644 index 673a197175c..00000000000 --- a/x11/gnustep/back/pkg/PFRAG.libart +++ /dev/null @@ -1,10 +0,0 @@ -@comment $OpenBSD: PFRAG.libart,v 1.2 2008/12/23 15:25:51 ajacoutot Exp $ -lib/GNUstep/Bundles/libgnustep-art-${BACKENDV}.bundle/ -lib/GNUstep/Bundles/libgnustep-art-${BACKENDV}.bundle/Resources/ -lib/GNUstep/Bundles/libgnustep-art-${BACKENDV}.bundle/Resources/English.lproj/ -lib/GNUstep/Bundles/libgnustep-art-${BACKENDV}.bundle/Resources/English.lproj/nfontFaceNames.strings -lib/GNUstep/Bundles/libgnustep-art-${BACKENDV}.bundle/Resources/Info-gnustep.plist -lib/GNUstep/Bundles/libgnustep-art-${BACKENDV}.bundle/Resources/Swedish.lproj/ -lib/GNUstep/Bundles/libgnustep-art-${BACKENDV}.bundle/Resources/Swedish.lproj/nfontFaceNames.strings -lib/GNUstep/Bundles/libgnustep-art-${BACKENDV}.bundle/libgnustep-art-${BACKENDV}.so -lib/GNUstep/Bundles/libgnustep-art-${BACKENDV}.bundle/stamp.make diff --git a/x11/gnustep/back/pkg/PFRAG.xlib b/x11/gnustep/back/pkg/PFRAG.xlib deleted file mode 100644 index a1b098fa686..00000000000 --- a/x11/gnustep/back/pkg/PFRAG.xlib +++ /dev/null @@ -1,12 +0,0 @@ -@comment $OpenBSD: PFRAG.xlib,v 1.2 2008/12/23 15:25:51 ajacoutot Exp $ -@pkgpath x11/gnustep/back -@bin bin/font_cacher -lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/ -lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/ -lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/English.lproj/ -lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/English.lproj/nfontFaceNames.strings -lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/Info-gnustep.plist -lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/Swedish.lproj/ -lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/Swedish.lproj/nfontFaceNames.strings -lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/libgnustep-back-${BACKENDV}.so -lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/stamp.make diff --git a/x11/gnustep/back/pkg/PLIST b/x11/gnustep/back/pkg/PLIST index ec40c199424..010a1109b7a 100644 --- a/x11/gnustep/back/pkg/PLIST +++ b/x11/gnustep/back/pkg/PLIST @@ -1,5 +1,17 @@ -@comment $OpenBSD: PLIST,v 1.3 2008/09/05 18:29:43 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.4 2010/10/25 17:38:57 sebastia Exp $ +@pkgpath ${BASE_PKGPATH},cairo +@pkgpath ${BASE_PKGPATH},libart +@pkgpath ${BASE_PKGPATH},xlib @bin bin/gpbs +lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/ +lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/ +lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/English.lproj/ +lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/English.lproj/nfontFaceNames.strings +lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/Info-gnustep.plist +lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/Swedish.lproj/ +lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/Resources/Swedish.lproj/nfontFaceNames.strings +lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/libgnustep-back-${BACKENDV}.so +lib/GNUstep/Bundles/libgnustep-back-${BACKENDV}.bundle/stamp.make lib/GNUstep/Fonts/ lib/GNUstep/Fonts/Helvetica.nfont/ lib/GNUstep/Fonts/Helvetica.nfont/FontInfo.plist @@ -28,6 +40,3 @@ lib/GNUstep/Fonts/Helvetica.nfont/n019064l.afm lib/GNUstep/Fonts/Helvetica.nfont/n019064l.pfb lib/GNUstep/Fonts/Helvetica.nfont/n019064l.pfm @man man/man1/gpbs.1 -%%cairo%% -%%libart%% -%%xlib%%