diff options
| author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 06:36:23 +0000 |
|---|---|---|
| committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 06:36:23 +0000 |
| commit | fda2e985daa21bcac7cf4e4882e560933d7ad5e8 (patch) | |
| tree | 4ccb4a868e97ff347416395233e3825776b24951 | |
| parent | d0cdca8bc326260560504ebb5d4b206942ca5125 (diff) | |
| download | ports-fda2e985daa21bcac7cf4e4882e560933d7ad5e8.tar.gz ports-fda2e985daa21bcac7cf4e4882e560933d7ad5e8.zip | |
Notes
78 files changed, 338 insertions, 458 deletions
diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile index 9dbea410fce5..b4bdd13fb6b7 100644 --- a/audio/autozen/Makefile +++ b/audio/autozen/Makefile @@ -13,12 +13,10 @@ DISTNAME= AutoZen-${PORTVERSION} MAINTAINER= trevor@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +WRKSRC= ${WRKDIR}/${PORTNAME}-1.2 USE_X_PREFIX= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -MAKE_ENV= GTK_CONFIG=${GTK_CONFIG} -WRKSRC= ${WRKDIR}/${PORTNAME}-1.2 +USE_GTK= yes DOC_FILES= CHANGES COPYING DATA_FILES= deep-relax.seq relax.seq test.seq test2.seq test3.seq @@ -39,4 +37,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/autozen .endfor .endif + .include <bsd.port.mk> diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile index d7965260b457..ed44e1023249 100644 --- a/audio/gdcd/Makefile +++ b/audio/gdcd/Makefile @@ -15,17 +15,12 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= cdaudio.1:${PORTSDIR}/audio/libcdaudio \ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -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" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-glibtest --disable-gtktest pre-configure: @cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile index 60ea5c32c97c..ffea2e4c3282 100644 --- a/audio/gmixer/Makefile +++ b/audio/gmixer/Makefile @@ -13,13 +13,10 @@ MASTER_SITE_SUBDIR= cpiazza MAINTAINER= cpiazza@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" ALL_TARGET= gmixer +USE_GTK= yes + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gmixer ${PREFIX}/bin @${MKDIR} ${PREFIX}/share/pixmaps diff --git a/audio/grip/Makefile b/audio/grip/Makefile index dc40d8751134..cd6e9862c180 100644 --- a/audio/grip/Makefile +++ b/audio/grip/Makefile @@ -13,12 +13,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes + ALL_TARGET= gripnopar gcd MAN1= grip.1 diff --git a/audio/replay/Makefile b/audio/replay/Makefile index 90d051c9ba50..830743bd94b6 100644 --- a/audio/replay/Makefile +++ b/audio/replay/Makefile @@ -15,15 +15,11 @@ DISTNAME= ${PORTNAME}-source-dgtk_${PORTVERSION} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - esd.2:${PORTSDIR}/audio/esound - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GTK= yes +USE_ESOUND= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .if defined(WITH_I18N) diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile index f23b86b5d286..cc728fa2e3ee 100644 --- a/audio/timidity++-emacs/Makefile +++ b/audio/timidity++-emacs/Makefile @@ -38,16 +38,14 @@ PKGMESSAGE= ${PKGDIR}/MESSAGE PLIST_SUB= TIMID_LIBDIR=${TIMID_LIBDIR} DIST_SUBDIR= timidity -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - TIMID_LIBDIR= ${PREFIX}/lib/timidity .if ${INTERFACE} == "emacs" ELISPDIR= ${PREFIX}/share/emacs/site-lisp .elif ${INTERFACE} == "gtk" LINK= gtkmidi -INTERFACE_DEPS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} SHLD="gcc -shared" +USE_GTK= yes +CONFIGURE_ENV= SHLD="gcc -shared" .elif ${INTERFACE} == "motif" LINK= xmmidi REQUIRES_MOTIF= yes diff --git a/audio/vorbis/Makefile b/audio/vorbis/Makefile index 779decd0377c..69e13923b0e1 100644 --- a/audio/vorbis/Makefile +++ b/audio/vorbis/Makefile @@ -14,21 +14,21 @@ MAINTAINER= t.vanklaveren@student.utwente.nl LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ xmms.1:${PORTSDIR}/audio/xmms -RUN_DEPENDS= ${X11BASE}/bin/xmms:${PORTSDIR}/audio/xmms -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +WRKSRC= ${WRKDIR}/${PORTNAME} # Vorbis doesn't depend on X, but it's needed for the XMMS plugin :-( USE_X_PREFIX= yes +USE_GTK= yes USE_AUTOCONF= yes -GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/vorbis + +MAN1= ogg123.1 vorbize.1 oggenc.1 post-build: cd ${WRKSRC}/vorbis-tools/libao && ${SETENV} ${MAKE_ENV} ${MAKE} cd ${WRKSRC}/vorbis-tools && ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET} - cd ${WRKSRC}/xmms && ${SETENV} ${MAKE_ENV} ${MAKE} GLIB_CONFIG=${GLIB_CONFIG} GTK_CONFIG=${GTK_CONFIG} target + cd ${WRKSRC}/xmms && ${SETENV} ${MAKE_ENV} ${MAKE} target + do-install: # Install all vorbis libraries and headers by hand. There is no target for it. ${INSTALL_PROGRAM} ${WRKSRC}/lib/libvorbis.a ${PREFIX}/lib/ @@ -49,6 +49,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/include/vorbis/*.h ${PREFIX}/include/vorbis/ ${INSTALL_DATA} ${WRKSRC}/include/vorbis/book/*.vqh ${PREFIX}/include/vorbis/book/ -MAN1= ogg123.1 vorbize.1 oggenc.1 - .include <bsd.port.mk> diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile index 12da908271e7..153c3b3cea89 100644 --- a/audio/xmixer/Makefile +++ b/audio/xmixer/Makefile @@ -13,16 +13,11 @@ MASTER_SITE_SUBDIR= apps/sound/mixers MAINTAINER= trevor@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes +USE_GTK= yes USE_AUTOCONF= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN1= xmixer.1 diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile index 812ec5edf0b6..830466e97dad 100644 --- a/audio/xmms-liveice/Makefile +++ b/audio/xmms-liveice/Makefile @@ -14,15 +14,12 @@ DISTNAME= liveice-xmms MAINTAINER= esk@ira.uka.de LIB_DEPENDS= xmms.1:${PORTSDIR}/audio/xmms -RUN_DEPENDS= ${LOCALBASE}/bin/lame:${PORTSDIR}/audio/lame +RUN_DEPENDS= lame:${PORTSDIR}/audio/lame WRKSRC= ${WRKDIR}/LiveIce-1.0.0 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/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile index e446bada6a45..f605749ebb5e 100644 --- a/audio/xmms-tfmx/Makefile +++ b/audio/xmms-tfmx/Makefile @@ -15,11 +15,9 @@ MAINTAINER= anders@fix.no LIB_DEPENDS= xmms.1:${PORTSDIR}/audio/xmms -USE_LIBTOOL= yes +USE_X_PREFIX= yes USE_GMAKE= yes - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes +USE_LIBTOOL= yes .include <bsd.port.mk> diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile index 131cbfa6a33a..2a9540aec05a 100644 --- a/biology/gperiodic/Makefile +++ b/biology/gperiodic/Makefile @@ -12,25 +12,23 @@ MASTER_SITES= ftp://ftp.seul.org/pub/gperiodic/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -USE_GMAKE= yes WRKSRC= ${WRKDIR}/gperiodic -MAN1= gperiodic.1 - USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +MAN1= gperiodic.1 post-install: - @ ${INSTALL_MAN} ${WRKSRC}/man/gperiodic.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/gperiodic.1 ${PREFIX}/man/man1 .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/gperiodic + @${MKDIR} ${PREFIX}/share/doc/gperiodic .for file in AUTHORS COPYING Changes README - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gperiodic + ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gperiodic .endfor .endif diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile index 10eee7611305..3b27381ba7d0 100644 --- a/biology/xmolwt/Makefile +++ b/biology/xmolwt/Makefile @@ -11,15 +11,11 @@ MASTER_SITES= http://www.st.hirosaki-u.ac.jp/~rmiya/xmolwt/ MAINTAINER= rmiya@cc.hirosaki-u.ac.jp -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - WRKSRC= ${WRKDIR}/${DISTNAME} +MAKEFILE= Makefile.gtk USE_GMAKE= yes -MAKEFILE= Makefile.gtk -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gmolwt ${PREFIX}/bin diff --git a/biology/xmolwt/files/patch-aa b/biology/xmolwt/files/patch-aa index 5c212be43bf7..3fb0ba1392eb 100644 --- a/biology/xmolwt/files/patch-aa +++ b/biology/xmolwt/files/patch-aa @@ -1,21 +1,15 @@ -*** Makefile.gtk.orig Sat Aug 28 19:46:47 1999 ---- Makefile.gtk Sat Jul 1 15:49:31 2000 -*************** -*** 1,7 **** -! CC = gcc -! CFLAGS = -DGTK -! GTKCONFIG = gtk12-config - OBJS = molwt.o usage.o element.o reduce.o count.o calculate.o initwidget.o allowcase.o inputformula.o addtolist.o - - molwt: gmolwt - ln -s gmolwt molwt ---- 1,9 ---- -! CC ?= gcc -! CFLAGS += -DGTK -! GTKCONFIG = $(GTK_CONFIG) - OBJS = molwt.o usage.o element.o reduce.o count.o calculate.o initwidget.o allowcase.o inputformula.o addtolist.o -+ -+ all: gmolwt - - molwt: gmolwt - ln -s gmolwt molwt +--- Makefile.gtk.orig Sat Aug 28 03:46:47 1999 ++++ Makefile.gtk Sun Sep 24 00:20:45 2000 +@@ -1,7 +1,9 @@ +-CC = gcc +-CFLAGS = -DGTK +-GTKCONFIG = gtk12-config ++CC ?= gcc ++CFLAGS += -DGTK ++GTKCONFIG = $(GTK_CONFIG) + OBJS = molwt.o usage.o element.o reduce.o count.o calculate.o initwidget.o allowcase.o inputformula.o addtolist.o ++ ++all: gmolwt + + molwt: gmolwt + ln -s gmolwt molwt diff --git a/cad/geda/Makefile b/cad/geda/Makefile index d8fd3259380d..a075b3ccb2fb 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -15,12 +15,10 @@ DISTNAME= gEDA-19990516 MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - guile.9:${PORTSDIR}/lang/guile - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG} diff --git a/databases/dbmetrix/Makefile b/databases/dbmetrix/Makefile index 342831345df4..5979c1a9fbcc 100644 --- a/databases/dbmetrix/Makefile +++ b/databases/dbmetrix/Makefile @@ -13,16 +13,13 @@ MASTER_SITES= ftp://ftp.tamos.net/pub/dbMetrix/ \ MAINTAINER= joseph@randomnetworks.com -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - mysqlclient.6:${PORTSDIR}/databases/mysql322-client +LIB_DEPENDS= mysqlclient.6:${PORTSDIR}/databases/mysql322-client WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-mysql=${PREFIX} --prefix=${PREFIX} -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} +CONFIGURE_ARGS= --with-mysql=${PREFIX} pre-configure: @${PERL} -pi -e "s.gtk-config.${GTK_CONFIG}.g" ${WRKSRC}/Makefile.in diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile index 536907e61d53..29912d07154d 100644 --- a/databases/gmysql/Makefile +++ b/databases/gmysql/Makefile @@ -13,13 +13,10 @@ MASTER_SITES= http://www.loth.demon.co.uk/gmysql/ \ MAINTAINER= dirk@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - mysqlclient.6:${PORTSDIR}/databases/mysql322-client - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= mysqlclient.6:${PORTSDIR}/databases/mysql322-client +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mysql=${PREFIX} -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} .include <bsd.port.mk> diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index 5f5e139bdbec..1141a437c9a7 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -12,49 +12,51 @@ MASTER_SITES= http://www.multimania.com/bbrox/GtkSQL/ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - .if defined(PACKAGE_BUILDING) && !defined(WITH_MYSQL) && !defined(WITH_PGSQL) WITH_MYSQL= yes .endif -.if defined(WITH_MYSQL) -LIB_DEPENDS += mysqlclient.6:${PORTSDIR}/databases/mysql322-client -.endif -.if defined(WITH_PGSQL) -LIB_DEPENDS += pq.2:${PORTSDIR}/databases/postgresql7 -.endif +USE_X_PREFIX= yes +USE_GTK= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +.include <bsd.port.pre.mk> -USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +.if defined(WITH_MYSQL) || (exists(${LOCALBASE}/lib/mysql/libmysqlclient.a) \ + && !defined(WITHOUT_MYSQL)) +HAVE_MYSQL= yes +LIB_DEPENDS+= mysqlclient.6:${PORTSDIR}/databases/mysql322-client +.endif +.if defined(WITH_PGSQL) || (exists(${LOCALBASE}/lib/libpq.a) \ + && !defined(WITHOUT_PGSQL)) +HAVE_PYSQL= yes +LIB_DEPENDS+= pq.2:${PORTSDIR}/databases/postgresql7 +.endif pre-patch: -.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) - @ ${ECHO} "You must specify which database to use, possible are:" - @ ${ECHO} - @ ${ECHO} "make WITH_MYSQL=yes (for MySQL support)" - @ ${ECHO} "make WITH_PGSQL=yes (for PostgreSQL support)" - @ ${ECHO} "make WITH_MYSQL=yes WITH_PGSQL=yes (for both MySQL and PostgreSQL support)" - @ ${FALSE} +.if !defined(HAVE_MYSQL) && !defined(HAVE_PGSQL) + @${ECHO} "You must specify which database to use, possible are:" + @${ECHO} + @${ECHO} "make WITH_MYSQL=yes (for MySQL support)" + @${ECHO} "make WITH_PGSQL=yes (for PostgreSQL support)" + @${ECHO} "make WITH_MYSQL=yes WITH_PGSQL=yes (for both MySQL and PostgreSQL support)" + @${FALSE} .endif do-configure: -.if defined(WITH_MYSQL) - @ ${PERL} -i -pe "s/^#MYSQL/MYSQL/g" ${WRKDIR}/${DISTNAME}/Makefile +.if defined(HAVE_MYSQL) + @${PERL} -i -pe "s/^#MYSQL/MYSQL/g" ${WRKSRC}/Makefile .endif -.if defined(WITH_PGSQL) - @ ${PERL} -i -pe "s/^#PGSQL/PGSQL/g" ${WRKDIR}/${DISTNAME}/Makefile +.if defined(HAVE_PGSQL) + @${PERL} -i -pe "s/^#PGSQL/PGSQL/g" ${WRKSRC}/Makefile .endif do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/gtksql ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/gtksql ${PREFIX}/bin .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/gtksql + @${MKDIR} ${PREFIX}/share/doc/gtksql .for file in Changelog README - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtksql + ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtksql .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile index 2b76eae41435..edc2602702ac 100644 --- a/deskutils/gtimer/Makefile +++ b/deskutils/gtimer/Makefile @@ -12,14 +12,11 @@ MASTER_SITES= http://www.radix.net/~cknudsen/gtimer/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_BZIP2= yes +USE_GMAKE= yes +USE_GTK= yes +GNU_CONFIGURE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -GNU_CONFIGURE= YES -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" -USE_GMAKE= YES -USE_BZIP2= YES MAN1= gtimer.1 post-install: diff --git a/devel/gtksheet/Makefile b/devel/gtksheet/Makefile index cd6f90294bdf..77038adce1e0 100644 --- a/devel/gtksheet/Makefile +++ b/devel/gtksheet/Makefile @@ -12,11 +12,8 @@ MASTER_SITES= http://magnet.fsu.edu/~feiguin/gtk/src/ MAINTAINER= ijliao@csie.nctu.edu.tw -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -MAKE_ENV+= GTK_CONFIG=${GTK_CONFIG} +USE_GTK= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/libgtksheet.a ${PREFIX}/lib diff --git a/devel/gtksheet/files/patch-aa b/devel/gtksheet/files/patch-aa index 589d7708ed45..8fcb2ab55f84 100644 --- a/devel/gtksheet/files/patch-aa +++ b/devel/gtksheet/files/patch-aa @@ -7,7 +7,7 @@ -LIBDIRS = $(shell gtk-config --libs) -CFLAGS = -Wall $(shell gtk-config --cflags) +LIBDIRS = `$(GTK_CONFIG) --libs` -+CFLAGS = -Wall `$(GTK_CONFIG) --cflags` ++CFLAGS += -Wall `$(GTK_CONFIG) --cflags` all: demo libGtkSheet.a diff --git a/devel/mico/Makefile b/devel/mico/Makefile index cdafde1e5a82..43d923482e02 100644 --- a/devel/mico/Makefile +++ b/devel/mico/Makefile @@ -12,15 +12,11 @@ MASTER_SITES= http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/ MAINTAINER= scrappy@freebsd.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - tcl82.1:${PORTSDIR}/lang/tcl82 +LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 -MICOVER= `${ECHO} ${DISTNAME} | ${SED} 's/mico-//'` - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +WRKSRC= ${WRKDIR}/mico -INSTALLS_SHLIB= yes -USE_NEWGCC= yes +MICOVER= `${ECHO} ${DISTNAME} | ${SED} 's/mico-//'` .if defined(QT2) USE_QT2= yes @@ -34,14 +30,13 @@ MAKE_ENV= QT_INCLUDES="${X11BASE}/include/X11/qt" \ CONFIGURE_ENV= QTVER="" .endif -USE_AUTOCONF= yes +INSTALLS_SHLIB= yes +USE_NEWGCC= yes USE_GMAKE= yes - -WRKSRC= ${WRKDIR}/mico - +USE_GTK= yes +USE_AUTOCONF= yes CONFIGURE_ARGS= --with-qt --with-gtk --with-tcl --disable-mini-stl \ --enable-static --enable-shared -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" PLIST_SUB= MICOVER="${MICOVER}" @@ -52,6 +47,7 @@ MAN8= ird.8 micod.8 nsd.8 post-install: ${LN} -sf ${PREFIX}/lib/libmico${MICOVER}.so.1 ${PREFIX}/lib/libmico.${MICOVER}.so ${LN} -sf ${PREFIX}/lib/libmicoaux${MICOVER}.so.1 ${PREFIX}/lib/libmicoaux.${MICOVER}.so + ${LN} -sf ${PREFIX}/lib/libmicocoss${MICOVER}.so.1 ${PREFIX}/lib/libmicocoss.${MICOVER}.so ${LN} -sf ${PREFIX}/lib/libmicogtk${MICOVER}.so.1 ${PREFIX}/lib/libmicogtk.${MICOVER}.so ${LN} -sf ${PREFIX}/lib/libmicoqt${MICOVER}.so.1 ${PREFIX}/lib/libmicoqt.${MICOVER}.so ${LN} -sf ${PREFIX}/lib/libmicotcl${MICOVER}.so.1 ${PREFIX}/lib/libmicotcl.${MICOVER}.so diff --git a/devel/mico/pkg-plist b/devel/mico/pkg-plist index f227b1dbc6dc..02abf5d4097e 100644 --- a/devel/mico/pkg-plist +++ b/devel/mico/pkg-plist @@ -211,6 +211,7 @@ lib/libmico%%MICOVER%%.so.1 lib/libmicoaux.%%MICOVER%%.so lib/libmicoaux%%MICOVER%%.a lib/libmicoaux%%MICOVER%%.so.1 +lib/libmicocoss.%%MICOVER%%.so lib/libmicocoss%%MICOVER%%.a lib/libmicocoss%%MICOVER%%.so.1 lib/libmicogtk.%%MICOVER%%.so @@ -610,4 +611,3 @@ share/doc/mico/manual.ps @dirrm share/doc/mico @dirrm include/ministl @dirrm include/mico - diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile index 87c38373cf6a..d1b4e57deefb 100644 --- a/editors/AbiWord/Makefile +++ b/editors/AbiWord/Makefile @@ -18,8 +18,7 @@ MAINTAINER= wolman@cs.washington.edu # unzip is needed during the installation process BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - png.4:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord @@ -27,6 +26,7 @@ DIST_SUBDIR= AbiWord WRKSRC= ${WRKDIR}/abi-${PORTVERSION}/src USE_XLIB= yes USE_GMAKE= yes +USE_GTK= yes MAKE_ENV= prefix="${PREFIX}" .include <bsd.port.pre.mk> diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index 87c38373cf6a..d1b4e57deefb 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -18,8 +18,7 @@ MAINTAINER= wolman@cs.washington.edu # unzip is needed during the installation process BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - png.4:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord @@ -27,6 +26,7 @@ DIST_SUBDIR= AbiWord WRKSRC= ${WRKDIR}/abi-${PORTVERSION}/src USE_XLIB= yes USE_GMAKE= yes +USE_GTK= yes MAKE_ENV= prefix="${PREFIX}" .include <bsd.port.pre.mk> diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile index 87c38373cf6a..d1b4e57deefb 100644 --- a/editors/abiword-devel/Makefile +++ b/editors/abiword-devel/Makefile @@ -18,8 +18,7 @@ MAINTAINER= wolman@cs.washington.edu # unzip is needed during the installation process BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - png.4:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord @@ -27,6 +26,7 @@ DIST_SUBDIR= AbiWord WRKSRC= ${WRKDIR}/abi-${PORTVERSION}/src USE_XLIB= yes USE_GMAKE= yes +USE_GTK= yes MAKE_ENV= prefix="${PREFIX}" .include <bsd.port.pre.mk> diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 87c38373cf6a..d1b4e57deefb 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -18,8 +18,7 @@ MAINTAINER= wolman@cs.washington.edu # unzip is needed during the installation process BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - png.4:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord @@ -27,6 +26,7 @@ DIST_SUBDIR= AbiWord WRKSRC= ${WRKDIR}/abi-${PORTVERSION}/src USE_XLIB= yes USE_GMAKE= yes +USE_GTK= yes MAKE_ENV= prefix="${PREFIX}" .include <bsd.port.pre.mk> diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile index 07dd7bf37ee7..0e1a2cf80ece 100644 --- a/editors/gxedit/Makefile +++ b/editors/gxedit/Makefile @@ -14,12 +14,9 @@ DISTNAME= GXedit${PORTVERSION} MAINTAINER= dom@myrddin.demon.co.uk -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= gxedit post-patch: diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile index bf14b20c9e83..dbeba21c14bf 100644 --- a/emulators/basiliskII/Makefile +++ b/emulators/basiliskII/Makefile @@ -14,25 +14,17 @@ DISTNAME= BasiliskII_src_30012000 MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - esd.2:${PORTSDIR}/audio/esound \ - lthread.2:${PORTSDIR}/devel/linuxthreads +LIB_DEPENDS= lthread.2:${PORTSDIR}/devel/linuxthreads WRKSRC= ${WRKDIR}/BasiliskII-0.8/src/Unix USE_X_PREFIX= yes +USE_GTK= yes +USE_ESOUND= yes GNU_CONFIGURE= yes USE_GMAKE= yes - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -ESD_CONFIG?= ${LOCALBASE}/bin/esd-config - CONFIGURE_ARGS= --disable-fbdev-dga -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - ESD_CONFIG="${ESD_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CFLAGS+= -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile index 82ffb38784cc..e1cb56e2c2af 100644 --- a/emulators/xsystem35/Makefile +++ b/emulators/xsystem35/Makefile @@ -13,14 +13,12 @@ DISTNAME= ${PORTNAME}-1.2.5-1 MAINTAINER= k5@cheerful.com -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +USE_IMAKE= yes +USE_GTK= yes +WANT_ESOUND= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_IMAKE= YES -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" PKGMESSAGE= ${WRKSRC}/MESSAGE DOC_FILES= BUGS ChangeLog FAQ GRFMT.TXT INSTALL MISCGAME.TXT README \ @@ -35,12 +33,9 @@ EXAMPLES= README.TXT ambi.inf atlach.inf dalk.inf darcrows.inf \ .include <bsd.port.pre.mk> -.if defined(WITH_ESOUND) -LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound -.endif - +.if defined(HAVE_ESOUND) +USE_ESOUND= yes pre-configure: -.if defined(WITH_ESOUND) ${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.orig ${SED} -e 43,43d -e 45,45d ${WRKSRC}/config.h.orig > ${WRKSRC}/config.h .endif @@ -50,11 +45,11 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/../contrib/instgame ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/ja/xsystem35 - @(cd ${WRKSRC}/../doc;\ + (cd ${WRKSRC}/../doc;\ ${INSTALL_MAN} ${DOC_FILES} ${PREFIX}/share/doc/ja/xsystem35) .endif @${MKDIR} ${PREFIX}/share/examples/xsystem35 - @${INSTALL_DATA} ${WRKSRC}/xsys35rc.sample ${PREFIX}/share/examples/xsystem35 + ${INSTALL_DATA} ${WRKSRC}/xsys35rc.sample ${PREFIX}/share/examples/xsystem35 @(cd ${WRKSRC}/../contrib; \ ${INSTALL_DATA} ${EXAMPLES} ${PREFIX}/share/examples/xsystem35) @${SED} -e s,PREFIX,${PREFIX}, ${PKGDIR}/MESSAGE > ${WRKSRC}/MESSAGE diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile index 890b13ec8e9d..d87d12816efa 100644 --- a/ftp/IglooFTP/Makefile +++ b/ftp/IglooFTP/Makefile @@ -15,24 +15,18 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" -ALL_TARGET= IglooFTP +USE_GTK= yes post-extract: @${RM} ${WRKSRC}/../share/docs/LICENSE~ post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/IglooFTP .for file in AUTHORS BUGS COPYRIGHT THANKS TODO - ${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/IglooFTP + ${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/IglooFTP/docs .endfor .endif diff --git a/ftp/IglooFTP/files/patch-aa b/ftp/IglooFTP/files/patch-aa index 662e5bc3babe..fa17c07fb535 100644 --- a/ftp/IglooFTP/files/patch-aa +++ b/ftp/IglooFTP/files/patch-aa @@ -1,5 +1,5 @@ ---- FTP.c Thu Apr 15 20:05:13 1999 -+++ /home/andy/tmp/wrk/src/FTP.c Mon May 3 12:59:56 1999 +--- FTP.c.orig Thu Apr 15 20:05:13 1999 ++++ FTP.c Mon May 3 12:59:56 1999 @@ -15,12 +15,12 @@ */ diff --git a/ftp/IglooFTP/files/patch-ab b/ftp/IglooFTP/files/patch-ab index d80b3a665b5f..f2fb956b61fc 100644 --- a/ftp/IglooFTP/files/patch-ab +++ b/ftp/IglooFTP/files/patch-ab @@ -18,11 +18,20 @@ VERSION = 0.6.1 VERSION_DATE = 1999 -DESTDIR = /usr/local -+DESTDIR?= /usr/X11R6 ++DESTDIR?= ${PREFIX} BIN_PATH = $(DESTDIR)/bin MAN_PATH = $(DESTDIR)/man SHARE_PATH = $(DESTDIR)/share/$(PROGNAME) -@@ -50,14 +51,14 @@ +@@ -16,6 +17,8 @@ + RPM_BUILDPATH = /usr/src/redhat + CODE_LINES = `cat *.c *.h | grep -ch -e "[[:alpha:]|[:punct:]]"` + ++all: $(PROGNAME) ++ + $(PROGNAME): main.o GTKmisc.o menu.o toolbar.o connectbar.o statusbar.o\ + dirlist.o ftplist.o queue.o log.o console.o dialog.o chmod.o\ + version.o custom.o string.o pixmaps.o color.o cursor.o\ +@@ -50,14 +53,14 @@ @if ! test -e $(SHARE_PATH)/app_ass; then \ echo "Making $(SHARE_PATH)/app_ass directory ..."; mkdir -m 0755 $(SHARE_PATH)/app_ass; \ else :; fi; @@ -45,7 +54,7 @@ -@@ -111,7 +112,7 @@ +@@ -111,7 +114,7 @@ @echo "#define COMPILE_TIME \"`date +%T`\"" >> version.h @echo "#define COMPILE_BY \"`whoami`\"" >> version.h @echo "#define COMPILE_HOST \"`hostname`\"" >> version.h diff --git a/ftp/IglooFTP/files/patch-ac b/ftp/IglooFTP/files/patch-ac index 2d45efc8ac97..dddf22599db0 100644 --- a/ftp/IglooFTP/files/patch-ac +++ b/ftp/IglooFTP/files/patch-ac @@ -1,5 +1,5 @@ ---- main.c Thu Apr 15 20:05:15 1999 -+++ /home/andy/tmp/wrk/src/main.c Mon May 3 13:42:28 1999 +--- main.c.orig Thu Apr 15 20:05:15 1999 ++++ main.c Mon May 3 13:42:28 1999 @@ -20,6 +20,9 @@ #include <stdlib.h> #include <unistd.h> diff --git a/ftp/IglooFTP/pkg-plist b/ftp/IglooFTP/pkg-plist index 836ea1a52fce..6d4a56d48163 100644 --- a/ftp/IglooFTP/pkg-plist +++ b/ftp/IglooFTP/pkg-plist @@ -1,13 +1,18 @@ bin/IglooFTP -share/IglooFTP/gtkrc share/IglooFTP/app_ass/app_ass.GNOME share/IglooFTP/app_ass/app_ass.KDE share/IglooFTP/app_ass/app_ass.default share/IglooFTP/bookmarks/default.bmk +share/IglooFTP/docs/AUTHORS +share/IglooFTP/docs/BUGS +share/IglooFTP/docs/COPYRIGHT share/IglooFTP/docs/ChangeLog share/IglooFTP/docs/LICENSE share/IglooFTP/docs/README +share/IglooFTP/docs/THANKS +share/IglooFTP/docs/TODO share/IglooFTP/docs/welcome.msg +share/IglooFTP/gtkrc share/IglooFTP/html/default.html share/IglooFTP/html/images/amazon_mini.gif share/IglooFTP/html/images/banner.gif @@ -44,11 +49,6 @@ share/IglooFTP/html/images/softwares.jpg share/IglooFTP/html/images/viglooftp.gif share/IglooFTP/xpm/iglooftp.xpm share/IglooFTP/xpm/little_igloo.xpm -share/doc/IglooFTP/AUTHORS -share/doc/IglooFTP/BUGS -share/doc/IglooFTP/COPYRIGHT -share/doc/IglooFTP/THANKS -share/doc/IglooFTP/TODO @dirrm share/IglooFTP/app_ass @dirrm share/IglooFTP/bookmarks @dirrm share/IglooFTP/docs @@ -56,4 +56,3 @@ share/doc/IglooFTP/TODO @dirrm share/IglooFTP/html @dirrm share/IglooFTP/xpm @dirrm share/IglooFTP -@dirrm share/doc/IglooFTP diff --git a/ftp/axyftp/Makefile b/ftp/axyftp/Makefile index 71a4d509d266..5ee67842a44e 100644 --- a/ftp/axyftp/Makefile +++ b/ftp/axyftp/Makefile @@ -14,12 +14,10 @@ MASTER_SITES= ftp://ftp.wxftp.seul.org/pub/wxftp/${PORTVERSION}/ \ MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - +USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config -USE_X_PREFIX= yes +USE_GTK= yes +GNU_CONFIGURE= yes MAN1= axyftp.1 diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile index 32a04c66c765..fb353f42957c 100644 --- a/ftp/downloader/Makefile +++ b/ftp/downloader/Makefile @@ -15,13 +15,14 @@ DISTNAME= nt-${PORTVERSION} MAINTAINER= andrew@chg.ru -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config MSGFMT_CMD= ${LOCALBASE}/bin/msgfmt + WRKSRC= ${WRKDIR}/${DISTNAME}/main -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - MSGFMT_CMD="${MSGFMT_CMD}" + +USE_GTK= yes +MAKE_ENV= MSGFMT_CMD="${MSGFMT_CMD}" MAN1= nt.1 diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa index c876c378daee..f87009420937 100644 --- a/ftp/downloader/files/patch-aa +++ b/ftp/downloader/files/patch-aa @@ -4,7 +4,7 @@ -CXXFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -# -ggdb -# -DDEBUG_ALL -+CXXFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ++CXXFLAGS += -D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -export CXXFLAGS LOCALEDIR - diff --git a/games/baduki/Makefile b/games/baduki/Makefile index d0d4920c3f80..ccde934e36bc 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -12,12 +12,17 @@ MASTER_SITES= ftp://autoinst.acs.uci.edu/pub/go/ MAINTAINER= spcoltri@omcl.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GNU_CONFIGURE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -CONFIGURE_ENV= 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" \ + LIBS="-L${LOCALBASE}/lib" + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/games/corewars/Makefile b/games/corewars/Makefile index 2d340707a9f4..3d6a37d8c615 100644 --- a/games/corewars/Makefile +++ b/games/corewars/Makefile @@ -5,35 +5,27 @@ # $FreeBSD$ # -PORTNAME= corewars -PORTVERSION= 0.9.12 -CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +PORTNAME= corewars +PORTVERSION= 0.9.12 +CATEGORIES= games +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= jim@FreeBSD.org +MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_X_PREFIX= yes +USE_GTK= yes +GNU_CONFIGURE= yes +MAKE_ENV= FREEBSD_CFLAGS="${CFLAGS}" -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - -USE_X_PREFIX= yes -GNU_CONFIGURE= yes - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" -MAKE_ENV= FREEBSD_CFLAGS="${CFLAGS}" - -MAN6= corewars.6 +MAN6= corewars.6 post-install: - @strip ${PREFIX}/bin/corewars .if !defined(NOPORTDOCS) - @${ECHO} "===> Installing README in ${PREFIX}/share/doc/corewars." - @${ECHO} "===> Please read it before playing." + @${ECHO_MSG} "===> Installing README in ${PREFIX}/share/doc/corewars." + @${ECHO_MSG} "===> Please read it before playing." @${MKDIR} ${PREFIX}/share/doc/corewars && ${CHMOD} a+rx ${PREFIX}/share/doc/corewars - @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/corewars + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/corewars .endif .include <bsd.port.mk> diff --git a/games/garith/Makefile b/games/garith/Makefile index c2587f991497..068956596fce 100644 --- a/games/garith/Makefile +++ b/games/garith/Makefile @@ -12,13 +12,9 @@ MASTER_SITES= http://www.cnm-vra.com/micah/garith/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - ALL_TARGET= # empty USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes WRKSRC= ${WRKDIR}/garith do-install: diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile index ff5ff422c6c9..9d692b94e5e0 100644 --- a/games/gtkballs/Makefile +++ b/games/gtkballs/Makefile @@ -14,11 +14,8 @@ MASTER_SITE_SUBDIR= games/strategy MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_GTK= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN6= gtkballs.6 do-install: diff --git a/games/mindguard/Makefile b/games/mindguard/Makefile index 7704dd8611c7..aef04d914bc9 100644 --- a/games/mindguard/Makefile +++ b/games/mindguard/Makefile @@ -13,9 +13,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_X_PREFIX= yes +USE_GTK= yes ALL_TARGET= # empty @@ -45,4 +44,5 @@ do-install: .for i in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/docs/$i ${X11BASE}/share/doc/mindguard .endfor + .include <bsd.port.mk> diff --git a/games/mindguard/files/patch-aa b/games/mindguard/files/patch-aa index 53fdc5a311d7..2c37e8732b71 100644 --- a/games/mindguard/files/patch-aa +++ b/games/mindguard/files/patch-aa @@ -9,7 +9,7 @@ mindguard: mindguard.c - $(CC) `gtk-config --cflags` mindguard.c -o mindguard `gtk-config --libs` -+ $(CC) -DX11BASE=\"${X11BASE}\" `${X11BASE}/bin/gtk12-config --cflags` ${CFLAGS} mindguard.c -o mindguard `${X11BASE}/bin/gtk12-config --libs` ++ $(CC) -DX11BASE=\"${X11BASE}\" `${GTK_CONFIG} --cflags` ${CFLAGS} mindguard.c -o mindguard `${GTK_CONFIG} --libs` clean: rm -f mindguard diff --git a/games/nethack-gtk/Makefile b/games/nethack-gtk/Makefile index c864c289b064..bb11be093323 100644 --- a/games/nethack-gtk/Makefile +++ b/games/nethack-gtk/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 1.1.5 CATEGORIES= games MASTER_SITES= ftp://ftp.jnethack.org/pub/jnethack/ \ ftp://ftp.uu.net/systems/gnu/nethack/ -PKGNAMEPREFIX= gtk- +PKGNAMESUFFIX= -gtk DISTNAME= ${PORTNAME}-3.2.2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${GTK_PATCH} EXTRACT_ONLY= nethack-3.2.2.tar.gz @@ -21,9 +21,8 @@ PATCHFILES= nh-3.2.2-3.2.3.diff \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_XPM= yes +USE_GTK= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack-gtk/files/src-Makefile.diff b/games/nethack-gtk/files/src-Makefile.diff index 438801a22ac7..1d3ff896188d 100644 --- a/games/nethack-gtk/files/src-Makefile.diff +++ b/games/nethack-gtk/files/src-Makefile.diff @@ -6,8 +6,8 @@ -CFLAGS = -O -I../include -I/usr/X11R6/include `gtk-config --cflags` -LFLAGS = -O -L/usr/X11R6/lib `gtk-config --libs` -+CFLAGS = -O -I../include -I/usr/X11R6/include `gtk12-config --cflags` -+LFLAGS = -O -L/usr/X11R6/lib `gtk12-config --libs` ++CFLAGS = -O -I../include -I/usr/X11R6/include `${GTK_CONFIG} --cflags` ++LFLAGS = -O -L/usr/X11R6/lib `${GTK_CONFIG} --libs` # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired # combination of windowing systems. Also set windowing systems in config.h. diff --git a/games/nethack32-gtk/Makefile b/games/nethack32-gtk/Makefile index c864c289b064..bb11be093323 100644 --- a/games/nethack32-gtk/Makefile +++ b/games/nethack32-gtk/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 1.1.5 CATEGORIES= games MASTER_SITES= ftp://ftp.jnethack.org/pub/jnethack/ \ ftp://ftp.uu.net/systems/gnu/nethack/ -PKGNAMEPREFIX= gtk- +PKGNAMESUFFIX= -gtk DISTNAME= ${PORTNAME}-3.2.2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${GTK_PATCH} EXTRACT_ONLY= nethack-3.2.2.tar.gz @@ -21,9 +21,8 @@ PATCHFILES= nh-3.2.2-3.2.3.diff \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - USE_XPM= yes +USE_GTK= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack32-gtk/files/src-Makefile.diff b/games/nethack32-gtk/files/src-Makefile.diff index 438801a22ac7..1d3ff896188d 100644 --- a/games/nethack32-gtk/files/src-Makefile.diff +++ b/games/nethack32-gtk/files/src-Makefile.diff @@ -6,8 +6,8 @@ -CFLAGS = -O -I../include -I/usr/X11R6/include `gtk-config --cflags` -LFLAGS = -O -L/usr/X11R6/lib `gtk-config --libs` -+CFLAGS = -O -I../include -I/usr/X11R6/include `gtk12-config --cflags` -+LFLAGS = -O -L/usr/X11R6/lib `gtk12-config --libs` ++CFLAGS = -O -I../include -I/usr/X11R6/include `${GTK_CONFIG} --cflags` ++LFLAGS = -O -L/usr/X11R6/lib `${GTK_CONFIG} --libs` # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired # combination of windowing systems. Also set windowing systems in config.h. diff --git a/games/rtb/Makefile b/games/rtb/Makefile index 0fc454b55af7..3b27ed65c5db 100644 --- a/games/rtb/Makefile +++ b/games/rtb/Makefile @@ -12,12 +12,9 @@ MASTER_SITES= http://www.lysator.liu.se/realtimebattle/Download/ MAINTAINER= draj@oceanfree.net -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-debug -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/games/xqf/Makefile b/games/xqf/Makefile index a9829c89b9b3..529ac2d8c653 100644 --- a/games/xqf/Makefile +++ b/games/xqf/Makefile @@ -13,11 +13,8 @@ MASTER_SITES= ftp://ftp.linuxgames.com/xqf/ MAINTAINER= steve@farrell.org RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes .include <bsd.port.mk> diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile index 92db22fdfd16..03e59ac2de91 100644 --- a/games/znibbles/Makefile +++ b/games/znibbles/Makefile @@ -12,23 +12,12 @@ MASTER_SITES= ftp://koala.inria.fr/pub/games/znibbles/ 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 - REQUIRES_MOTIF= yes -HAS_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" +USE_GTK= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-motif \ --disable-motif MAN6= nibbles.6 znibbles.6 gznibbles.6 znibblesX.6 -post-install: - @strip ${PREFIX}/bin/nibbles - @strip ${PREFIX}/bin/znibblesX - @strip ${PREFIX}/bin/gznibbles - .include <bsd.port.mk> diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index a0d8322fdaac..4c0ac50f8031 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -14,20 +14,17 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg ONLY_FOR_ARCHS= i386 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +INSTALL_TARGET= bininstall USE_XLIB= yes +USE_GTK= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-asm CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -pedantic" \ - GTK_CONFIG="${GTK_CONFIG}" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-asm -INSTALL_TARGET= bininstall MAN1= cqcam.1 MLINKS= cqcam.1 webcam.1 \ diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile index cbbeaaba9ddc..ae28b6392d22 100644 --- a/graphics/gcolor/Makefile +++ b/graphics/gcolor/Makefile @@ -7,17 +7,20 @@ PORTNAME= gcolor PORTVERSION= 0.4 -CATEGORIES= graphics gnome x11 +CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - USE_X_PREFIX= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" +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 .include <bsd.port.mk> diff --git a/graphics/gcolor/pkg-comment b/graphics/gcolor/pkg-comment index 1926879f1673..33e13d8dee22 100644 --- a/graphics/gcolor/pkg-comment +++ b/graphics/gcolor/pkg-comment @@ -1 +1 @@ -GNOME-based color picker +GTK-based color picker diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile index 3299b7086735..feeb40880a3a 100644 --- a/graphics/gtkdps/Makefile +++ b/graphics/gtkdps/Makefile @@ -13,13 +13,13 @@ DISTNAME= gtkDPS-${PORTVERSION} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 BUILD_DEPENDS= pswrap:${PORTSDIR}/x11/dgs +RUN_DEPENDS= pswrap:${PORTSDIR}/x11/dgs -CONFIGURE_ARGS= --with-dps-includes=${X11BASE}/include \ - --with-dps-libraries=${X11BASE}/lib -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --with-dps-includes=${X11BASE}/include \ + --with-dps-libraries=${X11BASE}/lib .include <bsd.port.mk> diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile index 7371ca268054..d407433db7d4 100644 --- a/graphics/gtkfig/Makefile +++ b/graphics/gtkfig/Makefile @@ -13,12 +13,8 @@ MASTER_SITES= ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \ MAINTAINER= dirk@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}" .include <bsd.port.mk> diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile index cdd92ad5b079..30bf9cc6ca5d 100644 --- a/graphics/gtksee/Makefile +++ b/graphics/gtksee/Makefile @@ -13,18 +13,16 @@ MASTER_SITES= http://hotaru.clinuxworld.com/gtksee/ \ MAINTAINER= dirk@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \ bzip2:${PORTSDIR}/archivers/bzip2 -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${PREFIX}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - LDFLAGS=-L${PREFIX}/lib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/graphics/gxanim/Makefile b/graphics/gxanim/Makefile index d21487b28ed8..3c80a02ca56d 100644 --- a/graphics/gxanim/Makefile +++ b/graphics/gxanim/Makefile @@ -13,14 +13,10 @@ MASTER_SITE_SUBDIR= fenner MAINTAINER= rbt@zort.on.ca -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim -GTK_CONFIG= ${X11BASE}/bin/gtk12-config - -USE_XLIB= yes - USE_BZIP2= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_XLIB= yes +USE_GTK= yes .include <bsd.port.mk> diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index f108ba488e84..1ae7fe824d35 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -15,22 +15,16 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - ungif.5:${PORTSDIR}/graphics/libungif \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + ungif.5:${PORTSDIR}/graphics/libungif USE_GMAKE= yes USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib \ - --disable-gtktest pre-configure: ${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab index ed31cf167d97..8f53b916c5cb 100644 --- a/graphics/imlib/files/patch-ab +++ b/graphics/imlib/files/patch-ab @@ -1,5 +1,5 @@ ---- ./imlib-config.in.org Thu Aug 26 08:09:25 1999 -+++ ./imlib-config.in Fri Mar 3 11:08:41 2000 +--- imlib-config.in.org Thu Aug 26 08:09:25 1999 ++++ imlib-config.in Fri Mar 3 11:08:41 2000 @@ -3,7 +3,7 @@ # Shamelessly ripped form gtk's gtk-config.in # diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile index f108ba488e84..1ae7fe824d35 100644 --- a/graphics/imlib2-tmp/Makefile +++ b/graphics/imlib2-tmp/Makefile @@ -15,22 +15,16 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - ungif.5:${PORTSDIR}/graphics/libungif \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + ungif.5:${PORTSDIR}/graphics/libungif USE_GMAKE= yes USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib \ - --disable-gtktest pre-configure: ${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index f108ba488e84..1ae7fe824d35 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -15,22 +15,16 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - ungif.5:${PORTSDIR}/graphics/libungif \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + ungif.5:${PORTSDIR}/graphics/libungif USE_GMAKE= yes USE_X_PREFIX= yes +USE_GTK= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib \ - --disable-gtktest pre-configure: ${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index 0be0865f8056..46f183b00564 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR= apps/graphics/capture MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - jpeg.9:${PORTSDIR}/graphics/jpeg - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_GMAKE= yes USE_LIBTOOL= yes +USE_GTK= yes +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-gtktest -INSTALLS_SHLIB= yes MAN1= saned.1 scanimage.1 xcam.1 xscanimage.1 MAN5= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \ diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index 0be0865f8056..46f183b00564 100644 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR= apps/graphics/capture MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - jpeg.9:${PORTSDIR}/graphics/jpeg - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_GMAKE= yes USE_LIBTOOL= yes +USE_GTK= yes +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-gtktest -INSTALLS_SHLIB= yes MAN1= saned.1 scanimage.1 xcam.1 xscanimage.1 MAN5= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \ diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile index 0be0865f8056..46f183b00564 100644 --- a/graphics/sane/Makefile +++ b/graphics/sane/Makefile @@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR= apps/graphics/capture MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - jpeg.9:${PORTSDIR}/graphics/jpeg - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_GMAKE= yes USE_LIBTOOL= yes +USE_GTK= yes +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-gtktest -INSTALLS_SHLIB= yes MAN1= saned.1 scanimage.1 xcam.1 xscanimage.1 MAN5= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \ diff --git a/graphics/smpeg/Makefile b/graphics/smpeg/Makefile index 5f3d7dccdaaa..076823110601 100644 --- a/graphics/smpeg/Makefile +++ b/graphics/smpeg/Makefile @@ -16,16 +16,15 @@ MASTER_SITES= ftp://ftp.lokigames.com/pub/open-source/smpeg/ \ MAINTAINER= cpiazza@FreeBSD.org -LIB_DEPENDS= SDL-1.1.2:${PORTSDIR}/devel/sdl-devel \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= SDL-1.1.2:${PORTSDIR}/devel/sdl-devel -GTK_CONFIG= ${X11BASE}/bin/gtk12-config SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config -GNU_CONFIGURE= yes + USE_GMAKE= yes +USE_GTK= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - SDL_CONFIG="${SDL_CONFIG}" \ +CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ GLBASE="${X11BASE}" \ CPPFLAGS="-I${X11BASE}/include" diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index a2000a58bad1..b143ade1b448 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -14,24 +14,28 @@ MASTER_SITES= http://www.wolfsburg.de/~rauch/sane/ \ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ sane.1:${PORTSDIR}/graphics/sane \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ png.4:${PORTSDIR}/graphics/png -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GTK= yes USE_AUTOCONF= yes +CONFIGURE_ARGS= --enable-intl-patch CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --enable-intl-patch MAN1= xsane.1 +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/aclocal.m4 + post-install: @${CAT} ${PKGMESSAGE} diff --git a/irc/ircatlite/Makefile b/irc/ircatlite/Makefile index 7ecec2bd0df5..1b15b963697c 100644 --- a/irc/ircatlite/Makefile +++ b/irc/ircatlite/Makefile @@ -13,22 +13,15 @@ DISTNAME= IRcatLite-r20000308 MAINTAINER= goto@snowy.to -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-gtk-config=gtk12-config - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" DOCS= LICENSE INSTALL INSTALL.jp README README.jp WRKSRC= ${WRKDIR}/IRcatLite -.include <bsd.port.pre.mk> - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ircat ${PREFIX}/bin/ircat .if !defined(NOPORTDOCS) @@ -38,4 +31,4 @@ do-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/irc/olirc/Makefile b/irc/olirc/Makefile index 91070b9465d4..771756eca396 100644 --- a/irc/olirc/Makefile +++ b/irc/olirc/Makefile @@ -12,16 +12,10 @@ MASTER_SITES= http://olirc.hexanet.fr/ MAINTAINER= nox@jelal.kn-bremen.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_BZIP2= yes USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/olirc ${PREFIX}/bin diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile index 6805eb22acb5..e4f7ec9aad3b 100644 --- a/japanese/gicq/Makefile +++ b/japanese/gicq/Makefile @@ -20,18 +20,13 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= flathill@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - icq.0:${PORTSDIR}/japanese/libicq - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= icq.0:${PORTSDIR}/japanese/libicq USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --disable-nls CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/japanese/gicq/files/patch-ac b/japanese/gicq/files/patch-ac new file mode 100644 index 000000000000..d819618939b4 --- /dev/null +++ b/japanese/gicq/files/patch-ac @@ -0,0 +1,13 @@ +--- Makefile.in.orig Mon Sep 6 23:36:43 1999 ++++ Makefile.in Mon Sep 6 23:37:18 1999 +@@ -116,8 +116,8 @@ + + SUBDIRS = macros intl po pixmaps src doc + +-sysdir = $(datadir)/gnome/apps/Applications +-sys_DATA = gicq.desktop ++@INSIDE_GNOME_COMMON_TRUE@sysdir = $(datadir)/gnome/apps/Applications ++@INSIDE_GNOME_COMMON_TRUE@sys_DATA = gicq.desktop + + EXTRA_DIST = gicq.desktop + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/japanese/gicq/files/patch-ad b/japanese/gicq/files/patch-ad new file mode 100644 index 000000000000..b23db8901736 --- /dev/null +++ b/japanese/gicq/files/patch-ad @@ -0,0 +1,12 @@ +--- doc/Makefile.in.orig Mon Sep 6 23:46:58 1999 ++++ doc/Makefile.in Mon Sep 6 23:48:32 1999 +@@ -114,7 +114,8 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-gicq_helpdir = $(datadir)/gnome/help/gicq/C ++@INSIDE_GNOME_COMMON_TRUE@gicq_helpdir = $(datadir)/gnome/help/gicq/C ++@INSIDE_GNOME_COMMON_FALSE@gicq_helpdir = $(datadir)/doc/gicq/C + + gicq_help_DATA = \ + index.html \ diff --git a/japanese/gicq/pkg-plist b/japanese/gicq/pkg-plist index a8425957eda3..c430b9e74093 100644 --- a/japanese/gicq/pkg-plist +++ b/japanese/gicq/pkg-plist @@ -1,6 +1,5 @@ bin/gicq -share/gnome/help/gicq/C/index.html -share/gnome/help/gicq/C/topic.dat -@dirrm share/gnome/help/gicq/C -@dirrm share/gnome/help/gicq -share/gnome/apps/Applications/gicq.desktop +share/doc/gicq/C/index.html +share/doc/gicq/C/topic.dat +@dirrm share/doc/gicq/C +@dirrm share/doc/gicq diff --git a/japanese/gtkicq/Makefile b/japanese/gtkicq/Makefile index 19eb0766c4a7..37a448a27677 100644 --- a/japanese/gtkicq/Makefile +++ b/japanese/gtkicq/Makefile @@ -16,18 +16,14 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= stanaka@bb.mbn.or.jp -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -BUILD_DEPENDS= ${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode \ - ${LOCALBASE}/include/jlib.h:${PORTSDIR}/japanese/libjcode - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +BUILD_DEPENDS= ${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-gnome +CONFIGURE_ARGS= --without-gnome --datadir=${PREFIX}/share/gtkicq CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/japanese/gtkicq/files/patch-ac b/japanese/gtkicq/files/patch-ac new file mode 100644 index 000000000000..d5847b83f31f --- /dev/null +++ b/japanese/gtkicq/files/patch-ac @@ -0,0 +1,23 @@ +--- src/Makefile.in.orig Tue Sep 7 00:01:12 1999 ++++ src/Makefile.in Tue Sep 7 00:06:29 1999 +@@ -115,14 +115,14 @@ + EXTRA_DIST = GtkICQ.desktop GtkICQ.gnorba gnome-gtkicq.xpm applet.c + + +-Utilitiesdir = $(datadir)/applets/Network +-Utilities_DATA = GtkICQ.desktop ++@INSIDE_GNOME_COMMON_TRUE@Utilitiesdir = $(datadir)/applets/Network ++@INSIDE_GNOME_COMMON_TRUE@Utilities_DATA = GtkICQ.desktop + +-Iconsdir = $(datadir)/pixmaps +-Icons_DATA = gnome-gtkicq.xpm ++@INSIDE_GNOME_COMMON_TRUE@Iconsdir = $(datadir)/pixmaps ++@INSIDE_GNOME_COMMON_TRUE@Icons_DATA = gnome-gtkicq.xpm + +-gnorbadir = $(sysconfdir)/CORBA/servers +-gnorba_DATA = GtkICQ.gnorba ++@INSIDE_GNOME_COMMON_TRUE@gnorbadir = $(sysconfdir)/CORBA/servers ++@INSIDE_GNOME_COMMON_TRUE@gnorba_DATA = GtkICQ.gnorba + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/japanese/gtkicq/pkg-plist b/japanese/gtkicq/pkg-plist index 18e0961ab8f1..02db91d80240 100644 --- a/japanese/gtkicq/pkg-plist +++ b/japanese/gtkicq/pkg-plist @@ -1,19 +1,18 @@ bin/gtkicq -share/pixmaps/gtkicq-auth.xpm -share/pixmaps/gtkicq-away.xpm -share/pixmaps/gtkicq-blank.xpm -share/pixmaps/gtkicq-chat.xpm -share/pixmaps/gtkicq-chat2.xpm -share/pixmaps/gtkicq-dnd.xpm -share/pixmaps/gtkicq-ffc.xpm -share/pixmaps/gtkicq-inv.xpm -share/pixmaps/gtkicq-message.xpm -share/pixmaps/gtkicq-na.xpm -share/pixmaps/gtkicq-nomess.xpm -share/pixmaps/gtkicq-occ.xpm -share/pixmaps/gtkicq-offline.xpm -share/pixmaps/gtkicq-online.xpm -share/pixmaps/gtkicq-url.xpm -share/pixmaps/gnome-gtkicq.xpm -share/applets/Network/GtkICQ.desktop -etc/CORBA/servers/GtkICQ.gnorba +share/gtkicq/pixmaps/gtkicq-auth.xpm +share/gtkicq/pixmaps/gtkicq-away.xpm +share/gtkicq/pixmaps/gtkicq-blank.xpm +share/gtkicq/pixmaps/gtkicq-chat.xpm +share/gtkicq/pixmaps/gtkicq-chat2.xpm +share/gtkicq/pixmaps/gtkicq-dnd.xpm +share/gtkicq/pixmaps/gtkicq-ffc.xpm +share/gtkicq/pixmaps/gtkicq-inv.xpm +share/gtkicq/pixmaps/gtkicq-message.xpm +share/gtkicq/pixmaps/gtkicq-na.xpm +share/gtkicq/pixmaps/gtkicq-nomess.xpm +share/gtkicq/pixmaps/gtkicq-occ.xpm +share/gtkicq/pixmaps/gtkicq-offline.xpm +share/gtkicq/pixmaps/gtkicq-online.xpm +share/gtkicq/pixmaps/gtkicq-url.xpm +@dirrm share/gtkicq/pixmaps +@dirrm share/gtkicq diff --git a/japanese/word/Makefile b/japanese/word/Makefile index cdaf5ac1d9df..c78bc4bc0a40 100644 --- a/japanese/word/Makefile +++ b/japanese/word/Makefile @@ -12,14 +12,14 @@ MASTER_SITES= http://www.linet.gr.jp/~mituiwa/ MAINTAINER= sada@FreeBSD.ORG -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_GTK= yes DOCDIR= ${PREFIX}/share/doc/ja-word EXAMPLEDIR= ${PREFIX}/share/examples/ja-word do-build: (cd ${WRKSRC}; \ - ${CC} -o word `gtk12-config --cflags` `gtk12-config --libs` word.c ) + ${CC} -o word `${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` word.c ) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/word ${PREFIX}/bin diff --git a/multimedia/gxanim/Makefile b/multimedia/gxanim/Makefile index d21487b28ed8..3c80a02ca56d 100644 --- a/multimedia/gxanim/Makefile +++ b/multimedia/gxanim/Makefile @@ -13,14 +13,10 @@ MASTER_SITE_SUBDIR= fenner MAINTAINER= rbt@zort.on.ca -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim -GTK_CONFIG= ${X11BASE}/bin/gtk12-config - -USE_XLIB= yes - USE_BZIP2= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_XLIB= yes +USE_GTK= yes .include <bsd.port.mk> diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index 5f3d7dccdaaa..076823110601 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -16,16 +16,15 @@ MASTER_SITES= ftp://ftp.lokigames.com/pub/open-source/smpeg/ \ MAINTAINER= cpiazza@FreeBSD.org -LIB_DEPENDS= SDL-1.1.2:${PORTSDIR}/devel/sdl-devel \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= SDL-1.1.2:${PORTSDIR}/devel/sdl-devel -GTK_CONFIG= ${X11BASE}/bin/gtk12-config SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config -GNU_CONFIGURE= yes + USE_GMAKE= yes +USE_GTK= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - SDL_CONFIG="${SDL_CONFIG}" \ +CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ GLBASE="${X11BASE}" \ CPPFLAGS="-I${X11BASE}/include" |