diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-05 21:28:51 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-05 21:28:51 +0000 |
| commit | 679f55238c58945151954230f2b4cfa618f81bd9 (patch) | |
| tree | a156e5b64eceda406f2809bd49f85adcd4a62837 /x11-toolkits | |
| parent | 451e0062f36834b7115b8240c427417e8d284771 (diff) | |
Do not enable XInput by default. While it works well with gtk12, there
still seems to be some issues with gtk20. Instead, allow users that really
want XInput support to enable it using -DWITH_XINPUT
Problem reported by: William N. Culler Jr. <william@neo.rr.com>
Notes
Notes:
svn path=/head/; revision=69548
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 5b76495b8d33..0487187b86e7 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtk PORTVERSION= 2.0.7 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ @@ -37,8 +38,7 @@ USE_GNOMENG= yes USE_GNOME= gnomehack INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-static \ - --with-xinput=xfree +CONFIGURE_ARGS= --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -47,6 +47,10 @@ PLIST_SUB= GTK_VERSION="2.0.0" MAN1= gdk-pixbuf-csource.1 +.if defined(WITH_XINPUT) +CONFIGURE_ARGS+= --with-xinput=xfree +.endif + post-extract: @find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \ xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 5b76495b8d33..0487187b86e7 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtk PORTVERSION= 2.0.7 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ @@ -37,8 +38,7 @@ USE_GNOMENG= yes USE_GNOME= gnomehack INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-static \ - --with-xinput=xfree +CONFIGURE_ARGS= --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -47,6 +47,10 @@ PLIST_SUB= GTK_VERSION="2.0.0" MAN1= gdk-pixbuf-csource.1 +.if defined(WITH_XINPUT) +CONFIGURE_ARGS+= --with-xinput=xfree +.endif + post-extract: @find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \ xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' |