diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /x11-toolkits/wxgtk26 | |
| parent | Update to version 2.2.6 (diff) | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'x11-toolkits/wxgtk26')
| -rw-r--r-- | x11-toolkits/wxgtk26/Makefile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index 1c434ffa9fc9..b6e1a5568fbb 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -7,9 +7,9 @@ PORTNAME= wx PORTVERSION= 2.6.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows +MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} DISTNAME= wxGTK-${PORTVERSION} @@ -23,8 +23,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ mspack.1:${PORTSDIR}/archivers/libmspack USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes +USE_XORG= x11 sm xxf86vm xinerama +USE_GL= glu USE_GMAKE= yes USE_ICONV= yes USE_GNOME= gtk20 @@ -38,13 +38,11 @@ CONFIGURE_ARGS= --with-libpng=sys\ --with-mspack\ --with-gtk\ --disable-backtrace -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv \ - -L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -liconv" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}"\ - X11BASE="${X11BASE}" + X11BASE="${LOCALBASE}" NO_LATEST_LINK= yes PLIST= ${.CURDIR}/pkg-plist @@ -56,7 +54,7 @@ CONFLICTS= wxgtk2-contrib-devel-2.5.2* .endif .if ${WXGTK_FLAVOR} != "gtk2-common" -RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common .endif .if ${WXGTK_FLAVOR:M*-common} != "" @@ -72,7 +70,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} .if ${WXGTK_FLAVOR} != "gtk2-contrib-common" USE_WX= 2.6 -RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common .if ${WXGTK_FLAVOR:M*-unicode*} != "" WX_UNICODE= yes |