diff options
Diffstat (limited to '')
112 files changed, 328 insertions, 616 deletions
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile index 2218bf9af506..0269ec0c12a3 100644 --- a/devel/gob2/Makefile +++ b/devel/gob2/Makefile @@ -12,16 +12,10 @@ MASTER_SITES= http://ftp.5z.com/pub/gob/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gob.1 diff --git a/korean/gau/Makefile b/korean/gau/Makefile index 9ed341289fc3..5603b0e69265 100644 --- a/korean/gau/Makefile +++ b/korean/gau/Makefile @@ -17,16 +17,12 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= cjh@kr.freebsd.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= lrz:${PORTSDIR}/comms/lrzsz \ ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile index 424dbcff2ebf..e9e90322ce16 100644 --- a/mail/gbuffy/Makefile +++ b/mail/gbuffy/Makefile @@ -12,17 +12,12 @@ MASTER_SITES= http://www.fiction.net/blong/programs/gbuffy/ MAINTAINER= kaj@Raditex.se -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - PropList.2:${PORTSDIR}/devel/libPropList \ +LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ compface.1:${PORTSDIR}/mail/faces -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" +USE_GTK= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile index c4ce40b345ea..707f01163541 100644 --- a/mail/spruce/Makefile +++ b/mail/spruce/Makefile @@ -13,17 +13,14 @@ MASTER_SITES= http://www.xtorshun.org/spruce/v0.6/ \ MAINTAINER= erich@tacni.net -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} GLIB_CONFIG=${GLIB_CONFIG} \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" USE_GMAKE= yes +USE_GTK= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MAN1= spruce.1 diff --git a/math/geg/Makefile b/math/geg/Makefile index 717e1276952d..d5a301c190cb 100644 --- a/math/geg/Makefile +++ b/math/geg/Makefile @@ -14,16 +14,13 @@ MASTER_SITE_SUBDIR= science/visualization/plotting MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GTK= yes USE_AUTOMAKE= yes AUTOMAKE= automake -a -i CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" + MAN1= geg.1 pre-configure: diff --git a/math/grpn/Makefile b/math/grpn/Makefile index fa17130f10a6..98e701b562ec 100644 --- a/math/grpn/Makefile +++ b/math/grpn/Makefile @@ -12,15 +12,12 @@ MASTER_SITES= http://wilkins.ne.mediaone.net/grpn/ MAINTAINER= jedgar@fxp.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_X_PREFIX= yes +USE_GTK= yes ALL_TARGET= -USE_X_PREFIX= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -MAKE_ENV+= GTK_CONFIG=${GTK_CONFIG} \ - X11BASE=${X11BASE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/grpn ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/grpn ${PREFIX}/bin .include <bsd.port.mk> diff --git a/misc/biblereader/Makefile b/misc/biblereader/Makefile index 6250f9edbe99..f78ba9b931a1 100644 --- a/misc/biblereader/Makefile +++ b/misc/biblereader/Makefile @@ -19,26 +19,21 @@ DISTFILES+= easton.tar.gz mhc.tar.gz MAINTAINER= patseal@hyperhost.net -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG=${GTK_CONFIG} -PLIST= ${WRKDIR}/PLIST +USE_GTK= yes +PLIST= ${WRKDIR}/PLIST -DATAFILES= ${WRKDIR}/kjv/kjv +DATAFILES= ${WRKDIR}/kjv/kjv +PLISTS= ${PKGDIR}/PLIST .if defined(WITH_TRANSLATIONS) -DATAFILES+= ${WRKDIR}/asv/asv ${WRKDIR}/darby/darby -PLISTS+= ${PKGDIR}/PLIST.translations +DATAFILES+= ${WRKDIR}/asv/asv ${WRKDIR}/darby/darby +PLISTS+= ${PKGDIR}/PLIST.translations .endif .if defined(WITH_SUPPLEMENTS) -DATAFILES+= ${WRKDIR}/easton/easton.dict ${WRKDIR}/mhc/mhc -PLISTS+= ${PKGDIR}/PLIST.supplements +DATAFILES+= ${WRKDIR}/easton/easton.dict ${WRKDIR}/mhc/mhc +PLISTS+= ${PKGDIR}/PLIST.supplements .endif -PLISTS+= ${PKGDIR}/PLIST - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - .if !defined(WITH_TRANSLATIONS) pre-fetch: @${ECHO_MSG} @@ -54,12 +49,11 @@ pre-fetch: .endif do-install: - @echo ${DATAFILES} ${INSTALL_PROGRAM} ${WRKSRC}/biblereader ${PREFIX}/bin/biblereader ${MKDIR} ${PREFIX}/share/biblereader @for file in ${DATAFILES}; do \ ${INSTALL_DATA} $${file} ${PREFIX}/share/biblereader; \ done - @cat ${PLISTS} > ${PLIST} + @${CAT} ${PLISTS} > ${PLIST} .include <bsd.port.mk> diff --git a/misc/gplbp/Makefile b/misc/gplbp/Makefile index f3549712bfcf..f4b9a8022641 100644 --- a/misc/gplbp/Makefile +++ b/misc/gplbp/Makefile @@ -12,17 +12,9 @@ MASTER_SITES= ftp://ftp.stampede.org/skibum/ MAINTAINER= jedgar@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-x -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/misc/grun/Makefile b/misc/grun/Makefile index a5c91a88c5e5..fc9130b840ed 100644 --- a/misc/grun/Makefile +++ b/misc/grun/Makefile @@ -12,15 +12,10 @@ MASTER_SITES= http://www.geocities.com/ResearchTriangle/Facility/1468/sg/ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes MAN1= grun.1x -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile index b56b09ffb68b..dc367f55613f 100644 --- a/misc/gtkfind/Makefile +++ b/misc/gtkfind/Makefile @@ -15,13 +15,11 @@ MASTER_SITES= http://www.oz.net/~mattg/ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GTK= yes +GNU_CONFIGURE= yes MAN1= gtkfind.1 mktmp.1 -GNU_CONFIGURE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" -USE_GMAKE= yes -USE_X_PREFIX= yes .include <bsd.port.mk> diff --git a/misc/snowflake/Makefile b/misc/snowflake/Makefile index 6b7dcc1b8511..e329d32c77d0 100644 --- a/misc/snowflake/Makefile +++ b/misc/snowflake/Makefile @@ -13,12 +13,8 @@ DISTNAME= ${PORTNAME} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/snowflake ${PREFIX}/bin diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile index af38ea9e1a62..415e5d4de521 100644 --- a/net-im/gtkyahoo/Makefile +++ b/net-im/gtkyahoo/Makefile @@ -12,12 +12,8 @@ MASTER_SITES= http://www.unixtools.org/gtkyahoo/dist/tars/ MAINTAINER= dannyman@dannyland.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile index 6dabf901295f..d7b6c6d85716 100644 --- a/net-p2p/gtk-gnutella/Makefile +++ b/net-p2p/gtk-gnutella/Makefile @@ -13,12 +13,9 @@ MASTER_SITES= http://gtk-gnutella.sourceforge.net/download/ \ MAINTAINER= rbt@zort.on.ca -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/net/amcl/Makefile b/net/amcl/Makefile index a42c25af6aa7..b8455d393ae7 100644 --- a/net/amcl/Makefile +++ b/net/amcl/Makefile @@ -16,12 +16,10 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}pl1 MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 5126ae24bea6..90a9b640d92d 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -16,16 +16,10 @@ MASTER_SITES= http://alpha1.linuxberg.com/files/x11/network/ \ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12.3:${PORTSDIR}/devel/glib12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-snmp=no -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" PLIST_SUB= PORTVERSION=${PORTVERSION} MAN1= ethereal.1 tethereal.1 editcap.1 diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile index 31c8982b32e1..bdec694702a0 100644 --- a/net/ggsd/Makefile +++ b/net/ggsd/Makefile @@ -16,20 +16,15 @@ EXTRACT_SUFX= .tar MAINTAINER= dima@chg.ru -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf EXTRACT_AFTER_ARGS= # empty -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - WRKSRC= ${WRKDIR}/GGSD -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ggsd ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/ggsd diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile index a42c25af6aa7..b8455d393ae7 100644 --- a/net/gnome-mud/Makefile +++ b/net/gnome-mud/Makefile @@ -16,12 +16,10 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}pl1 MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/net/gnubile/Makefile b/net/gnubile/Makefile index fca5c5243bca..50de6beb2429 100644 --- a/net/gnubile/Makefile +++ b/net/gnubile/Makefile @@ -12,12 +12,11 @@ MASTER_SITES= http://gnutella.wego.com/file_depot/0-10000000/110000-120000/11670 MAINTAINER= klaus.herrmann@gmx.net -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - xml.5:${PORTSDIR}/textproc/libxml +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config USE_GMAKE= yes .include <bsd.port.mk> diff --git a/net/gq/Makefile b/net/gq/Makefile index 25c6551d2c55..8c139cbc271b 100644 --- a/net/gq/Makefile +++ b/net/gq/Makefile @@ -12,14 +12,11 @@ MASTER_SITES= http://biot.com/gq/download/ MAINTAINER= roman@xpert.com -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - ldap.1:${PORTSDIR}/net/openldap +LIB_DEPENDS= ldap.1:${PORTSDIR}/net/openldap USE_X_PREFIX= yes - +USE_GTK= yes GNU_CONFIGURE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" CONFIGURE_ARGS= --with-ldap=${LOCALBASE} .include <bsd.port.mk> diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 6dabf901295f..d7b6c6d85716 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -13,12 +13,9 @@ MASTER_SITES= http://gtk-gnutella.sourceforge.net/download/ \ MAINTAINER= rbt@zort.on.ca -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/net/gtkyahoo/Makefile b/net/gtkyahoo/Makefile index af38ea9e1a62..415e5d4de521 100644 --- a/net/gtkyahoo/Makefile +++ b/net/gtkyahoo/Makefile @@ -12,12 +12,8 @@ MASTER_SITES= http://www.unixtools.org/gtkyahoo/dist/tars/ MAINTAINER= dannyman@dannyland.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 5126ae24bea6..90a9b640d92d 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -16,16 +16,10 @@ MASTER_SITES= http://alpha1.linuxberg.com/files/x11/network/ \ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12.3:${PORTSDIR}/devel/glib12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-snmp=no -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" PLIST_SUB= PORTVERSION=${PORTVERSION} MAN1= ethereal.1 tethereal.1 editcap.1 diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index ff8c6b3fdc33..053a5642f8f1 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -13,19 +13,16 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \ +LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \ tiff.4:${PORTSDIR}/graphics/tiff -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_MESA= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib \ --with-lib-GL CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" DATAFILES= ndg_files.tar.gz @@ -33,7 +30,7 @@ DATAFILES= ndg_files.tar.gz MAN1= xtraceroute.1 post-install: - ${INSTALL_DATA} ${WRKDIR}/hosts.cache ${PREFIX}/share/xtraceroute - ${INSTALL_DATA} ${WRKDIR}/networks.cache ${PREFIX}/share/xtraceroute + ${INSTALL_DATA} ${WRKDIR}/hosts.cache ${PREFIX}/share/xtraceroute + ${INSTALL_DATA} ${WRKDIR}/networks.cache ${PREFIX}/share/xtraceroute .include <bsd.port.mk> diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile index d5cf7a048c63..a9fd8142d7b5 100644 --- a/net/xwhois/Makefile +++ b/net/xwhois/Makefile @@ -14,13 +14,9 @@ MASTER_SITES= http://c64.org/~nr/ \ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xwhois ${PREFIX}/bin diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile index 2e004d6fa0ae..eeaa88600f77 100644 --- a/palm/jpilot/Makefile +++ b/palm/jpilot/Makefile @@ -14,13 +14,12 @@ MASTER_SITES= http://jpilot.linuxave.net/ MAINTAINER?= varju@webct.com LIB_DEPENDS= pisock.3:${PORTSDIR}/palm/pilot-link \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ intl.1:${PORTSDIR}/devel/gettext PREFIX= ${LOCALBASE}/pilot +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-pilot-prefix=${PREFIX} -CONFIGURE_ENV+= GTK_CONFIG=${X11BASE}/bin/gtk12-config post-install: .if !defined(NOPORTDOCS) diff --git a/palm/pilrc/Makefile b/palm/pilrc/Makefile index c0a98e23d11b..7aef929c639c 100644 --- a/palm/pilrc/Makefile +++ b/palm/pilrc/Makefile @@ -14,12 +14,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= kuriyama@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12.3:${PORTSDIR}/devel/glib12 - WRKSRC= ${WRKDIR}/pilrc-${PORTVERSION} -GNU_CONFIGURE= YES -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config + +USE_GTK= yes +GNU_CONFIGURE= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pilrc ${WRKSRC}/pilrcui ${PREFIX}/bin diff --git a/print/pdq/Makefile b/print/pdq/Makefile index 8f4bd64b8338..89c3c9e4e3ed 100644 --- a/print/pdq/Makefile +++ b/print/pdq/Makefile @@ -13,15 +13,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= yinjieh@csie.nctu.edu.tw -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pdqlibdir=${PREFIX}/etc/pdq -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" MAN1= lpd_cancel.1 lpd_print.1 lpd_status.1 pdq.1 xpdq.1 MAN5= printrc.5 diff --git a/security/gpa/Makefile b/security/gpa/Makefile index 4c9494615f1b..94d8cf1be03d 100644 --- a/security/gpa/Makefile +++ b/security/gpa/Makefile @@ -12,17 +12,13 @@ MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/devel/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - MAKE="gmake" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/security/gpasman/Makefile b/security/gpasman/Makefile index b340deace0fb..28a93eae302c 100644 --- a/security/gpasman/Makefile +++ b/security/gpasman/Makefile @@ -12,12 +12,9 @@ MASTER_SITES= http://gpasman.nl.linux.org/ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" diff --git a/security/gtkportscan/Makefile b/security/gtkportscan/Makefile index 2fc2cb8c08c3..571e64eb5285 100644 --- a/security/gtkportscan/Makefile +++ b/security/gtkportscan/Makefile @@ -13,11 +13,8 @@ MASTER_SITE_SUBDIR= cpiazza MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +WRKSRC= ${WRKDIR}/${PORTNAME} -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes .include <bsd.port.mk> diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile index 72d5a29fd058..2b223a7811b0 100644 --- a/security/nessus-devel/Makefile +++ b/security/nessus-devel/Makefile @@ -21,24 +21,24 @@ DISTNAME= nessus-core-1.0.4 MAINTAINER= anders@fix.no -LIB_DEPENDS= nasl.1:${PORTSDIR}/security/nessus-libnasl \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= nasl.1:${PORTSDIR}/security/nessus-libnasl NESSUS_REV= ${DISTNAME:S/nessus-core-//g} -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config DIST_SUBDIR= nessus WRKSRC= ${WRKDIR}/nessus-core -GNU_CONFIGURE= yes +USE_GTK= yes +USE_LIBTOOL= yes CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" + MAN1= nessus.1 MAN8= nessusd.8 nessus-adduser.8 post-install: - @${ECHO} "==========================================================" - @${ECHO} "Be sure to erase your old ${PREFIX}/etc/nessus!" - @${ECHO} "The syntax of nessusd.users and nessusd.rules has changed!" - @${ECHO} "==========================================================" + @${ECHO} "==========================================================" + @${ECHO} "Be sure to erase your old ${PREFIX}/etc/nessus!" + @${ECHO} "The syntax of nessusd.users and nessusd.rules has changed!" + @${ECHO} "==========================================================" .include <bsd.port.mk> diff --git a/security/nessus/Makefile b/security/nessus/Makefile index 72d5a29fd058..2b223a7811b0 100644 --- a/security/nessus/Makefile +++ b/security/nessus/Makefile @@ -21,24 +21,24 @@ DISTNAME= nessus-core-1.0.4 MAINTAINER= anders@fix.no -LIB_DEPENDS= nasl.1:${PORTSDIR}/security/nessus-libnasl \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= nasl.1:${PORTSDIR}/security/nessus-libnasl NESSUS_REV= ${DISTNAME:S/nessus-core-//g} -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config DIST_SUBDIR= nessus WRKSRC= ${WRKDIR}/nessus-core -GNU_CONFIGURE= yes +USE_GTK= yes +USE_LIBTOOL= yes CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" + MAN1= nessus.1 MAN8= nessusd.8 nessus-adduser.8 post-install: - @${ECHO} "==========================================================" - @${ECHO} "Be sure to erase your old ${PREFIX}/etc/nessus!" - @${ECHO} "The syntax of nessusd.users and nessusd.rules has changed!" - @${ECHO} "==========================================================" + @${ECHO} "==========================================================" + @${ECHO} "Be sure to erase your old ${PREFIX}/etc/nessus!" + @${ECHO} "The syntax of nessusd.users and nessusd.rules has changed!" + @${ECHO} "==========================================================" .include <bsd.port.mk> diff --git a/security/nmapfe/Makefile b/security/nmapfe/Makefile index 6eb371aeaa62..215ef89aebc3 100644 --- a/security/nmapfe/Makefile +++ b/security/nmapfe/Makefile @@ -15,14 +15,13 @@ EXTRACT_SUFX= .tgz MAINTAINER= obrien@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= nmap:${PORTSDIR}/security/nmap .include <bsd.port.pre.mk> USE_XLIB= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" WRKSRC:= ${WRKDIR}/nmapfe do-install: diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile index 6eb371aeaa62..215ef89aebc3 100644 --- a/security/zenmap/Makefile +++ b/security/zenmap/Makefile @@ -15,14 +15,13 @@ EXTRACT_SUFX= .tgz MAINTAINER= obrien@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= nmap:${PORTSDIR}/security/nmap .include <bsd.port.pre.mk> USE_XLIB= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" WRKSRC:= ${WRKDIR}/nmapfe do-install: diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile index 2a56985f7bde..ea97d74e2663 100644 --- a/sysutils/gcombust/Makefile +++ b/sysutils/gcombust/Makefile @@ -12,23 +12,27 @@ MASTER_SITES= http://www.abo.fi/~jmunsin/gcombust/ MAINTAINER= bsdx@looksharp.net -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrecord \ mkisofs:${PORTSDIR}/sysutils/mkisofs \ cdlabelgen:${PORTSDIR}/print/cdlabelgen -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share -CONFIGURE_ENV+= GTK_CONFIG=${GTK_CONFIG} CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/include" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure post-configure: cd ${WRKSRC}/po && ${MAKE} update-po post-install: - ${MKDIR} ${PREFIX}/share/doc/gcombust + @${MKDIR} ${PREFIX}/share/doc/gcombust ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gcombust ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/gcombust diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile index 15c628693e48..6458517557d6 100644 --- a/sysutils/xlogmaster/Makefile +++ b/sysutils/xlogmaster/Makefile @@ -16,15 +16,10 @@ MASTER_SITE_SUBDIR= xlogmaster MAINTAINER= aw1@stade.co.uk -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -NO_PACKAGE= ignores CFLAGS -GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" USE_XLIB= yes USE_GMAKE= yes +USE_GTK= yes +GNU_CONFIGURE= yes MAN1= xlogmaster.1 diff --git a/sysutils/xlogmaster/files/patch-af b/sysutils/xlogmaster/files/patch-af new file mode 100644 index 000000000000..c4a9dbb50403 --- /dev/null +++ b/sysutils/xlogmaster/files/patch-af @@ -0,0 +1,20 @@ +--- configure.orig Wed Mar 31 08:00:59 1999 ++++ configure Fri Feb 11 00:28:01 2000 +@@ -860,7 +860,7 @@ + + + +-CFLAGS="" ++#CFLAGS="" + if test x${CXXFLAGS+set} = xset ; then + : + else +@@ -2835,7 +2835,7 @@ + s%@host_os@%$host_os%g + s%@LN_S@%$LN_S%g + s%@GTK_CONFIG@%$GTK_CONFIG%g +-s%@GTK_CFLAGS@%$GTK_CFLAGS%g ++s%@GTK_CFLAGS@%$CFLAGS $GTK_CFLAGS%g + s%@GTK_LIBS@%$GTK_LIBS%g + s%@CPP@%$CPP%g + s%@NEED_LIBIMPORT_TRUE@%$NEED_LIBIMPORT_TRUE%g diff --git a/sysutils/xwatch/Makefile b/sysutils/xwatch/Makefile index b1f0827bd3a1..3aa69a294942 100644 --- a/sysutils/xwatch/Makefile +++ b/sysutils/xwatch/Makefile @@ -12,13 +12,9 @@ MASTER_SITES= http://hem.passagen.se/osk/ MAINTAINER= mph@freebsd.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_XLIB= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: .if !defined(NOPORTDOCS) diff --git a/textproc/gdict/Makefile b/textproc/gdict/Makefile index 5af0a427de90..89101b351295 100644 --- a/textproc/gdict/Makefile +++ b/textproc/gdict/Makefile @@ -12,11 +12,7 @@ MASTER_SITES= http://www.psilord.com/code/gdict/old/ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gdict ${PREFIX}/bin diff --git a/www/erwn/Makefile b/www/erwn/Makefile index 22bfbe473e81..434f522a8dcf 100644 --- a/www/erwn/Makefile +++ b/www/erwn/Makefile @@ -13,13 +13,9 @@ DISTNAME= erwin-${PORTVERSION} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes post-install: .if !defined(NOPORTDOCS) diff --git a/www/nscache/Makefile b/www/nscache/Makefile index dd7f0f8c6434..7a22ad90a340 100644 --- a/www/nscache/Makefile +++ b/www/nscache/Makefile @@ -14,14 +14,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_GTK= yes USE_AUTOMAKE= yes AUTOMAKE= automake -a -i CONFIGURE_ENV= CPPFALGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-configure: diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile index 8ce9ca242723..f8e85ee65e47 100644 --- a/x11-clocks/asclock-gtk/Makefile +++ b/x11-clocks/asclock-gtk/Makefile @@ -13,17 +13,13 @@ DISTNAME= ${PKGNAME}beta MAINTAINER= kuriyama@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - WRKSRC= ${WRKDIR}/${PORTNAME} - -HAS_CONFIGURE= YES -USE_X_PREFIX= YES -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" ALL_TARGET= asclock +USE_X_PREFIX= yes +USE_GTK= yes +HAS_CONFIGURE= yes + .if defined(BATCH) do-configure: @(cd ${WRKSRC}; \ diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile index a25415ce1e48..648cdcd41381 100644 --- a/x11-fm/fsv/Makefile +++ b/x11-fm/fsv/Makefile @@ -12,17 +12,14 @@ MASTER_SITES= http://fox.mit.edu/skunk/soft/src/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea USE_X_PREFIX= yes USE_MESA= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11-fm/mfm/Makefile b/x11-fm/mfm/Makefile index 7eb023c807b6..5c456488f3d9 100644 --- a/x11-fm/mfm/Makefile +++ b/x11-fm/mfm/Makefile @@ -12,14 +12,11 @@ MASTER_SITES= http://www.core-coutainville.org/mfm/archive/SOURCES/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" CONFIGURE_ARGS= --with-conffile="${PREFIX}/etc/mfm.conf" \ --with-mtoolsdir="${LOCALBASE}/bin" \ --disable-gtktest diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile index 7eb023c807b6..5c456488f3d9 100644 --- a/x11-fm/mtoolsfm/Makefile +++ b/x11-fm/mtoolsfm/Makefile @@ -12,14 +12,11 @@ MASTER_SITES= http://www.core-coutainville.org/mfm/archive/SOURCES/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" CONFIGURE_ARGS= --with-conffile="${PREFIX}/etc/mfm.conf" \ --with-mtoolsdir="${LOCALBASE}/bin" \ --disable-gtktest diff --git a/x11-fm/vide/Makefile b/x11-fm/vide/Makefile index 41967b21694e..2f9de2c88e63 100644 --- a/x11-fm/vide/Makefile +++ b/x11-fm/vide/Makefile @@ -12,16 +12,11 @@ MASTER_SITES= http://vide.sourceforge.net/ MAINTAINER= careilly@thecia.ie -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-DHAVE_SYS_PARAM_H" \ - GTK_CONFIG="${GTK_CONFIG}" -CONFIGURE_ARGS= --disable-gtktest +CONFIGURE_ENV= CPPFLAGS="-DHAVE_SYS_PARAM_H" PLIST_SUB= VERSION=${PORTVERSION} diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile index 77a5621711e4..f85cfe2bdead 100644 --- a/x11-themes/buffy/Makefile +++ b/x11-themes/buffy/Makefile @@ -12,15 +12,10 @@ MASTER_SITES= http://reality.sgi.com/offer/src/buffy/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - FETCH_BEFORE_ARGS= -b USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile index 65e56edb9943..e1d7b00547da 100644 --- a/x11-themes/clean-theme-gtk/Makefile +++ b/x11-themes/clean-theme-gtk/Makefile @@ -12,16 +12,11 @@ MASTER_SITES= http://progen.dynodns.net/dengen/cleantheme/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/gtk-clean-theme USE_X_PREFIX= yes USE_LIBTOOL= yes +USE_GTK= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile index 591d3fad87b5..448d973cfd9c 100644 --- a/x11-themes/colorstep/Makefile +++ b/x11-themes/colorstep/Makefile @@ -14,15 +14,10 @@ DISTNAME= ColorStep-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/${PORTNAME}-0.5 USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile index aa3293d2eea0..a44d6e701c8f 100644 --- a/x11-themes/engradient/Makefile +++ b/x11-themes/engradient/Makefile @@ -14,16 +14,11 @@ DISTNAME= EnGradient-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.1 USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile index 1c54bbbccc8a..39d49e0cb69a 100644 --- a/x11-themes/gnome-look/Makefile +++ b/x11-themes/gnome-look/Makefile @@ -13,14 +13,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile index fa55b76d6ccd..86c6bacfaddd 100644 --- a/x11-themes/gtk-Mac2-theme/Makefile +++ b/x11-themes/gtk-Mac2-theme/Makefile @@ -14,16 +14,11 @@ DISTNAME= Mac2-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile index 83c5ecc1320d..f8d46d24ab9c 100644 --- a/x11-themes/gtkbe/Makefile +++ b/x11-themes/gtkbe/Makefile @@ -14,16 +14,11 @@ DISTNAME= GTK-Be-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/GTKBeEngine USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile index 11c822e96bf3..131f431cb2f3 100644 --- a/x11-themes/gtkstep-pastel/Makefile +++ b/x11-themes/gtkstep-pastel/Makefile @@ -14,15 +14,10 @@ DISTNAME= ${PORTNAME}-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/${PORTNAME}-0.10.1 USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile index 8a8c69f5a4aa..7f2358477d35 100644 --- a/x11-themes/gtkstep/Makefile +++ b/x11-themes/gtkstep/Makefile @@ -12,13 +12,9 @@ MASTER_SITES= http://ulli.linuxave.net/gtkstep/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_BZIP2= yes USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/x11-themes/gtkstep/pkg-plist b/x11-themes/gtkstep/pkg-plist index 05941a6dad6d..813409b1de80 100644 --- a/x11-themes/gtkstep/pkg-plist +++ b/x11-themes/gtkstep/pkg-plist @@ -1,6 +1,6 @@ +lib/gtk/themes/engines/libstep.so share/themes/Step/ICON.png share/themes/Step/README.html share/themes/Step/gtk/gtkrc -lib/gtk/themes/engines/libstep.so @dirrm share/themes/Step/gtk @dirrm share/themes/Step diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile index cdd5b4c899e1..a440908a942f 100644 --- a/x11-themes/icegradient/Makefile +++ b/x11-themes/icegradient/Makefile @@ -15,16 +15,11 @@ DISTNAME= IceGradient-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.0.2 USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile index cec85d690e51..69dc7dcc49c7 100644 --- a/x11-themes/thinice/Makefile +++ b/x11-themes/thinice/Makefile @@ -13,13 +13,8 @@ DISTNAME= gtk-${PORTNAME}-theme-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile index a3e856502db7..f038f5a6c4e4 100644 --- a/x11-themes/xenophilia/Makefile +++ b/x11-themes/xenophilia/Makefile @@ -13,15 +13,8 @@ DISTNAME= Xenophilia-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes ALL_TARGET= # empty -pre-install: - @${MKDIR} ${PREFIX}/lib/gtk/themes/engines - .include <bsd.port.mk> diff --git a/x11-toolkits/buffy/Makefile b/x11-toolkits/buffy/Makefile index 77a5621711e4..f85cfe2bdead 100644 --- a/x11-toolkits/buffy/Makefile +++ b/x11-toolkits/buffy/Makefile @@ -12,15 +12,10 @@ MASTER_SITES= http://reality.sgi.com/offer/src/buffy/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - FETCH_BEFORE_ARGS= -b USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/clean-theme-gtk/Makefile b/x11-toolkits/clean-theme-gtk/Makefile index 65e56edb9943..e1d7b00547da 100644 --- a/x11-toolkits/clean-theme-gtk/Makefile +++ b/x11-toolkits/clean-theme-gtk/Makefile @@ -12,16 +12,11 @@ MASTER_SITES= http://progen.dynodns.net/dengen/cleantheme/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/gtk-clean-theme USE_X_PREFIX= yes USE_LIBTOOL= yes +USE_GTK= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/colorstep/Makefile b/x11-toolkits/colorstep/Makefile index 591d3fad87b5..448d973cfd9c 100644 --- a/x11-toolkits/colorstep/Makefile +++ b/x11-toolkits/colorstep/Makefile @@ -14,15 +14,10 @@ DISTNAME= ColorStep-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/${PORTNAME}-0.5 USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/engradient/Makefile b/x11-toolkits/engradient/Makefile index aa3293d2eea0..a44d6e701c8f 100644 --- a/x11-toolkits/engradient/Makefile +++ b/x11-toolkits/engradient/Makefile @@ -14,16 +14,11 @@ DISTNAME= EnGradient-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.1 USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/gnome-look/Makefile b/x11-toolkits/gnome-look/Makefile index 1c54bbbccc8a..39d49e0cb69a 100644 --- a/x11-toolkits/gnome-look/Makefile +++ b/x11-toolkits/gnome-look/Makefile @@ -13,14 +13,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile index 2218bf9af506..0269ec0c12a3 100644 --- a/x11-toolkits/gob/Makefile +++ b/x11-toolkits/gob/Makefile @@ -12,16 +12,10 @@ MASTER_SITES= http://ftp.5z.com/pub/gob/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gob.1 diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile index cf9293d5cf8a..4b0271f29a18 100644 --- a/x11-toolkits/gtk--/Makefile +++ b/x11-toolkits/gtk--/Makefile @@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - sigc.1:${PORTSDIR}/devel/libsigc++ +LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_NEWGCC= yes USE_GMAKE= yes +USE_GTK= yes USE_LIBTOOL= yes +LIBTOOLFLAGS= --disable-ltlibs --release-ignore INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: @${CAT} ${PKGDIR}/MESSAGE diff --git a/x11-toolkits/gtk--/pkg-plist b/x11-toolkits/gtk--/pkg-plist index e2b120fbcd59..26c307d9394e 100644 --- a/x11-toolkits/gtk--/pkg-plist +++ b/x11-toolkits/gtk--/pkg-plist @@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4 lib/gtkmm/proc/gtkmmproc lib/gtkmm/proc/list.m4 lib/gtkmm/proc/stage1.m4 -lib/libgdkmm.so -lib/libgdkmm-1.2.so.1 lib/libgdkmm.a -lib/libgtkmm.so -lib/libgtkmm-1.2.so.1 +lib/libgdkmm.so +lib/libgdkmm.so.1 lib/libgtkmm.a +lib/libgtkmm.so +lib/libgtkmm.so.1 share/aclocal/gtk--.m4 -@dirrm include/gdk-- -@dirrm include/gtk--/private -@dirrm include/gtk-- -@dirrm lib/gtkmm/include @dirrm lib/gtkmm/proc +@dirrm lib/gtkmm/include @dirrm lib/gtkmm +@dirrm include/gtk--/private +@dirrm include/gtk-- +@dirrm include/gdk-- diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile index cf9293d5cf8a..4b0271f29a18 100644 --- a/x11-toolkits/gtk--2/Makefile +++ b/x11-toolkits/gtk--2/Makefile @@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - sigc.1:${PORTSDIR}/devel/libsigc++ +LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_NEWGCC= yes USE_GMAKE= yes +USE_GTK= yes USE_LIBTOOL= yes +LIBTOOLFLAGS= --disable-ltlibs --release-ignore INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: @${CAT} ${PKGDIR}/MESSAGE diff --git a/x11-toolkits/gtk--2/pkg-plist b/x11-toolkits/gtk--2/pkg-plist index e2b120fbcd59..26c307d9394e 100644 --- a/x11-toolkits/gtk--2/pkg-plist +++ b/x11-toolkits/gtk--2/pkg-plist @@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4 lib/gtkmm/proc/gtkmmproc lib/gtkmm/proc/list.m4 lib/gtkmm/proc/stage1.m4 -lib/libgdkmm.so -lib/libgdkmm-1.2.so.1 lib/libgdkmm.a -lib/libgtkmm.so -lib/libgtkmm-1.2.so.1 +lib/libgdkmm.so +lib/libgdkmm.so.1 lib/libgtkmm.a +lib/libgtkmm.so +lib/libgtkmm.so.1 share/aclocal/gtk--.m4 -@dirrm include/gdk-- -@dirrm include/gtk--/private -@dirrm include/gtk-- -@dirrm lib/gtkmm/include @dirrm lib/gtkmm/proc +@dirrm lib/gtkmm/include @dirrm lib/gtkmm +@dirrm include/gtk--/private +@dirrm include/gtk-- +@dirrm include/gdk-- diff --git a/x11-toolkits/gtk-Mac2-theme/Makefile b/x11-toolkits/gtk-Mac2-theme/Makefile index fa55b76d6ccd..86c6bacfaddd 100644 --- a/x11-toolkits/gtk-Mac2-theme/Makefile +++ b/x11-toolkits/gtk-Mac2-theme/Makefile @@ -14,16 +14,11 @@ DISTNAME= Mac2-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/gtkbe/Makefile b/x11-toolkits/gtkbe/Makefile index 83c5ecc1320d..f8d46d24ab9c 100644 --- a/x11-toolkits/gtkbe/Makefile +++ b/x11-toolkits/gtkbe/Makefile @@ -14,16 +14,11 @@ DISTNAME= GTK-Be-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/GTKBeEngine USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/gtkextra--/Makefile b/x11-toolkits/gtkextra--/Makefile index 79940ed421a3..6392a02a048a 100644 --- a/x11-toolkits/gtkextra--/Makefile +++ b/x11-toolkits/gtkextra--/Makefile @@ -14,15 +14,13 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= gtkextra.10:${PORTSDIR}/x11-toolkits/gtkextra \ - gtkmm-1.2.1:${PORTSDIR}/x11-toolkits/gtk-- - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + gtkmm.1:${PORTSDIR}/x11-toolkits/gtk-- USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - PERL="${PERL}" +CONFIGURE_ENV= PERL="${PERL}" .include <bsd.port.mk> diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile index 0cb43f971db7..5faebcff90d3 100644 --- a/x11-toolkits/gtkextra/Makefile +++ b/x11-toolkits/gtkextra/Makefile @@ -13,15 +13,10 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile index 0cb43f971db7..5faebcff90d3 100644 --- a/x11-toolkits/gtkextra2/Makefile +++ b/x11-toolkits/gtkextra2/Makefile @@ -13,15 +13,10 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile index 3fb37b44e803..d2f9679ff0b9 100644 --- a/x11-toolkits/gtkglarea/Makefile +++ b/x11-toolkits/gtkglarea/Makefile @@ -12,14 +12,10 @@ MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/ MAINTAINER= jaeger16@yahoo.com -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_MESA= yes +USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" CONFIGURE_ARGS= --with-lib-GL .include <bsd.port.mk> diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile index 3fb37b44e803..d2f9679ff0b9 100644 --- a/x11-toolkits/gtkglarea2/Makefile +++ b/x11-toolkits/gtkglarea2/Makefile @@ -12,14 +12,10 @@ MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/ MAINTAINER= jaeger16@yahoo.com -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_MESA= yes +USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" CONFIGURE_ARGS= --with-lib-GL .include <bsd.port.mk> diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile index cf9293d5cf8a..4b0271f29a18 100644 --- a/x11-toolkits/gtkmm12/Makefile +++ b/x11-toolkits/gtkmm12/Makefile @@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - sigc.1:${PORTSDIR}/devel/libsigc++ +LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_NEWGCC= yes USE_GMAKE= yes +USE_GTK= yes USE_LIBTOOL= yes +LIBTOOLFLAGS= --disable-ltlibs --release-ignore INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: @${CAT} ${PKGDIR}/MESSAGE diff --git a/x11-toolkits/gtkmm12/pkg-plist b/x11-toolkits/gtkmm12/pkg-plist index e2b120fbcd59..26c307d9394e 100644 --- a/x11-toolkits/gtkmm12/pkg-plist +++ b/x11-toolkits/gtkmm12/pkg-plist @@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4 lib/gtkmm/proc/gtkmmproc lib/gtkmm/proc/list.m4 lib/gtkmm/proc/stage1.m4 -lib/libgdkmm.so -lib/libgdkmm-1.2.so.1 lib/libgdkmm.a -lib/libgtkmm.so -lib/libgtkmm-1.2.so.1 +lib/libgdkmm.so +lib/libgdkmm.so.1 lib/libgtkmm.a +lib/libgtkmm.so +lib/libgtkmm.so.1 share/aclocal/gtk--.m4 -@dirrm include/gdk-- -@dirrm include/gtk--/private -@dirrm include/gtk-- -@dirrm lib/gtkmm/include @dirrm lib/gtkmm/proc +@dirrm lib/gtkmm/include @dirrm lib/gtkmm +@dirrm include/gtk--/private +@dirrm include/gtk-- +@dirrm include/gdk-- diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile index cf9293d5cf8a..4b0271f29a18 100644 --- a/x11-toolkits/gtkmm20/Makefile +++ b/x11-toolkits/gtkmm20/Makefile @@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - sigc.1:${PORTSDIR}/devel/libsigc++ +LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_NEWGCC= yes USE_GMAKE= yes +USE_GTK= yes USE_LIBTOOL= yes +LIBTOOLFLAGS= --disable-ltlibs --release-ignore INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: @${CAT} ${PKGDIR}/MESSAGE diff --git a/x11-toolkits/gtkmm20/pkg-plist b/x11-toolkits/gtkmm20/pkg-plist index e2b120fbcd59..26c307d9394e 100644 --- a/x11-toolkits/gtkmm20/pkg-plist +++ b/x11-toolkits/gtkmm20/pkg-plist @@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4 lib/gtkmm/proc/gtkmmproc lib/gtkmm/proc/list.m4 lib/gtkmm/proc/stage1.m4 -lib/libgdkmm.so -lib/libgdkmm-1.2.so.1 lib/libgdkmm.a -lib/libgtkmm.so -lib/libgtkmm-1.2.so.1 +lib/libgdkmm.so +lib/libgdkmm.so.1 lib/libgtkmm.a +lib/libgtkmm.so +lib/libgtkmm.so.1 share/aclocal/gtk--.m4 -@dirrm include/gdk-- -@dirrm include/gtk--/private -@dirrm include/gtk-- -@dirrm lib/gtkmm/include @dirrm lib/gtkmm/proc +@dirrm lib/gtkmm/include @dirrm lib/gtkmm +@dirrm include/gtk--/private +@dirrm include/gtk-- +@dirrm include/gdk-- diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index cf9293d5cf8a..4b0271f29a18 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - sigc.1:${PORTSDIR}/devel/libsigc++ +LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_NEWGCC= yes USE_GMAKE= yes +USE_GTK= yes USE_LIBTOOL= yes +LIBTOOLFLAGS= --disable-ltlibs --release-ignore INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: @${CAT} ${PKGDIR}/MESSAGE diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist index e2b120fbcd59..26c307d9394e 100644 --- a/x11-toolkits/gtkmm24/pkg-plist +++ b/x11-toolkits/gtkmm24/pkg-plist @@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4 lib/gtkmm/proc/gtkmmproc lib/gtkmm/proc/list.m4 lib/gtkmm/proc/stage1.m4 -lib/libgdkmm.so -lib/libgdkmm-1.2.so.1 lib/libgdkmm.a -lib/libgtkmm.so -lib/libgtkmm-1.2.so.1 +lib/libgdkmm.so +lib/libgdkmm.so.1 lib/libgtkmm.a +lib/libgtkmm.so +lib/libgtkmm.so.1 share/aclocal/gtk--.m4 -@dirrm include/gdk-- -@dirrm include/gtk--/private -@dirrm include/gtk-- -@dirrm lib/gtkmm/include @dirrm lib/gtkmm/proc +@dirrm lib/gtkmm/include @dirrm lib/gtkmm +@dirrm include/gtk--/private +@dirrm include/gtk-- +@dirrm include/gdk-- diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index cf9293d5cf8a..4b0271f29a18 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - sigc.1:${PORTSDIR}/devel/libsigc++ +LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_NEWGCC= yes USE_GMAKE= yes +USE_GTK= yes USE_LIBTOOL= yes +LIBTOOLFLAGS= --disable-ltlibs --release-ignore INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: @${CAT} ${PKGDIR}/MESSAGE diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist index e2b120fbcd59..26c307d9394e 100644 --- a/x11-toolkits/gtkmm30/pkg-plist +++ b/x11-toolkits/gtkmm30/pkg-plist @@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4 lib/gtkmm/proc/gtkmmproc lib/gtkmm/proc/list.m4 lib/gtkmm/proc/stage1.m4 -lib/libgdkmm.so -lib/libgdkmm-1.2.so.1 lib/libgdkmm.a -lib/libgtkmm.so -lib/libgtkmm-1.2.so.1 +lib/libgdkmm.so +lib/libgdkmm.so.1 lib/libgtkmm.a +lib/libgtkmm.so +lib/libgtkmm.so.1 share/aclocal/gtk--.m4 -@dirrm include/gdk-- -@dirrm include/gtk--/private -@dirrm include/gtk-- -@dirrm lib/gtkmm/include @dirrm lib/gtkmm/proc +@dirrm lib/gtkmm/include @dirrm lib/gtkmm +@dirrm include/gtk--/private +@dirrm include/gtk-- +@dirrm include/gdk-- diff --git a/x11-toolkits/gtkstep-pastel/Makefile b/x11-toolkits/gtkstep-pastel/Makefile index 11c822e96bf3..131f431cb2f3 100644 --- a/x11-toolkits/gtkstep-pastel/Makefile +++ b/x11-toolkits/gtkstep-pastel/Makefile @@ -14,15 +14,10 @@ DISTNAME= ${PORTNAME}-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/${PORTNAME}-0.10.1 USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/gtkstep/Makefile b/x11-toolkits/gtkstep/Makefile index 8a8c69f5a4aa..7f2358477d35 100644 --- a/x11-toolkits/gtkstep/Makefile +++ b/x11-toolkits/gtkstep/Makefile @@ -12,13 +12,9 @@ MASTER_SITES= http://ulli.linuxave.net/gtkstep/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_BZIP2= yes USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/x11-toolkits/gtkstep/pkg-plist b/x11-toolkits/gtkstep/pkg-plist index 05941a6dad6d..813409b1de80 100644 --- a/x11-toolkits/gtkstep/pkg-plist +++ b/x11-toolkits/gtkstep/pkg-plist @@ -1,6 +1,6 @@ +lib/gtk/themes/engines/libstep.so share/themes/Step/ICON.png share/themes/Step/README.html share/themes/Step/gtk/gtkrc -lib/gtk/themes/engines/libstep.so @dirrm share/themes/Step/gtk @dirrm share/themes/Step diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile index c079948c1266..574d50add2cf 100644 --- a/x11-toolkits/guile-gnome/Makefile +++ b/x11-toolkits/guile-gnome/Makefile @@ -14,20 +14,15 @@ DISTNAME= gnome-guile-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - guile.9:${PORTSDIR}/lang/guile \ +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \ guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk \ glade.4:${PORTSDIR}/devel/libglade -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_LIBTOOL= yes +USE_GTK= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --without-bonobo --without-gtkhtml --with-libglade CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11-toolkits/guile-gnome/files/patch-ad b/x11-toolkits/guile-gnome/files/patch-ad new file mode 100644 index 000000000000..7b9b2527dd24 --- /dev/null +++ b/x11-toolkits/guile-gnome/files/patch-ad @@ -0,0 +1,11 @@ +--- guile-gnome/libglade/Makefile.in.orig Mon Oct 2 01:09:47 2000 ++++ guile-gnome/libglade/Makefile.in Mon Oct 2 01:11:08 2000 +@@ -97,7 +97,7 @@ + INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk -I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR) + + +-GLADE_LIBS = -lglade -lglade-gnome -lglade-bonobo ++GLADE_LIBS = `libglade-config --libs gnome` + + lib_LTLIBRARIES = libguileglade.la + libguileglade_la_SOURCES = libglade-glue.c diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile index 06596397b3b5..19d59813a88b 100644 --- a/x11-toolkits/guile-gtk/Makefile +++ b/x11-toolkits/guile-gtk/Makefile @@ -13,17 +13,12 @@ MASTER_SITE_SUBDIR= unstable/sources/gnome-guile MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - guile.9:${PORTSDIR}/lang/guile - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile +USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11-toolkits/icegradient/Makefile b/x11-toolkits/icegradient/Makefile index cdd5b4c899e1..a440908a942f 100644 --- a/x11-toolkits/icegradient/Makefile +++ b/x11-toolkits/icegradient/Makefile @@ -15,16 +15,11 @@ DISTNAME= IceGradient-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.0.2 USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes USE_GMAKE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/pike-gtk/Makefile b/x11-toolkits/pike-gtk/Makefile index 91e649477fab..6d8b3af890c5 100644 --- a/x11-toolkits/pike-gtk/Makefile +++ b/x11-toolkits/pike-gtk/Makefile @@ -14,15 +14,9 @@ DISTNAME= pigtk_${PORTVERSION} MAINTAINER= ijliao@csie.nctu.edu.tw BUILD_DEPENDS= pike:${PORTSDIR}/lang/pike -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_XLIB= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config - -# To delete "-Wl,-E" from options for ld. -# (The options are created by gtk12-config.) -post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/patch-Makefile .include <bsd.port.mk> diff --git a/x11-toolkits/pike-gtk/files/patch-aa b/x11-toolkits/pike-gtk/files/patch-aa new file mode 100644 index 000000000000..e53c7470b1b9 --- /dev/null +++ b/x11-toolkits/pike-gtk/files/patch-aa @@ -0,0 +1,11 @@ +--- configure.orig Thu Nov 18 01:52:35 1999 ++++ configure Thu Nov 18 01:53:02 1999 +@@ -3198,7 +3198,7 @@ + next) LDSHARED="$CC $CFLAGS -nostdlib -r";; + Linux*) LDSHARED="$CC -shared";; + GNU*) LDSHARED="ld -Bshareable";; +- FreeBSD*) LDSHARED="ld -Bshareable";; ++ FreeBSD*) LDSHARED="$CC -shared";; + NetBSD) LDSHARED="ld -Bshareable";; + OpenBSD*) LDSHARED="ld -Bshareable";; + BSD/OS*) LDSHARED="shlicc -r";; diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile index 87fadb373c49..9e8a136742b9 100644 --- a/x11-toolkits/py-wxPython/Makefile +++ b/x11-toolkits/py-wxPython/Makefile @@ -18,9 +18,10 @@ LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_PYTHON= YES -USE_GMAKE= YES -USE_NEWGCC= YES +USE_GMAKE= yes +USE_NEWGCC= yes +USE_PYTHON= yes +USE_GTK= yes MAKE_ENV= "LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}" ALL_TARGET= default INSTALL_TARGET= install-freebsd @@ -30,8 +31,8 @@ TARGETDIR= ${PYTHON_SITELIBDIR}/wxPython HELPERLIBDIR= ${PREFIX}/lib do-configure: - ${SED} -e "s:%CFLAGS%:${CFLAGS} `gtk12-config --cflags`:" \ - -e "s:%LFLAGS%:`gtk12-config --libs` -L${WRKSRC}:" \ + ${SED} -e "s:%CFLAGS%:${CFLAGS} `${GTK_CONFIG} --cflags`:" \ + -e "s:%LFLAGS%:`${GTK_CONFIG} --libs` -L${WRKSRC}:" \ -e "s:%TARGETDIR%:${TARGETDIR}:" \ -e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:" \ -e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:" \ diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile index 87fadb373c49..9e8a136742b9 100644 --- a/x11-toolkits/py-wxPython24/Makefile +++ b/x11-toolkits/py-wxPython24/Makefile @@ -18,9 +18,10 @@ LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_PYTHON= YES -USE_GMAKE= YES -USE_NEWGCC= YES +USE_GMAKE= yes +USE_NEWGCC= yes +USE_PYTHON= yes +USE_GTK= yes MAKE_ENV= "LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}" ALL_TARGET= default INSTALL_TARGET= install-freebsd @@ -30,8 +31,8 @@ TARGETDIR= ${PYTHON_SITELIBDIR}/wxPython HELPERLIBDIR= ${PREFIX}/lib do-configure: - ${SED} -e "s:%CFLAGS%:${CFLAGS} `gtk12-config --cflags`:" \ - -e "s:%LFLAGS%:`gtk12-config --libs` -L${WRKSRC}:" \ + ${SED} -e "s:%CFLAGS%:${CFLAGS} `${GTK_CONFIG} --cflags`:" \ + -e "s:%LFLAGS%:`${GTK_CONFIG} --libs` -L${WRKSRC}:" \ -e "s:%TARGETDIR%:${TARGETDIR}:" \ -e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:" \ -e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:" \ diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile index 87fadb373c49..9e8a136742b9 100644 --- a/x11-toolkits/py-wxPython26/Makefile +++ b/x11-toolkits/py-wxPython26/Makefile @@ -18,9 +18,10 @@ LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_PYTHON= YES -USE_GMAKE= YES -USE_NEWGCC= YES +USE_GMAKE= yes +USE_NEWGCC= yes +USE_PYTHON= yes +USE_GTK= yes MAKE_ENV= "LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}" ALL_TARGET= default INSTALL_TARGET= install-freebsd @@ -30,8 +31,8 @@ TARGETDIR= ${PYTHON_SITELIBDIR}/wxPython HELPERLIBDIR= ${PREFIX}/lib do-configure: - ${SED} -e "s:%CFLAGS%:${CFLAGS} `gtk12-config --cflags`:" \ - -e "s:%LFLAGS%:`gtk12-config --libs` -L${WRKSRC}:" \ + ${SED} -e "s:%CFLAGS%:${CFLAGS} `${GTK_CONFIG} --cflags`:" \ + -e "s:%LFLAGS%:`${GTK_CONFIG} --libs` -L${WRKSRC}:" \ -e "s:%TARGETDIR%:${TARGETDIR}:" \ -e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:" \ -e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:" \ diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile index 87fadb373c49..9e8a136742b9 100644 --- a/x11-toolkits/py-wxPython28/Makefile +++ b/x11-toolkits/py-wxPython28/Makefile @@ -18,9 +18,10 @@ LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_PYTHON= YES -USE_GMAKE= YES -USE_NEWGCC= YES +USE_GMAKE= yes +USE_NEWGCC= yes +USE_PYTHON= yes +USE_GTK= yes MAKE_ENV= "LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}" ALL_TARGET= default INSTALL_TARGET= install-freebsd @@ -30,8 +31,8 @@ TARGETDIR= ${PYTHON_SITELIBDIR}/wxPython HELPERLIBDIR= ${PREFIX}/lib do-configure: - ${SED} -e "s:%CFLAGS%:${CFLAGS} `gtk12-config --cflags`:" \ - -e "s:%LFLAGS%:`gtk12-config --libs` -L${WRKSRC}:" \ + ${SED} -e "s:%CFLAGS%:${CFLAGS} `${GTK_CONFIG} --cflags`:" \ + -e "s:%LFLAGS%:`${GTK_CONFIG} --libs` -L${WRKSRC}:" \ -e "s:%TARGETDIR%:${TARGETDIR}:" \ -e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:" \ -e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:" \ diff --git a/x11-toolkits/thinice/Makefile b/x11-toolkits/thinice/Makefile index cec85d690e51..69dc7dcc49c7 100644 --- a/x11-toolkits/thinice/Makefile +++ b/x11-toolkits/thinice/Makefile @@ -13,13 +13,8 @@ DISTNAME= gtk-${PORTNAME}-theme-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - .include <bsd.port.mk> diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile index 392619d943b5..adc0bd76859d 100644 --- a/x11-toolkits/wxgtk-devel/Makefile +++ b/x11-toolkits/wxgtk-devel/Makefile @@ -13,30 +13,32 @@ DISTNAME= wxGTK-${PORTVERSION} MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - png.4:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/wxGTK -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_NEWGCC= yes USE_GMAKE= yes +USE_GTK= yes USE_AUTOCONF= yes +INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=sys -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -INSTALLS_SHLIB= yes + AUTOCONF= autoconf && \ ${PERL} -pi -e 's|-l\$$THREADS_LIB|-pthread|g ; \ s|-l\$$THREADS_LINK|-pthread|g' \ ${WRKSRC}/configure +post-install: + @${RM} -rf ${PREFIX}/include/wx/motif + @${RM} -rf ${PREFIX}/include/wx/msw + .include <bsd.port.mk> diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile index 392619d943b5..adc0bd76859d 100644 --- a/x11-toolkits/wxgtk/Makefile +++ b/x11-toolkits/wxgtk/Makefile @@ -13,30 +13,32 @@ DISTNAME= wxGTK-${PORTVERSION} MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - png.4:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/wxGTK -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_NEWGCC= yes USE_GMAKE= yes +USE_GTK= yes USE_AUTOCONF= yes +INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=sys -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -INSTALLS_SHLIB= yes + AUTOCONF= autoconf && \ ${PERL} -pi -e 's|-l\$$THREADS_LIB|-pthread|g ; \ s|-l\$$THREADS_LINK|-pthread|g' \ ${WRKSRC}/configure +post-install: + @${RM} -rf ${PREFIX}/include/wx/motif + @${RM} -rf ${PREFIX}/include/wx/msw + .include <bsd.port.mk> diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index 392619d943b5..adc0bd76859d 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -13,30 +13,32 @@ DISTNAME= wxGTK-${PORTVERSION} MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - png.4:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/wxGTK -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_NEWGCC= yes USE_GMAKE= yes +USE_GTK= yes USE_AUTOCONF= yes +INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=sys -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -INSTALLS_SHLIB= yes + AUTOCONF= autoconf && \ ${PERL} -pi -e 's|-l\$$THREADS_LIB|-pthread|g ; \ s|-l\$$THREADS_LINK|-pthread|g' \ ${WRKSRC}/configure +post-install: + @${RM} -rf ${PREFIX}/include/wx/motif + @${RM} -rf ${PREFIX}/include/wx/msw + .include <bsd.port.mk> diff --git a/x11-toolkits/xenophilia/Makefile b/x11-toolkits/xenophilia/Makefile index a3e856502db7..f038f5a6c4e4 100644 --- a/x11-toolkits/xenophilia/Makefile +++ b/x11-toolkits/xenophilia/Makefile @@ -13,15 +13,8 @@ DISTNAME= Xenophilia-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes ALL_TARGET= # empty -pre-install: - @${MKDIR} ${PREFIX}/lib/gtk/themes/engines - .include <bsd.port.mk> diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile index 3bd46adbcb5b..b96605d6bf95 100644 --- a/x11-wm/amaterus/Makefile +++ b/x11-wm/amaterus/Makefile @@ -12,15 +12,12 @@ MASTER_SITES= http://www.taiyaki.org/src/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - xml.5:${PORTSDIR}/textproc/libxml - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11-wm/spager/Makefile b/x11-wm/spager/Makefile index 826605459cd7..7d327fdececc 100644 --- a/x11-wm/spager/Makefile +++ b/x11-wm/spager/Makefile @@ -13,26 +13,24 @@ MASTER_SITES= http://www.stanford.edu/~satyakid/ MAINTAINER= nakai@FreeBSD.org RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes + ALL_TARGET= spager post-extract: - ${RM} -f ${WRKSRC}/spager + ${RM} -f ${WRKSRC}/spager post-patch: - ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.rc + ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.rc do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/spager ${PREFIX}/bin/ - ${MKDIR} ${PREFIX}/share/spager - ${INSTALL_SCRIPT} ${WRKSRC}/spager.jl ${PREFIX}/share/spager - ${INSTALL_SCRIPT} ${WRKSRC}/x-message.jl ${PREFIX}/share/spager - ${INSTALL_DATA} ${WRKSRC}/sample.rc ${PREFIX}/share/spager - @${CAT} ${PKGMESSAGE} + ${INSTALL_PROGRAM} ${WRKSRC}/spager ${PREFIX}/bin/ + ${MKDIR} ${PREFIX}/share/spager + ${INSTALL_SCRIPT} ${WRKSRC}/spager.jl ${PREFIX}/share/spager + ${INSTALL_SCRIPT} ${WRKSRC}/x-message.jl ${PREFIX}/share/spager + ${INSTALL_DATA} ${WRKSRC}/sample.rc ${PREFIX}/share/spager + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-wm/wmthemeinstall/Makefile b/x11-wm/wmthemeinstall/Makefile index 6628c6bff2dd..0c3c915fb896 100644 --- a/x11-wm/wmthemeinstall/Makefile +++ b/x11-wm/wmthemeinstall/Makefile @@ -14,24 +14,23 @@ MASTER_SITE_SUBDIR= will MAINTAINER= ports@FreeBSD.org RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" DOCS_DIR= ${PREFIX}/share/wmthemeinstall pre-build: @${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/wmOptions.c do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/wmthemeinstall ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/wmthemeinstall ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${DOCS_DIR} - @${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCS_DIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCS_DIR} - @${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCS_DIR} + ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCS_DIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCS_DIR} + ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCS_DIR} @${ECHO} @${ECHO} "Documentation was installed in ${DOCS_DIR}." @${ECHO} diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile index bc8018a2b9f2..493d786727a8 100644 --- a/x11/gmessage/Makefile +++ b/x11/gmessage/Makefile @@ -12,11 +12,7 @@ MASTER_SITES= http://www.math.uni-goettingen.de/dadler/gmessage/ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes .include <bsd.port.mk> diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile index 626c3fdf5931..2a17716a69d4 100644 --- a/x11/gtk-theme-switch/Makefile +++ b/x11/gtk-theme-switch/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= http://www.muhri.net/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk USE_X_PREFIX= yes +USE_GTK= yes .if !defined(NOPORTDOCS) post-install: diff --git a/x11/gtk-theme-switch/files/patch-aa b/x11/gtk-theme-switch/files/patch-aa index e553cc87cf86..43ec8b03adef 100644 --- a/x11/gtk-theme-switch/files/patch-aa +++ b/x11/gtk-theme-switch/files/patch-aa @@ -7,8 +7,8 @@ -LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm +GCC = ${CC} +PREFIX?=/usr/local -+CFLAGS += `${X11BASE}/bin/gtk12-config --cflags` -+LIBS = `${X11BASE}/bin/gtk12-config --libs` ++CFLAGS += `${GTK_CONFIG} --cflags` ++LIBS = `${GTK_CONFIG} --libs` VERSION = 0.4 all : gthemeswitch diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile index 626c3fdf5931..2a17716a69d4 100644 --- a/x11/gtk-theme-switch2/Makefile +++ b/x11/gtk-theme-switch2/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= http://www.muhri.net/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk USE_X_PREFIX= yes +USE_GTK= yes .if !defined(NOPORTDOCS) post-install: diff --git a/x11/gtk-theme-switch2/files/patch-aa b/x11/gtk-theme-switch2/files/patch-aa index e553cc87cf86..43ec8b03adef 100644 --- a/x11/gtk-theme-switch2/files/patch-aa +++ b/x11/gtk-theme-switch2/files/patch-aa @@ -7,8 +7,8 @@ -LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm +GCC = ${CC} +PREFIX?=/usr/local -+CFLAGS += `${X11BASE}/bin/gtk12-config --cflags` -+LIBS = `${X11BASE}/bin/gtk12-config --libs` ++CFLAGS += `${GTK_CONFIG} --cflags` ++LIBS = `${GTK_CONFIG} --libs` VERSION = 0.4 all : gthemeswitch diff --git a/x11/gyroscope/Makefile b/x11/gyroscope/Makefile index e7326500c1e7..9c9a3d849a6b 100644 --- a/x11/gyroscope/Makefile +++ b/x11/gyroscope/Makefile @@ -12,14 +12,11 @@ MASTER_SITES= http://soupnazi.org/FreeBSD/ports/distfiles/ MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes + ALL_TARGET= # empty .include <bsd.port.mk> diff --git a/x11/gyroscope/files/patch-aa b/x11/gyroscope/files/patch-aa index 82cb04fefa7c..c012ee216243 100644 --- a/x11/gyroscope/files/patch-aa +++ b/x11/gyroscope/files/patch-aa @@ -28,4 +28,4 @@ install: - cp ./$(BINARYNAME) $(BIN_DIR)$(BINARYNAME) -+ @/usr/bin/install -c -o 0 -g 0 -s -m 1755 ${BINARYNAME} ${BIN_DIR}/${BINARYNAME} ++ ${BSD_INSTALL_PROGRAM} ${BINARYNAME} ${BIN_DIR}/${BINARYNAME} |