Date: Sun, 23 May 1999 01:16:35 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11842: Port update: x11-toolkits/gtk12 Message-ID: <199905222316.BAA48643@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 11842 >Category: ports >Synopsis: Port update: x11-toolkits/gtk12 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat May 22 16:20:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Jeremy Lea >Release: FreeBSD 4.0-CURRENT i386 >Organization: Arb's Inc. >Environment: FreeBSD Ports collection. >Description: Upgrade to GTK+ 1.2.3, and bump shared library numbers. Major changes: - USE_LIBTOOL. Major decrease in patching... - Don't always link with thread flags. No longer means that GTK+ is always linked with libc_r. Other ports: - Changed depenancies - USE_LIBTOOL - Sane: Fix PLIST. - gFTP: Proper use of -pthread. - gtkportscan: Use $PREFIX. - pdq: Add MESSAGE to package. - gtk--: Use egcs on < 4.0 (Closes ports/11776). Note: I've not contact maintainers. I've lost track... >How-To-Repeat: >Fix: audio/gmixer: Changes: Makefile Adds : Removes: audio/replay: Changes: Makefile Adds : Removes: audio/xhippo: Changes: Makefile Adds : Removes: cad/geda: Changes: Makefile pkg/PLIST Adds : Removes: patches/patch-aa databases/gmysql: Changes: Makefile Adds : Removes: deskutils/gtimer: Changes: Makefile Adds : Removes: devel/mico: Changes: Makefile Adds : Removes: editors/AbiWord: Changes: Makefile Adds : Removes: editors/gnotepad+: Changes: Makefile Adds : Removes: editors/gxedit: Changes: Makefile Adds : Removes: emulators/xsystem35: Changes: Makefile Adds : Removes: games/garith: Changes: Makefile Adds : Removes: games/gtkballs: Changes: Makefile Adds : Removes: games/xqf: Changes: Makefile Adds : Removes: graphics/gimp1-i18n: Changes: Makefile Adds : Removes: graphics/gtksee: Changes: Makefile Adds : Removes: graphics/sane: Changes: Makefile pkg/PLIST Adds : Removes: patches/patch-02 patches/patch-03 graphics/xsane: Changes: Makefile Adds : Removes: japanese/gicq: Changes: Makefile Adds : Removes: japanese/gtkicq: Changes: Makefile Adds : Removes: math/geg: Changes: Makefile Adds : Removes: misc/gtkfind: Changes: Makefile Adds : Removes: net/IglooFTP: Changes: Makefile Adds : Removes: net/ethereal: Changes: Makefile Adds : Removes: net/gaim: Changes: Makefile Adds : Removes: net/gftp: Changes: Makefile patches/patch-aa patches/patch-ab Adds : Removes: net/ggsd: Changes: Makefile Adds : Removes: net/gicq: Changes: Makefile pkg/PLIST Adds : Removes: net/irssi: Changes: Makefile Adds : Removes: net/mtr: Changes: Makefile Adds : Removes: net/wxftp: Changes: Makefile Adds : Removes: net/xchat: Changes: Makefile Adds : Removes: net/xwhois: Changes: Makefile Adds : Removes: print/pdq: Changes: Makefile Adds : pkg/MESSAGE Removes: security/gtkportscan: Changes: Makefile patches/patch-aa Adds : Removes: security/nessus: Changes: Makefile Adds : Removes: sysutils/xlogmaster: Changes: Makefile pkg/PLIST Adds : Removes: sysutils/xwatch: Changes: Makefile Adds : Removes: x11-clocks/asclock-gtk: Changes: Makefile Adds : Removes: x11-fm/dfm: Changes: Makefile Adds : Removes: x11-toolkits/gtk--: Changes: Makefile Adds : Removes: x11-toolkits/gtk12: Upgrade from 1.2.2 to 1.2.3 Changes: Makefile files/md5 patches/patch-aa patches/patch-ab patches/patch-ad patches/patch-ae pkg/PLIST Adds : Removes: x11-toolkits/gtkgl: Changes: Makefile patches/patch-aa pkg/PLIST Adds : Removes: --- /usr/ports.ref/audio/gmixer/Makefile Wed Apr 7 16:22:34 1999 +++ audio/gmixer/Makefile Fri Apr 30 00:47:51 1999 @@ -12,7 +12,7 @@ MAINTAINER= cpiazza@home.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 ALL_TARGET= gmixer --- /usr/ports.ref/audio/replay/Makefile Thu Apr 22 14:37:54 1999 +++ audio/replay/Makefile Fri Apr 30 00:46:53 1999 @@ -13,7 +13,7 @@ MAINTAINER= nacai@iname.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_X_PREFIX= yes GNU_CONFIGURE= yes --- /usr/ports.ref/audio/xhippo/Makefile Fri Apr 16 08:43:57 1999 +++ audio/xhippo/Makefile Fri Apr 30 00:51:16 1999 @@ -6,18 +6,20 @@ # $Id: Makefile,v 1.1.1.1 1999/04/16 06:43:57 flathill Exp $ # -DISTNAME= xhippo-0.8 -CATEGORIES= audio -MASTER_SITES= http://zenchaos.netpedia.net/software/ +DISTNAME= xhippo-0.8 +CATEGORIES= audio +MASTER_SITES= http://zenchaos.netpedia.net/software/ -MAINTAINER= tr49986@rcc.on.ca +MAINTAINER= tr49986@rcc.on.ca -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" -USE_XLIB= yes +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +GNU_CONFIGURE= yes +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_XLIB= yes post-install: @${CAT} ${PKGDIR}/MESSAGE --- /usr/ports.ref/cad/geda/Makefile Fri Apr 23 10:51:05 1999 +++ cad/geda/Makefile Mon May 17 01:47:31 1999 @@ -15,15 +15,13 @@ MAINTAINER= vanilla@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ guile.4:${PORTSDIR}/lang/guile -USE_X_PREFIX= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CFLAGS}" -CONFIGURE_ARGS= --with-gtk-config=${X11BASE}/bin/gtk12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +USE_X_PREFIX= yes +USE_LIBTOOL= yes +CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG} .include <bsd.port.mk> --- /usr/ports.ref/cad/geda/patches/patch-aa Wed Feb 3 01:42:43 1999 +++ cad/geda/patches/patch-aa Mon May 17 01:47:01 1999 @@ -1,53 +0,0 @@ ---- ltmain.sh.orig Sun Dec 13 13:00:00 1998 -+++ ltmain.sh Tue Feb 2 23:17:51 1999 -@@ -967,6 +967,16 @@ - versuffix="$current.$revision" - ;; - -+ freebsd) -+ version_vars="$version_vars major versuffix" -+ major="$current" -+ if [ $PORTOBJFORMAT = elf ]; then -+ versuffix="$current"; -+ else -+ versuffix="$current.$revision"; -+ fi -+ ;; -+ - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ---- ltconfig.orig Sun Dec 13 13:00:00 1998 -+++ ltconfig Tue Feb 2 23:18:10 1999 -@@ -777,7 +777,7 @@ - ;; - - # FreeBSD 3, at last, uses gcc -shared to do shared libraries. -- freebsd3*) -+ freebsd*) - archive_cmds='$CC -shared -o $lib$libobjs' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes -@@ -1123,10 +1123,21 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - --freebsd2* | freebsd3*) -+freebsd2*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix $libname.so' - finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd*) -+ version_type=freebsd -+ library_names_spec='${libname}${release}.so.$versuffix $libname.so' -+ if [ $PORTOBJFORMAT = elf ]; then -+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir' -+ else -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ fi - shlibpath_var=LD_LIBRARY_PATH - ;; - --- /usr/ports.ref/cad/geda/pkg/PLIST Thu May 13 15:49:26 1999 +++ cad/geda/pkg/PLIST Mon May 17 02:19:57 1999 @@ -8,7 +8,6 @@ bin/mk_sym bin/smash_megafile lib/libgeda.a -lib/libgeda.la lib/libgeda.so lib/libgeda.so.2.2 share/gEDA/scheme/gnetlist.scm --- /usr/ports.ref/databases/gmysql/Makefile Thu Apr 22 14:39:12 1999 +++ databases/gmysql/Makefile Fri Apr 30 00:53:41 1999 @@ -13,12 +13,14 @@ MAINTAINER= dirk@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mysqlclient.6:${PORTSDIR}/databases/mysql322 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mysql=${PREFIX} -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config +CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} FETCH_BEFORE_ARGS= -b .include <bsd.port.mk> --- /usr/ports.ref/deskutils/gtimer/Makefile Fri May 7 02:03:41 1999 +++ deskutils/gtimer/Makefile Mon May 10 02:17:16 1999 @@ -12,10 +12,12 @@ MAINTAINER= cpiazza@home.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= YES -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" USE_GMAKE= YES USE_BZIP2= YES MAN1= gtimer.1 --- /usr/ports.ref/devel/mico/Makefile Thu May 13 15:52:53 1999 +++ devel/mico/Makefile Thu May 13 15:42:19 1999 @@ -20,9 +20,11 @@ BUILD_DEPENDS= egcc:${PORTSDIR}/lang/egcs .endif -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ tcl80.1:${PORTSDIR}/lang/tcl80 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_QT= yes USE_AUTOCONF= yes USE_GMAKE= yes @@ -31,7 +33,7 @@ CONFIGURE_ARGS= --with-qt --with-gtk --with-tcl \ --disable-optimize --disable-mini-stl -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN1= idl.1 imr.1 nsadmin.1 MAN5= micorc.5 --- /usr/ports.ref/editors/AbiWord/Makefile Wed May 12 12:18:13 1999 +++ editors/AbiWord/Makefile Wed May 12 09:55:38 1999 @@ -16,7 +16,7 @@ MAINTAINER= dburr@FreeBSD.ORG BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ png.3:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell --- /usr/ports.ref/editors/gnotepad+/Makefile Sun May 9 22:39:45 1999 +++ editors/gnotepad+/Makefile Sun May 9 23:07:24 1999 @@ -13,10 +13,12 @@ MAINTAINER= brett@peloton.physics.montana.edu LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 + gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN1= gnp.1 --- /usr/ports.ref/editors/gxedit/Makefile Mon Apr 19 10:40:38 1999 +++ editors/gxedit/Makefile Fri Apr 30 00:55:45 1999 @@ -13,7 +13,7 @@ MAINTAINER= dom@myrddin.demon.co.uk -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_X_PREFIX= yes ALL_TARGET= gxedit --- /usr/ports.ref/emulators/xsystem35/Makefile Sat May 1 22:11:06 1999 +++ emulators/xsystem35/Makefile Sat May 1 21:36:41 1999 @@ -12,7 +12,7 @@ MAINTAINER= k5@respo.or.jp -LIB_DEPENDS+= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_IMAKE= YES WRKSRC= ${WRKDIR}/${DISTNAME}/src --- /usr/ports.ref/games/garith/Makefile Tue Apr 13 16:43:17 1999 +++ games/garith/Makefile Fri May 14 11:11:03 1999 @@ -12,7 +12,7 @@ MAINTAINER= andy@icc.surw.chel.su -LIB_DEPENDS= gdk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 ALL_TARGET= USE_X_PREFIX= yes --- /usr/ports.ref/games/gtkballs/Makefile Sat May 1 22:11:38 1999 +++ games/gtkballs/Makefile Fri May 7 02:30:45 1999 @@ -15,7 +15,7 @@ MAINTAINER= andy@icc.surw.chel.su -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 MAN6= gtkballs.6 --- /usr/ports.ref/games/xqf/Makefile Sun May 9 22:43:48 1999 +++ games/xqf/Makefile Fri May 14 11:12:21 1999 @@ -13,7 +13,7 @@ MAINTAINER= steve@farrell.org RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat -LIB_DEPENDS= gtk12:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_GMAKE= yes --- /usr/ports.ref/graphics/gimp1-i18n/Makefile Fri Apr 2 15:20:03 1999 +++ graphics/gimp1-i18n/Makefile Fri Apr 30 01:52:08 1999 @@ -18,17 +18,19 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ + gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ png.3:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff34 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --disable-perl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ + GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib -lxpg4" \ INSTALL_SCRIPT='$${INSTALL} -m 755' --- /usr/ports.ref/graphics/gtksee/Makefile Thu May 6 10:25:00 1999 +++ graphics/gtksee/Makefile Thu May 6 10:51:03 1999 @@ -13,16 +13,18 @@ MAINTAINER= dirk@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.3:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff34 RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \ bzip2:${PORTSDIR}/archivers/bzip2 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${PREFIX}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ + GTK_CONFIG="${GTK_CONFIG}" \ LDFLAGS=-L${PREFIX}/lib .include <bsd.port.mk> --- /usr/ports.ref/graphics/sane/Makefile Sat May 22 14:15:18 1999 +++ graphics/sane/Makefile Sat May 22 15:50:12 1999 @@ -1,5 +1,5 @@ # New ports collection makefile for: sane -# Version required: 1.00 +# Version required: 1.0.1 # Date created: Sat Jul 19 16:23:10 MET DST 1997 # Whom: gary@hotlava.com # @@ -13,21 +13,23 @@ MAINTAINER= gary@hotlava.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ jpeg.9:${PORTSDIR}/graphics/jpeg +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + .include <bsd.port.pre.mk> USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes .if ${OSVERSION} < 300000 CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" + GTK_CONFIG="${GTK_CONFIG}" .else CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lcam" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" + GTK_CONFIG="${GTK_CONFIG}" .endif MAN1= scanimage.1 \ @@ -58,7 +60,6 @@ @${ECHO} "*** the GIMP and GTK packages/ports." post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib @${CAT} ${PKGDIR}/MESSAGE .include <bsd.port.post.mk> --- /usr/ports.ref/graphics/sane/patches/patch-02 Sat May 22 14:15:19 1999 +++ graphics/sane/patches/patch-02 Sat May 22 15:47:08 1999 @@ -1,42 +0,0 @@ ---- ltconfig Sat Nov 21 19:53:55 1998 -+++ ltconfig.new Thu May 13 12:44:40 1999 -@@ -604,11 +604,11 @@ - $rm conftestdata - if ln -s X conftestdata 2>/dev/null; then - $rm conftestdata -- LN_S="ln -s" -+ LN_S="ln -sf" - else - LN_S=ln - fi -- if test "$LN_S" = "ln -s"; then -+ if test "$LN_S" = "ln -sf"; then - echo "$ac_t"yes 1>&6 - else - echo "$ac_t"no 1>&6 -@@ -1123,12 +1123,24 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - --freebsd2* | freebsd3*) -+freebsd2*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix $libname.so' - finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; -+ -+freebsd3* | freebsd4*) -+ version_type=freebsd -+ library_names_spec='${libname}${release}.so.$versuffix $libname.so' -+ if [ $PORTOBJFORMAT = elf ]; then -+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir' -+ else -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - - gnu*) - version_type=sunos --- /usr/ports.ref/graphics/sane/patches/patch-03 Sat May 22 14:15:19 1999 +++ graphics/sane/patches/patch-03 Sun May 23 00:47:11 1999 @@ -1,20 +0,0 @@ ---- ltmain.sh Mon Nov 2 21:05:05 1998 -+++ ltmain.sh.new Thu May 13 12:24:53 1999 -@@ -966,6 +966,17 @@ - major="$current" - versuffix="$current.$revision" - ;; -+ freebsd) -+ version_vars="$version_vars major versuffix" -+ major="$current" -+ if [ $PORTOBJFORMAT = elf ]; then -+ versuffix="$current"; -+ else -+ versuffix="$current.$revision"; -+ fi -+ ;; -+ -+ - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 --- /usr/ports.ref/graphics/sane/pkg/PLIST Sun Dec 6 11:37:29 1998 +++ graphics/sane/pkg/PLIST Sat May 22 22:39:18 1999 @@ -19,6 +19,7 @@ etc/sane.d/ricoh.conf etc/sane.d/s9036.conf etc/sane.d/saned.conf +etc/sane.d/sharp.conf etc/sane.d/snapscan.conf etc/sane.d/tamarack.conf etc/sane.d/umax.conf @@ -37,91 +38,72 @@ lib/libsane.so lib/libsane.so.1 lib/sane/libsane-abaton.a -lib/sane/libsane-abaton.la lib/sane/libsane-abaton.so lib/sane/libsane-abaton.so.1 lib/sane/libsane-agfafocus.a -lib/sane/libsane-agfafocus.la lib/sane/libsane-agfafocus.so lib/sane/libsane-agfafocus.so.1 lib/sane/libsane-apple.a -lib/sane/libsane-apple.la lib/sane/libsane-apple.so lib/sane/libsane-apple.so.1 lib/sane/libsane-artec.a -lib/sane/libsane-artec.la lib/sane/libsane-artec.so lib/sane/libsane-artec.so.1 lib/sane/libsane-canon.a -lib/sane/libsane-canon.la lib/sane/libsane-canon.so lib/sane/libsane-canon.so.1 lib/sane/libsane-coolscan.a -lib/sane/libsane-coolscan.la lib/sane/libsane-coolscan.so lib/sane/libsane-coolscan.so.1 lib/sane/libsane-dc210.a -lib/sane/libsane-dc210.la lib/sane/libsane-dc210.so lib/sane/libsane-dc210.so.1 lib/sane/libsane-dc25.a -lib/sane/libsane-dc25.la lib/sane/libsane-dc25.so lib/sane/libsane-dc25.so.1 lib/sane/libsane-dll.a -lib/sane/libsane-dll.la lib/sane/libsane-dll.so lib/sane/libsane-dll.so.1 lib/sane/libsane-dmc.a -lib/sane/libsane-dmc.la lib/sane/libsane-dmc.so lib/sane/libsane-dmc.so.1 lib/sane/libsane-epson.a -lib/sane/libsane-epson.la lib/sane/libsane-epson.so lib/sane/libsane-epson.so.1 lib/sane/libsane-hp.a -lib/sane/libsane-hp.la lib/sane/libsane-hp.so lib/sane/libsane-hp.so.1 lib/sane/libsane-microtek.a -lib/sane/libsane-microtek.la lib/sane/libsane-microtek.so lib/sane/libsane-microtek.so.1 lib/sane/libsane-microtek2.a -lib/sane/libsane-microtek2.la lib/sane/libsane-microtek2.so lib/sane/libsane-microtek2.so.1 lib/sane/libsane-mustek.a -lib/sane/libsane-mustek.la lib/sane/libsane-mustek.so lib/sane/libsane-mustek.so.1 lib/sane/libsane-net.a -lib/sane/libsane-net.la lib/sane/libsane-net.so lib/sane/libsane-net.so.1 lib/sane/libsane-pnm.a -lib/sane/libsane-pnm.la lib/sane/libsane-pnm.so lib/sane/libsane-pnm.so.1 lib/sane/libsane-ricoh.a -lib/sane/libsane-ricoh.la lib/sane/libsane-ricoh.so lib/sane/libsane-ricoh.so.1 lib/sane/libsane-s9036.a -lib/sane/libsane-s9036.la lib/sane/libsane-s9036.so lib/sane/libsane-s9036.so.1 +lib/sane/libsane-sharp.a +lib/sane/libsane-sharp.so +lib/sane/libsane-sharp.so.1 lib/sane/libsane-snapscan.a -lib/sane/libsane-snapscan.la lib/sane/libsane-snapscan.so lib/sane/libsane-snapscan.so.1 lib/sane/libsane-tamarack.a -lib/sane/libsane-tamarack.la lib/sane/libsane-tamarack.so lib/sane/libsane-tamarack.so.1 lib/sane/libsane-umax.a -lib/sane/libsane-umax.la lib/sane/libsane-umax.so lib/sane/libsane-umax.so.1 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib --- /usr/ports.ref/graphics/xsane/Makefile Thu May 13 15:57:52 1999 +++ graphics/xsane/Makefile Thu May 13 15:42:43 1999 @@ -13,20 +13,22 @@ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ sane.1:${PORTSDIR}/graphics/sane \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff34 \ png.3:${PORTSDIR}/graphics/png +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes MAN1= xsane.1 -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.pre.mk> --- /usr/ports.ref/japanese/gicq/Makefile Wed Apr 7 16:30:53 1999 +++ japanese/gicq/Makefile Sun May 23 00:57:43 1999 @@ -18,14 +18,16 @@ MAINTAINER= flathill@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ icq.0:${PORTSDIR}/japanese/libicq +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --disable-nls -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ - LIBS="-lxpg4" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> --- /usr/ports.ref/japanese/gtkicq/Makefile Tue May 11 03:46:30 1999 +++ japanese/gtkicq/Makefile Sat May 22 22:30:57 1999 @@ -17,17 +17,18 @@ MAINTAINER= stanaka@bb.mbn.or.jp -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +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 + USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -lxpg4" \ - INSTALL_SCRIPT='$${INSTALL} -m 755' + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> --- /usr/ports.ref/math/geg/Makefile Thu Apr 22 14:49:30 1999 +++ math/geg/Makefile Fri Apr 30 01:57:11 1999 @@ -12,11 +12,10 @@ MAINTAINER= rom_glsa@ein-hashofet.co.il -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" .include <bsd.port.mk> --- /usr/ports.ref/misc/gtkfind/Makefile Thu Apr 22 14:50:24 1999 +++ misc/gtkfind/Makefile Fri Apr 30 01:58:01 1999 @@ -12,7 +12,7 @@ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 MAN1= gtkfind.1 mktmp.1 --- /usr/ports.ref/net/IglooFTP/Makefile Fri May 7 19:43:08 1999 +++ net/IglooFTP/Makefile Sat May 22 22:32:02 1999 @@ -15,11 +15,8 @@ MAINTAINER= andy@icc.surw.chel.su -LIB_DEPENDS= gdk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12:${PORTSDIR}/devel/glib12 \ - gmodule12:${PORTSDIR}/devel/glib12 \ - gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ - intl:${PORTSDIR}/devel/gettext +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ + intl.1:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes --- /usr/ports.ref/net/ethereal/Makefile Thu Apr 22 14:51:26 1999 +++ net/ethereal/Makefile Fri Apr 30 01:59:59 1999 @@ -13,12 +13,13 @@ MAINTAINER= billf@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN1= ethereal.1 --- /usr/ports.ref/net/gaim/Makefile Thu May 6 10:32:32 1999 +++ net/gaim/Makefile Mon May 10 14:45:08 1999 @@ -16,15 +16,17 @@ MAINTAINER= jim@phrantic.phear.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12.1:${PORTSDIR}/devel/glib12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ + glib12.2:${PORTSDIR}/devel/glib12 + +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= yes USE_GMAKE= yes USE_X_PREFIX= yes - -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ + GLIB_CONFIG="${GLIB_CONFIG}" post-patch: ${CP} ${DISTDIR}/logo.xpm.gz ${WRKSRC}/pixmaps --- /usr/ports.ref/net/gftp/Makefile Tue May 18 00:03:26 1999 +++ net/gftp/Makefile Tue May 18 00:32:06 1999 @@ -12,7 +12,7 @@ MAINTAINER= dmarion@open.hr -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_AUTOCONF= yes USE_X_PREFIX= yes --- /usr/ports.ref/net/gftp/patches/patch-aa Sat Apr 3 03:38:52 1999 +++ net/gftp/patches/patch-aa Mon May 10 16:25:39 1999 @@ -1,15 +1,16 @@ ---- configure.in.orig Fri Apr 2 13:12:15 1999 -+++ configure.in Fri Apr 2 13:12:21 1999 -@@ -25,7 +25,7 @@ +--- configure.in.orig Wed Mar 31 07:43:08 1999 ++++ configure.in Mon May 10 15:23:35 1999 +@@ -25,7 +25,8 @@ AC_CHECK_FUNCS(getcwd mkdir rmdir select socket strstr strtol uname) dnl Checks for libraries. -AC_CHECK_LIB(pthread, pthread_create, [], -+AC_CHECK_LIB(c_r, pthread_create, [], ++AC_CHECK_LIB(c_r, pthread_create, CFLAGS="-D_THREAD_SAFE $CFLAGS" ++ LIBS="$LIBS -pthread", [echo ; echo "Error: Cannot find the pthread libraries. If you don't have them installed," ; echo "your X libraries probably aren't thread safe either. You can download the" ; -@@ -36,7 +36,7 @@ +@@ -36,7 +37,7 @@ exit]) dnl Checks for gtk-config @@ -18,7 +19,7 @@ if test "$GTK_CONFIG" = "no"; then echo ; echo "Error: Cannot find gtk-config. Do you have gtk installed? You can download it" ; -@@ -45,9 +45,9 @@ +@@ -45,9 +46,9 @@ echo ; exit else --- /usr/ports.ref/net/gftp/patches/patch-ab Tue May 18 00:03:27 1999 +++ net/gftp/patches/patch-ab Tue May 18 00:55:34 1999 @@ -5,7 +5,7 @@ INSTALL=@INSTALL@ MACHINE=`uname -m`-`uname -p`-`uname -s` -CFLAGS=@CFLAGS@ -Wall -D_REENTRANT -DSHARE_DIR=\"$(SHARE_DIR)\" -+CFLAGS=@CFLAGS@ -pthread -DSHARE_DIR=\"$(SHARE_DIR)\" ++CFLAGS=@CFLAGS@ -DSHARE_DIR=\"$(SHARE_DIR)\" LIBS=@LIBS@ EXE=gftp OBJS=bookmarks.o cache.o chmod_dialog.o config_file.o \ --- /usr/ports.ref/net/ggsd/Makefile Thu Apr 22 14:51:33 1999 +++ net/ggsd/Makefile Wed May 5 02:04:53 1999 @@ -16,7 +16,7 @@ MAINTAINER= dima@chg.ru -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 WRKSRC= ${WRKDIR}/GGSD EXTRACT_CMD= ${TAR} --- /usr/ports.ref/net/gicq/Makefile Sat May 8 16:31:30 1999 +++ net/gicq/Makefile Mon May 10 14:51:45 1999 @@ -13,13 +13,16 @@ MAINTAINER= flathill@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ icq.0:${PORTSDIR}/net/libicq +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --disable-nls -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> --- /usr/ports.ref/net/gicq/pkg/PLIST Wed Mar 17 12:51:06 1999 +++ net/gicq/pkg/PLIST Mon May 10 14:54:57 1999 @@ -1,6 +1,6 @@ bin/gicq +share/gnome/apps/Applications/gicq.desktop 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 --- /usr/ports.ref/net/irssi/Makefile Sun May 9 22:53:54 1999 +++ net/irssi/Makefile Sun May 9 23:19:14 1999 @@ -12,7 +12,9 @@ MAINTAINER= jim@phrantic.phear.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_BZIP2= yes USE_GMAKE= yes @@ -22,8 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --without-dock --without-pthreads \ --without-socks --with-textui=none -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: @${ECHO} " " --- /usr/ports.ref/net/mtr/Makefile Mon Apr 19 10:52:04 1999 +++ net/mtr/Makefile Fri Apr 30 02:05:12 1999 @@ -26,7 +26,7 @@ CONFIGURE_ARGS=--with-gtk-prefix=/nopath .else USE_XLIB= yes -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" .endif --- /usr/ports.ref/net/wxftp/Makefile Wed Apr 21 10:46:26 1999 +++ net/wxftp/Makefile Wed May 5 01:38:07 1999 @@ -16,7 +16,7 @@ MAINTAINER= kris@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 WRKSRC= ${WRKDIR}/${PKGNAME}/src USE_GMAKE= yes --- /usr/ports.ref/net/xchat/Makefile Sun May 9 22:55:06 1999 +++ net/xchat/Makefile Sun May 9 23:21:35 1999 @@ -14,15 +14,16 @@ MAINTAINER= jim@phrantic.phear.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +USE_X_PREFIX= yes USE_GMAKE= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" - -USE_X_PREFIX= yes +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: strip ${PREFIX}/bin/xchat --- /usr/ports.ref/net/xwhois/Makefile Mon Apr 26 11:16:40 1999 +++ net/xwhois/Makefile Wed May 5 02:03:18 1999 @@ -17,11 +17,13 @@ MAINTAINER= kris@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xwhois ${PREFIX}/bin --- /usr/ports.ref/print/pdq/Makefile Mon May 17 12:32:38 1999 +++ print/pdq/Makefile Sat May 22 22:36:20 1999 @@ -13,11 +13,14 @@ MAINTAINER= yinjieh@csie.nctu.edu.tw -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" +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 @@ -29,11 +32,6 @@ strip ${PREFIX}/bin/lpd_cancel strip ${PREFIX}/bin/lpd_print strip ${PREFIX}/bin/lpd_status - @${ECHO} '*******************************************************' - @${ECHO} '* *' - @${ECHO} '* Please copy /usr/local/etc/printrc.sample to *' - @${ECHO} '* /usr/local/etc/printrc by yourself, thanks. *' - @${ECHO} '* *' - @${ECHO} '*******************************************************' + @${CAT} pkg/MESSAGE .include <bsd.port.mk> --- /usr/ports.ref/print/pdq/pkg/MESSAGE Thu Jan 1 02:00:00 1970 +++ print/pdq/pkg/MESSAGE Sat May 22 22:35:56 1999 @@ -0,0 +1,6 @@ +******************************************************* +* * +* Please copy /usr/local/etc/printrc.sample to * +* /usr/local/etc/printrc by yourself, thanks. * +* * +******************************************************* --- /usr/ports.ref/security/gtkportscan/Makefile Thu Mar 18 10:53:23 1999 +++ security/gtkportscan/Makefile Wed May 5 02:26:40 1999 @@ -12,7 +12,7 @@ MAINTAINER= cpiazza@home.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 WRKSRC= ${WRKDIR}/gtkscan --- /usr/ports.ref/security/gtkportscan/patches/patch-aa Thu Mar 18 10:53:23 1999 +++ security/gtkportscan/patches/patch-aa Wed May 5 02:28:54 1999 @@ -18,13 +18,14 @@ install: - cp portscan /usr/local/bin - cp gtkportscan /usr/X11/bin -+ ${BSD_INSTALL_PROGRAM} portscan /usr/local/bin -+ ${BSD_INSTALL_PROGRAM} gtkportscan /usr/local/bin ++ ${BSD_INSTALL_PROGRAM} portscan ${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} gtkportscan ${PREFIX}/bin clean: rm -f portscan gtkportscan uninstall: - rm -f /usr/local/bin/portscan +- rm -f /usr/local/bin/portscan ++ rm -f ${PREFIX}/bin/portscan - rm -f /usr/X11/bin/gtkportscan -+ rm -f /usr/local/bin/gtkportscan ++ rm -f ${PREFIX}/bin/gtkportscan --- /usr/ports.ref/security/nessus/Makefile Mon May 17 12:26:38 1999 +++ security/nessus/Makefile Sat May 22 23:03:41 1999 @@ -22,10 +22,12 @@ MAINTAINER= anders@fix.no -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= yes -CONFIGURE_ENV= GTKCONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" MAN1= nessus.1 post-install: --- /usr/ports.ref/sysutils/xlogmaster/Makefile Mon Apr 19 10:55:53 1999 +++ sysutils/xlogmaster/Makefile Fri May 14 02:07:15 1999 @@ -16,20 +16,19 @@ MAINTAINER= aw1@stade.co.uk -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config NO_PACKAGE= ignores CFLAGS GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" USE_XLIB= yes USE_GMAKE= yes MAN1= xlogmaster.1 post-install: - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi @install-info ${PREFIX}/info/xlogmaster.info ${PREFIX}/info/dir ${INSTALL_DATA} ${FILESDIR}/xlogmasterrc ${PREFIX}/etc/xlogmaster --- /usr/ports.ref/sysutils/xlogmaster/pkg/PLIST Mon Apr 19 10:55:53 1999 +++ sysutils/xlogmaster/pkg/PLIST Fri May 14 03:17:35 1999 @@ -30,7 +30,6 @@ etc/xlogmaster/xlogmasterrc @unexec install-info --delete %D/info/xlogmaster.info %D/info/dir info/xlogmaster.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/xlogmaster.info %D/info/dir @dirrm etc/xlogmaster/database @dirrm etc/xlogmaster/output-plugins --- /usr/ports.ref/sysutils/xwatch/Makefile Thu Apr 22 14:55:49 1999 +++ sysutils/xwatch/Makefile Wed May 5 02:39:35 1999 @@ -12,11 +12,13 @@ MAINTAINER= mph@freebsd.org -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: .if !defined(NOPORTDOCS) --- /usr/ports.ref/x11-clocks/asclock-gtk/Makefile Sat May 8 16:09:31 1999 +++ x11-clocks/asclock-gtk/Makefile Sat May 22 22:45:41 1999 @@ -13,7 +13,7 @@ MAINTAINER= kuriyama@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 HAS_CONFIGURE= YES WRKSRC= ${WRKDIR}/asclock-gtk --- /usr/ports.ref/x11-fm/dfm/Makefile Sat May 1 22:29:17 1999 +++ x11-fm/dfm/Makefile Fri May 7 02:15:26 1999 @@ -13,17 +13,14 @@ MAINTAINER= andy@icc.surw.chel.su LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - intl.1:${PORTSDIR}/devel/gettext \ - gmodule12.1:${PORTSDIR}/devel/glib12 \ - glib12.1:${PORTSDIR}/devel/glib12 \ - gdk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ - gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 + gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${X11BASE}/include" GTK_CONFIG="${X11BASE}/bin/gtk12-config" +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -# depends on xforms -ONLY_FOR_ARCHS= i386 +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" USE_X_PREFIX= yes --- /usr/ports.ref/x11-toolkits/gtk--/Makefile Thu May 13 16:12:34 1999 +++ x11-toolkits/gtk--/Makefile Sun May 23 01:02:45 1999 @@ -13,15 +13,25 @@ MAINTAINER= nacai@iname.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 400004 +BUILD_DEPENDS= eg++:${PORTSDIR}/lang/egcs +CC= egcc +CXX= eg++ +.endif + USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \ @@ -58,4 +68,4 @@ ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \ _gtk_string.3 gtkmm_add_signal_class.3 -.include <bsd.port.mk> +.include <bsd.port.post.mk> --- /usr/ports.ref/x11-toolkits/gtk12/Makefile Mon May 3 14:30:36 1999 +++ x11-toolkits/gtk12/Makefile Sat May 15 18:44:43 1999 @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk12 -# Version required: 1.2.2 +# Version required: 1.2.3 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.49 1999/05/02 05:21:19 kuriyama Exp $ # -DISTNAME= gtk+-1.2.2 -PKGNAME= gtk-1.2.2 +DISTNAME= gtk+-1.2.3 +PKGNAME= gtk-1.2.3 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ @@ -15,15 +15,18 @@ MAINTAINER= vanilla@FreeBSD.ORG -LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 \ +LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \ intl.1:${PORTSDIR}/devel/gettext +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config + USE_X_PREFIX= yes USE_PERL5= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ + X_CFLAGS="-I${LOCALBASE}/include" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gtk12-config.1 @@ -33,16 +36,5 @@ post-install: @${MKDIR} ${PREFIX}/share/themes/engines - @if [ ! -f ${PREFIX}/share/info ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - @${ECHO} '*********************************************************' - @${ECHO} '* *' - @${ECHO} '* If you want to use autoconf with gtk, *' - @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *' - @${ECHO} '* by yourself, thanks. *' - @${ECHO} '* *' - @${ECHO} '*********************************************************' .include <bsd.port.mk> --- /usr/ports.ref/x11-toolkits/gtk12/files/md5 Mon May 3 14:30:36 1999 +++ x11-toolkits/gtk12/files/md5 Sat May 15 18:49:50 1999 @@ -1 +1 @@ -MD5 (gtk+-1.2.2.tar.gz) = 2776dca7d9f907b7b851ac9a4d4fb304 +MD5 (gtk+-1.2.3.tar.gz) = 51d880fc05a99861be4abe161adaaddd --- /usr/ports.ref/x11-toolkits/gtk12/patches/patch-aa Sat Mar 27 13:55:44 1999 +++ x11-toolkits/gtk12/patches/patch-aa Sun May 23 00:55:59 1999 @@ -1,36 +1,36 @@ ---- Makefile.in.orig Sun Jan 31 23:26:39 1999 -+++ Makefile.in Sun Jan 31 23:31:06 1999 -@@ -126,7 +126,7 @@ +--- Makefile.in.orig Tue May 11 06:11:20 1999 ++++ Makefile.in Mon May 17 22:58:32 1999 +@@ -127,7 +127,7 @@ SRC_SUBDIRS = gdk gtk SUBDIRS = po $(SRC_SUBDIRS) docs -bin_SCRIPTS = gtk-config -+bin_SCRIPTS = gtk12-config ++bin_SCRIPTS = gtk@LT_RELEASE@-config EXTRA_DIST = HACKING gtk+.spec.in gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/calendar/Makefile examples/calendar/gcalendar.c examples/clist/Makefile examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/hello! world2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/itemfactory.c examples/notebook/Makefile examples/notebook/notebook.c examples/packbox/Makefile examples/packbox/packbox.c examples/packer/Makefile examples/packer/pack.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rangewidgets/Makefile examples/rangewidgets/rangewidgets.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c! examples/table/Makefile examples/table/table.c examples/text/Ma kefile examples/text/text.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/tree/Makefile examples/tree/tree.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c examples/fixed/Makefile examples/frame/frame.c examples/frame/Makefile examples/spinbutton/spinbutton.c examples/spinbutton/Makefile examples/find-examples.sh -@@ -136,7 +136,7 @@ +@@ -137,7 +137,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = gtk+.spec gtk-config -+CONFIG_CLEAN_FILES = gtk-config ++CONFIG_CLEAN_FILES = gtk+.spec gtk@LT_RELEASE@-config SCRIPTS = $(bin_SCRIPTS) DATA = $(m4data_DATA) -@@ -198,7 +198,10 @@ +@@ -199,7 +199,10 @@ maintainer-clean-hdr: gtk+.spec: $(top_builddir)/config.status gtk+.spec.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -gtk-config: $(top_builddir)/config.status gtk-config.in -+gtk12-config.in: gtk-config.in -+ cp gtk-config.in gtk12-config.in ++gtk@LT_RELEASE@-config.in: gtk-config.in ++ cp gtk-config.in gtk@LT_RELEASE@-config.in + -+gtk12-config: $(top_builddir)/config.status gtk12-config.in ++gtk@LT_RELEASE@-config: $(top_builddir)/config.status gtk@LT_RELEASE@-config.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status install-binSCRIPTS: $(bin_SCRIPTS) -@@ -407,7 +410,6 @@ +@@ -408,7 +411,6 @@ || exit 1; \ fi; \ done @@ -38,76 +38,17 @@ info-am: info: info-recursive dvi-am: -@@ -422,13 +424,13 @@ - install-exec-am: install-binSCRIPTS - install-exec: install-exec-recursive - --install-data-am: install-m4dataDATA -+install-data-am: - install-data: install-data-recursive - - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive --uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA -+uninstall-am: uninstall-binSCRIPTS - uninstall: uninstall-recursive - all-am: Makefile $(SCRIPTS) $(DATA) config.h - all-redirect: all-recursive-am ---- gdk/Makefile.in.orig Sun Jan 31 23:33:26 1999 -+++ gdk/Makefile.in Sun Jan 31 23:35:01 1999 -@@ -125,7 +125,7 @@ - - gdkincludedir = $(includedir)/gdk - --lib_LTLIBRARIES = libgdk.la -+lib_LTLIBRARIES = libgdk12.la - - INCLUDES = -DG_LOG_DOMAIN=\"Gdk\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ - -@@ -139,7 +139,7 @@ - LDADDS = @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm - - --libgdk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm -+libgdk_la_LDFLAGS = -version-info 1:0:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm - - - EXTRA_PROGRAMS = gxid -@@ -265,7 +265,7 @@ - - maintainer-clean-libtool: - --libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES) -+libgdk12.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS) - - mostlyclean-binPROGRAMS: ---- gtk/Makefile.in.orig Sun Jan 31 23:35:10 1999 -+++ gtk/Makefile.in Sun Jan 31 23:37:31 1999 -@@ -127,7 +127,7 @@ - - gtkincludedir = $(includedir)/gtk - --lib_LTLIBRARIES = libgtk.la -+lib_LTLIBRARIES = libgtk12.la - - static_SOURCES = gtkaccelgroup.c gtkaccellabel.c gtkadjustment.c gtkalignment.c gtkarg.c gtkarrow.c gtkaspectframe.c gtkbin.c gtkbindings.c gtkbbox.c gtkbox.c gtkbutton.c gtkcalendar.c gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c gtkcolorsel.c gtkcombo.c gtkcontainer.c gtkctree.c gtkcurve.c gtkdata.c gtkdialog.c gtkdnd.c gtkdrawingarea.c gtkeditable.c gtkentry.c gtkeventbox.c gtkfilesel.c gtkfixed.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkimage.c gtkinputdialog.c gtkintl.h gtkinvisible.c gtkitem.c gtkitemfactory.c gtklabel.c gtklayout.c gtklist.c gtklistitem.c gtkmain.c gtkmenu.c gtkmenubar.c gtkmenufactory.c gtkmenuitem.c gtkmenushell.c gtkmisc.c gtknotebook.c gtkobject.c gtkoptionmenu.c gtkpacker.c gtkpaned.c gtkpixmap.c! gtkplug.c gtkpreview.c gtkprogress.c gtkprogressbar.c gtkradiobutton.c gtkradiomenuitem.c gtkrange.c gtkrc.c gtkruler.c gtkscale.c gtkscrollbar.c gtkscrolledwindow.c gtkselection.c gtkseparator.c gtksignal.c gtksocket.c gtkspinbutton.c gtkstyle.c gtkstatusbar.c gtktable.c gtktearoffmenuitem.c gtktext.c gtkthemes.c gtktipsquery.c gtktogglebutton.c gtktoolbar.c gtktooltips.c gtktree.c gtktreeitem.c gtktypeutils.c gtkvbbox.c gtkvbox.c gtkviewport.c gtkvpaned.c gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c gtkwindow.c fnmatch.c fnmatch.h - -@@ -152,26 +152,26 @@ - gdk_headers = ../gdk/gdktypes.h ../gdk/gdkrgb.h - - --libgtk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm -+libgtk_la_LDFLAGS = -version-info 1:0:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm +--- gtk/Makefile.in.orig Tue May 11 06:11:28 1999 ++++ gtk/Makefile.in Mon May 17 22:58:32 1999 +@@ -157,13 +157,13 @@ # $(top_builddir)/gdk/libgdk.la -gtkconfdir = $(sysconfdir)/gtk +gtkconfdir = $(datadir)/themes/Default/gtk - gtkconf_DATA = gtkrc gtkrc.ja gtkrc.ko gtkrc.ru + gtkconf_DATA = gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.iso-8859-2 - EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtk.1 testgtkrc testgtkrc2 gtkfeatures.h.in makeenums.pl makeenums.awk maketypes.awk makeenums.h gtkargcollector.c gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtk-boxed.defs gtk.defs genmarshal.pl gtkmarshal.list check-y.xpm check-n.xpm test.xpm marble.xpm 3DRings.xpm FilesQueue.xpm Modeller.xpm tree_plus.xpm tree_minus.xpm tree_plus.xbm tree_minus.xbm circles.xbm gtkrc.ja gtkrc.ko gtkrc.ru + EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtk.1 testgtkrc testgtkrc2 gtkfeatures.h.in makeenums.pl makeenums.awk maketypes.awk makeenums.h gtkargcollector.c gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtk-boxed.defs gtk.defs genmarshal.pl gtkmarshal.list check-y.xpm check-n.xpm test.xpm marble.xpm 3DRings.xpm FilesQueue.xpm Modeller.xpm tree_plus.xpm tree_minus.xpm tree_plus.xbm tree_minus.xbm circles.xbm gtkrc.iso-8859-2 gtkrc.ja gtkrc.ko gtkrc.ru -INCLUDES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ @@ -115,27 +56,7 @@ noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple - # testthreads - --DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la -+DEPS = libgtk12.la $(top_builddir)/gdk/libgdk12.la - - --LDADDS = libgtk.la $(top_builddir)/gdk/libgdk.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm -+LDADDS = libgtk12.la $(top_builddir)/gdk/libgdk12.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm - - - testgtk_DEPENDENCIES = $(DEPS) -@@ -342,7 +342,7 @@ - - maintainer-clean-libtool: - --libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES) -+libgtk12.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS) - - mostlyclean-noinstPROGRAMS: -@@ -478,7 +478,7 @@ +@@ -479,7 +479,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \ uninstall-gtkincludeHEADERS uninstall-local uninstall: uninstall-am @@ -144,27 +65,8 @@ all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -@@ -599,17 +599,11 @@ - && echo timestamp > stamp-m - - gtkrc: -- : -- --# We create a dummy theme for the default GTK+ theme -+ echo "# Empty gtkrc for default theme" > gtkrc - - install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk -- echo "# Empty gtkrc for default theme" > \ -- $(DESTDIR)$(datadir)/themes/Default/gtk/gtkrc - - uninstall-local: -- rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc - - .PHONY: files test test-debug - ---- docs/Makefile.in.orig Thu Feb 25 22:17:02 1999 -+++ docs/Makefile.in Tue Mar 2 11:39:50 1999 +--- docs/Makefile.in.orig Tue May 11 06:13:29 1999 ++++ docs/Makefile.in Mon May 17 22:58:33 1999 @@ -99,7 +99,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ @@ -173,31 +75,31 @@ +MAKEINFO = @MAKEINFO@ --no-split MKINSTALLDIRS = @MKINSTALLDIRS@ NM = @NM@ - PACKAGE = @PACKAGE@ -@@ -125,7 +125,7 @@ + OBJDUMP = @OBJDUMP@ +@@ -126,7 +126,7 @@ info_TEXINFOS = gdk.texi gtk.texi -man_MANS = gtk-config.1 -+man_MANS = gtk12-config.1 ++man_MANS = gtk@LT_RELEASE@-config.1 TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html html/gtk_tut_fr-2.html html/gtk_tut_fr-3.html html/gtk_tut_fr-4.html html/gtk_tut_fr-5.html html/gtk_tut_fr-6.html html/gtk_tut_fr-7.html html/gtk_tut_fr-8.html html/gtk_tut_fr-9.html html/gtk_tut_fr-10.html html/gtk_tut_fr-11.html html/gtk_tut_fr-12.html html/gtk_tut_fr-13.html html/gtk_tut_fr-14.html html/gtk_tut_fr-15.html html/gtk_tut_fr-16.html html/gtk_tut_fr-17.html html/gtk_tut_fr-18.html html/gtk_tut_fr-19.html html/gtk_tut_fr-20.html html/gtk_tut_fr-21.html html/gtk_tut_fr-22.html html/gtk_tut_fr-23.html html/gtk_tut_fr-24.html html/gtk_tut_fr.html text/gtk_tut_fr.txt -@@ -139,7 +139,7 @@ +@@ -140,7 +140,7 @@ FAQ_FILES = html/gtkfaq.html html/gtkfaq-1.html html/gtkfaq-2.html html/gtkfaq-3.html html/gtkfaq-4.html html/gtkfaq-5.html html/gtkfaq-6.html html/gtkfaq-7.html text/gtkfaq.txt -EXTRA_DIST = gtk-config.1.in texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES) -+EXTRA_DIST = gtk12-config.1.in texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES) ++EXTRA_DIST = gtk@LT_RELEASE@-config.1.in texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h -@@ -177,6 +177,8 @@ +@@ -180,6 +180,8 @@ gtk.info: gtk.texi gtk.dvi: gtk.texi -+gtk12-config.1: gtk-config.1 -+ cp gtk-config.1 gtk12-config.1 ++gtk@LT_RELEASE@-config.1: gtk-config.1 ++ cp gtk-config.1 gtk@LT_RELEASE@-config.1 DVIPS = dvips --- /usr/ports.ref/x11-toolkits/gtk12/patches/patch-ab Tue Mar 9 03:09:08 1999 +++ x11-toolkits/gtk12/patches/patch-ab Sun May 23 00:56:19 1999 @@ -5,7 +5,7 @@ { cat <<EOF -Usage: gtk-config [OPTIONS] [LIBRARIES] -+Usage: gtk12-config [OPTIONS] [LIBRARIES] ++Usage: gtk@LT_RELEASE@-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] @@ -14,6 +14,6 @@ done - echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm -+ echo $libdirs @x_ldflags@ -lgtk12 -lgdk12 $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm ++ echo $libdirs @x_ldflags@ -lgtk@LT_RELEASE@ -lgdk@LT_RELEASE@ $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm fi --- /usr/ports.ref/x11-toolkits/gtk12/patches/patch-ad Mon May 3 14:30:36 1999 +++ x11-toolkits/gtk12/patches/patch-ad Sat May 15 19:02:07 1999 @@ -1,5 +1,5 @@ ---- gtk/gtkrc.c.orig Wed Apr 14 05:20:09 1999 -+++ gtk/gtkrc.c Sun May 2 13:27:23 1999 +--- gtk/gtkrc.c.orig Tue May 11 04:31:09 1999 ++++ gtk/gtkrc.c Sat May 15 19:01:44 1999 @@ -231,9 +231,9 @@ var = getenv("GTK_EXE_PREFIX"); @@ -38,8 +38,8 @@ var = g_get_home_dir (); if (var) -- path = g_strdup_printf("%s%s", var, ".gtk/lib/themes/engines"); -+ path = g_strdup_printf("%s%s", var, ".gtk/themes/engines"); +- path = g_strdup_printf("%s%s", var, "/.gtk/lib/themes/engines"); ++ path = g_strdup_printf("%s%s", var, "/.gtk/themes/engines"); module_path[n++] = g_strdup(path); module_path[n] = NULL; g_free(path); --- /usr/ports.ref/x11-toolkits/gtk12/patches/patch-ae Tue Mar 9 03:09:08 1999 +++ x11-toolkits/gtk12/patches/patch-ae Mon May 17 22:59:55 1999 @@ -1,6 +1,21 @@ ---- configure.orig Thu Feb 25 13:02:28 1999 -+++ configure Tue Mar 2 11:11:14 1999 -@@ -3977,7 +3977,7 @@ +--- configure.orig Tue May 11 05:42:09 1999 ++++ configure Mon May 17 22:59:13 1999 +@@ -606,10 +606,10 @@ + + + # libtool versioning +-LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION +-LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE` +-LT_REVISION=$GTK_INTERFACE_AGE +-LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE` ++LT_RELEASE=12 ++LT_CURRENT=2 ++LT_REVISION=0 ++LT_AGE=0 + + + +@@ -3689,7 +3689,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,3 +24,20 @@ fi rm -f conftest* INSTOBJEXT=.mo +@@ -3699,7 +3699,7 @@ + # Added by Martin Baulig 12/15/98 for libc5 systems + if test "$gt_cv_func_dgettext_libc" != "yes" \ + && test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS=-lintl ++ INTLLIBS="-lintl -lxpg4" + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + fi + +@@ -4446,6 +4446,7 @@ + glib_thread_cflags="$GLIB_CFLAGS" + glib_libs=`$GLIB_CONFIG glib gmodule --libs` + glib_thread_libs="$GLIB_LIBS" ++ GLIB_CFLAGS="$glib_cflags" + GLIB_LIBS="$glib_libs" + GLIB_DEPLIBS="$glib_libs" + else --- /usr/ports.ref/x11-toolkits/gtk12/pkg/PLIST Tue Mar 9 03:09:08 1999 +++ x11-toolkits/gtk12/pkg/PLIST Sat May 15 19:23:30 1999 @@ -123,23 +123,24 @@ @unexec install-info --delete %D/info/gtk.info %D/info/dir info/gdk.info info/gtk.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir lib/libgdk12.a -lib/libgdk12.la lib/libgdk12.so -lib/libgdk12.so.1 +lib/libgdk12.so.2 lib/libgtk12.a -lib/libgtk12.la lib/libgtk12.so -lib/libgtk12.so.1 +lib/libgtk12.so.2 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +share/aclocal/gtk.m4 +share/locale/ca/LC_MESSAGES/gtk+.mo share/locale/cs/LC_MESSAGES/gtk+.mo share/locale/de/LC_MESSAGES/gtk+.mo share/locale/es/LC_MESSAGES/gtk+.mo +share/locale/fi/LC_MESSAGES/gtk+.mo share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/hr/LC_MESSAGES/gtk+.mo share/locale/hu/LC_MESSAGES/gtk+.mo share/locale/it/LC_MESSAGES/gtk+.mo share/locale/ja/LC_MESSAGES/gtk+.mo @@ -149,11 +150,22 @@ share/locale/pl/LC_MESSAGES/gtk+.mo share/locale/pt/LC_MESSAGES/gtk+.mo share/locale/ru/LC_MESSAGES/gtk+.mo +share/locale/sk/LC_MESSAGES/gtk+.mo +share/locale/sl/LC_MESSAGES/gtk+.mo share/locale/sv/LC_MESSAGES/gtk+.mo +share/locale/wa/LC_MESSAGES/gtk+.mo +share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc +share/themes/Default/gtk/gtkrc.cs +share/themes/Default/gtk/gtkrc.hr +share/themes/Default/gtk/gtkrc.hu +share/themes/Default/gtk/gtkrc.iso-8859-2 share/themes/Default/gtk/gtkrc.ja share/themes/Default/gtk/gtkrc.ko +share/themes/Default/gtk/gtkrc.pl share/themes/Default/gtk/gtkrc.ru +share/themes/Default/gtk/gtkrc.sk +share/themes/Default/gtk/gtkrc.sl @exec mkdir -p %D/share/themes/engines @dirrm share/themes/Default/gtk @dirrm share/themes/Default @@ -162,3 +174,4 @@ @dirrm include/gtk12/gdk @dirrm include/gtk12/gtk @dirrm include/gtk12 +@unexec rmdir %D/share/aclocal 2>/dev/null || true --- /usr/ports.ref/x11-toolkits/gtkgl/Makefile Thu Apr 22 14:58:54 1999 +++ x11-toolkits/gtkgl/Makefile Fri May 14 03:18:53 1999 @@ -13,17 +13,13 @@ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ MesaGL.14:${PORTSDIR}/graphics/Mesa3 -BUILD_DEPENDS= ${LOCALBASE}/share/libtool/ltconfig:${PORTSDIR}/devel/libtool/ -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-Mesa=yes -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -pre-install: - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi +USE_LIBTOOL= yes +CONFIGURE_ARGS= --with-Mesa=yes +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> --- /usr/ports.ref/x11-toolkits/gtkgl/patches/patch-aa Thu Apr 22 14:58:54 1999 +++ x11-toolkits/gtkgl/patches/patch-aa Mon May 10 18:43:41 1999 @@ -1,94 +1,20 @@ -*** configure.orig Sat Apr 18 13:25:08 1998 ---- configure Mon Feb 1 22:56:18 1999 -*************** -*** 1330,1337 **** - # Actually configure libtool. ac_aux_dir is where install-sh is found. - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -! ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ -! $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - - ---- 1330,1337 ---- - # Actually configure libtool. ac_aux_dir is where install-sh is found. - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -! ${CONFIG_SHELL-/bin/sh} ${LOCALBASE}/share/libtool/ltconfig \ -! $libtool_flags --no-verify ${LOCALBASE}/share/libtool//ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - - -*************** -*** 1397,1414 **** - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then -! GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then -! GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - -! # Extract the first word of "gtk-config", so it can be a program name with args. -! set dummy gtk-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:1414: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then ---- 1397,1414 ---- - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then -! GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then -! GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config - fi - fi - -! # Extract the first word of "gtk12-config", so it can be a program name with args. -! set dummy gtk12-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:1414: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then -*************** -*** 2456,2462 **** - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lGL ${last_LDFLAGS} $LIBS" - cat > conftest.$ac_ext <<EOF - #line 2462 "configure" - #include "confdefs.h" ---- 2456,2462 ---- - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lGL -lXext ${last_LDFLAGS} $LIBS" - cat > conftest.$ac_ext <<EOF - #line 2462 "configure" - #include "confdefs.h" -*************** -*** 2536,2542 **** - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lGLU ${last_LDFLAGS} $LIBS" - cat > conftest.$ac_ext <<EOF - #line 2542 "configure" - #include "confdefs.h" ---- 2536,2542 ---- - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lGLU -lXext -lGL ${last_LDFLAGS} $LIBS" - cat > conftest.$ac_ext <<EOF - #line 2542 "configure" - #include "confdefs.h" +--- configure.orig Sat Apr 18 05:55:08 1998 ++++ configure Wed May 5 03:00:01 1999 +@@ -2456,7 +2456,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lGL ${last_LDFLAGS} $LIBS" ++LIBS="-lGL -lXext ${last_LDFLAGS} $LIBS" + cat > conftest.$ac_ext <<EOF + #line 2462 "configure" + #include "confdefs.h" +@@ -2536,7 +2536,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lGLU ${last_LDFLAGS} $LIBS" ++LIBS="-lGLU -lXext -lGL ${last_LDFLAGS} $LIBS" + cat > conftest.$ac_ext <<EOF + #line 2542 "configure" + #include "confdefs.h" --- /usr/ports.ref/x11-toolkits/gtkgl/pkg/PLIST Sun Sep 20 23:25:15 1998 +++ x11-toolkits/gtkgl/pkg/PLIST Sat May 22 16:44:42 1999 @@ -10,16 +10,14 @@ include/gtkGL/gtkGLmain.h @unexec install-info --delete %D/info/gtkGL.info %D/info/dir info/gtkGL.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gtkGL.info %D/info/dir lib/libgdkGL.a -lib/libgdkGL.la lib/libgdkGL.so lib/libgdkGL.so.0.9 lib/libgtkGL.a -lib/libgtkGL.la lib/libgtkGL.so lib/libgtkGL.so.0.9 -@exec /sbin/ldconfig -m %D/lib +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm include/gtkGL @dirrm include/gdkGL >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199905222316.BAA48643>