diff options
| -rw-r--r-- | x11-toolkits/pango/Makefile | 6 | ||||
| -rw-r--r-- | x11-toolkits/pango/pkg-plist | 36 |
2 files changed, 23 insertions, 19 deletions
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index d44477ea70d9..eb73b71a949d 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -8,6 +8,7 @@ PORTNAME= pango PORTVERSION= 1.12.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.12,} \ ftp://ftp.gtk.org/pub/gtk/v2.10/ @@ -23,7 +24,7 @@ RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ USE_BZIP2= yes USE_GETTEXT= yes -USE_X_PREFIX= yes +PREFIX?= ${X11BASE} USE_GMAKE= yes INSTALLS_SHLIB= yes USE_AUTOTOOLS= libtool:15 @@ -49,12 +50,15 @@ CONFIGURE_ARGS+= --with-x=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ ${GLIB2_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB+= X11="@comment " .else +USE_XLIB+= yes LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ ${GLIB2_CFLAGS} -I${LOCALBASE}/include \ -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +PLIST_SUB+= X11="" .endif post-install: diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 6b7b96d2d326..62645432958f 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -1,7 +1,7 @@ bin/pango-querymodules -bin/pango-view +%%X11%%bin/pango-view etc/pango/pango.modules -etc/pango/pangox.aliases +%%X11%%etc/pango/pangox.aliases include/pango-1.0/pango/pango-attributes.h include/pango-1.0/pango/pango-break.h include/pango-1.0/pango/pango-context.h @@ -28,9 +28,9 @@ include/pango-1.0/pango/pangofc-decoder.h include/pango-1.0/pango/pangofc-font.h include/pango-1.0/pango/pangofc-fontmap.h include/pango-1.0/pango/pangoft2.h -include/pango-1.0/pango/pangox.h -include/pango-1.0/pango/pangoxft-render.h -include/pango-1.0/pango/pangoxft.h +%%X11%%include/pango-1.0/pango/pangox.h +%%X11%%include/pango-1.0/pango/pangoxft-render.h +%%X11%%include/pango-1.0/pango/pangoxft.h lib/libpango-1.0.a lib/libpango-1.0.la lib/libpango-1.0.so @@ -43,23 +43,23 @@ lib/libpangoft2-1.0.a lib/libpangoft2-1.0.la lib/libpangoft2-1.0.so lib/libpangoft2-1.0.so.0 -lib/libpangox-1.0.a -lib/libpangox-1.0.la -lib/libpangox-1.0.so -lib/libpangox-1.0.so.0 -lib/libpangoxft-1.0.a -lib/libpangoxft-1.0.la -lib/libpangoxft-1.0.so -lib/libpangoxft-1.0.so.0 +%%X11%%lib/libpangox-1.0.a +%%X11%%lib/libpangox-1.0.la +%%X11%%lib/libpangox-1.0.so +%%X11%%lib/libpangox-1.0.so.0 +%%X11%%lib/libpangoxft-1.0.a +%%X11%%lib/libpangoxft-1.0.la +%%X11%%lib/libpangoxft-1.0.so +%%X11%%lib/libpangoxft-1.0.so.0 lib/pango/%%VERSION%%/modules/pango-arabic-fc.a lib/pango/%%VERSION%%/modules/pango-arabic-fc.la lib/pango/%%VERSION%%/modules/pango-arabic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-fc.a lib/pango/%%VERSION%%/modules/pango-basic-fc.la lib/pango/%%VERSION%%/modules/pango-basic-fc.so -lib/pango/%%VERSION%%/modules/pango-basic-x.a -lib/pango/%%VERSION%%/modules/pango-basic-x.la -lib/pango/%%VERSION%%/modules/pango-basic-x.so +%%X11%%lib/pango/%%VERSION%%/modules/pango-basic-x.a +%%X11%%lib/pango/%%VERSION%%/modules/pango-basic-x.la +%%X11%%lib/pango/%%VERSION%%/modules/pango-basic-x.so lib/pango/%%VERSION%%/modules/pango-hangul-fc.a lib/pango/%%VERSION%%/modules/pango-hangul-fc.la lib/pango/%%VERSION%%/modules/pango-hangul-fc.so @@ -84,8 +84,8 @@ lib/pango/%%VERSION%%/modules/pango-tibetan-fc.so libdata/pkgconfig/pango.pc libdata/pkgconfig/pangocairo.pc libdata/pkgconfig/pangoft2.pc -libdata/pkgconfig/pangox.pc -libdata/pkgconfig/pangoxft.pc +%%X11%%libdata/pkgconfig/pangox.pc +%%X11%%libdata/pkgconfig/pangoxft.pc %%DOCSDIR%%/PangoEngineLang.html %%DOCSDIR%%/PangoEngineShape.html %%DOCSDIR%%/PangoFcDecoder.html |