Index: head/MOVED =================================================================== --- head/MOVED (revision 87213) +++ head/MOVED (revision 87214) @@ -1,518 +1,521 @@ # # MOVED - a list of (recently) moved or removed ports # # $FreeBSD$ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: # # Port: A port that was moved (category/portname). # Moved to: Where the port was moved to, or which port users # can and should migrate to (category/portname). # Blank indicates that the port was deleted. # Date: When the moving or the removal was done (YYYY-MM-DD, # in PST/PDT). # Why: The reason why the port was moved or removed. # # Keep this list sorted in the chronological order. New entries must # be added at the tail. # # Port|Moved to|Date|Why net/ratoolset|net/irrtoolset|2002-11-16|software was renamed chinese/linux-netscape47-communicator||2002-11-17|security vulnerability chinese/linux-netscape47-navigator||2002-11-17|security vulnerability chinese/netscape47-communicator||2002-11-17|security vulnerability chinese/netscape47-navigator||2002-11-17|security vulnerability japanese/eb2||2003-03-28|obsoleted by japanese/eb japanese/linux-netscape47-communicator|japanese/netscape48-communicator|2002-11-17|security vulnerability japanese/linux-netscape47-navigator|japanese/netscape48-navigator|2002-11-17|security vulnerability japanese/netscape-fonts|japanese/alias-fonts|2002-11-17|obsoleted by alias-fonts japanese/netscape3.language||2002-11-17|security vulnerability japanese/netscape4-communicator|japanese/netscape48-communicator|2002-11-17|security vulnerability japanese/netscape4-navigator|japanese/netscape48-navigator|2002-11-17|security vulnerability japanese/netscape47-communicator|japanese/netscape48-communicator|2002-11-17|security vulnerability japanese/netscape47-navigator|japanese/netscape48-navigator|2002-11-17|security vulnerability korean/linux-netscape47-communicator|korean/netscape48-communicator|2002-11-27|security vulnerability korean/linux-netscape47-navigator|korean/netscape48-navigator|2002-11-27|security vulnerability korean/netscape3||2002-11-17|security vulnerability korean/netscape4-communicator|korean/netscape48-communicator|2002-11-27|security vulnerability korean/netscape4-navigator|korean/netscape48-navigator|2002-11-27|security vulnerability korean/netscape47-communicator|korean/netscape48-communicator|2002-11-27|security vulnerability korean/netscape47-navigator|korean/netscape48-navigator|2002-11-27|security vulnerability russian/netscape4.language||2002-11-17|security vulnerability www/linux-netscape4|www/netscape48-navigator|2002-11-17|security vulnerability www/linux-netscape47-communicator|www/netscape48-communicator|2002-11-17|security vulnerability www/linux-netscape47-navigator|www/netscape48-navigator|2002-11-17|security vulnerability www/netscape3||2002-11-17|security vulnerability www/netscape3-gold||2002-11-17|security vulnerability www/netscape4-communicator|www/netscape48-communicator|2002-11-17|security vulnerability www/netscape4-communicator.us|www/netscape48-communicator|2002-11-17|security vulnerability www/netscape4-navigator|www/netscape48-navigator|2002-11-17|security vulnerability www/netscape47-communicator|www/netscape48-communicator|2002-11-17|security vulnerability www/netscape47-navigator|www/netscape48-navigator|2002-11-17|security vulnerability japanese/mhonarc|www/mhonarc|2002-11-17|current www/mhonarc could use Japanese graphics/linux_mesa||2002-11-17|Port was broken and out of date audio/cdrdao|sysutils/cdrdao|2002-11-18|misfiled, burns data CDs too sysutils/pkgview|sysutils/gnome-pkgview|2002-11-20|author has changed the binary and package name japanese/tvi||2002-11-21|development discontinued and distfile unavailable textproc/pt-aspell|portuguese/aspell|2002-11-21|new category math/p5-Math-Financial|finance/p5-Math-Financial|2002-11-21|new category graphics/xmms-avi|multimedia/xmms-avi|2002-11-21|new category misc/qhacc|finance/qhacc|2002-11-21|new category textproc/br-ispell|portuguese/ispell-pt_BR|2002-11-22|new category french/cups||2002-11-23|deleted since not supportable under cups 1.1.16 french/cups-base||2002-11-23|deleted since not supportable under cups 1.1.16 french/cups-lpr||2002-11-23|deleted since not supportable under cups 1.1.16 korean/w3m|www/w3m-m17n|2002-11-23|www/w3m-m17n could handle Korean korean/gaim|net/gaim|2002-11-24|net/gaim could handle Korean palm/xcopilot|ports/pose|2002-11-24|pose supersceded xcopilot www/libxpg4-ns||2002-11-24|needless since all native netscapes are removed textproc/pspell-ispell||2002-11-28|this plugin was obsoleted by aspell audio/linux-realplayer|multimedia/linux-realplayer|2002-11-28|new category audio/xmms|multimedia/xmms|2002-11-28|new category graphics/avifile|multimedia/avifile|2002-11-28|new category graphics/divx4linux4|multimedia/linux-divx4linux4|2002-11-28|new category graphics/divx4linux|multimedia/linux-divx4linux|2002-11-28|new category graphics/ffmpeg|multimedia/ffmpeg|2002-11-28|new category graphics/gstreamer-player|multimedia/gstreamer-player|2002-11-28|new category graphics/gstreamer-plugins|multimedia/gstreamer-plugins|2002-11-28|new category graphics/gstreamer|multimedia/gstreamer|2002-11-28|new category graphics/gsubedit|multimedia/gsubedit|2002-11-28|new category graphics/libdivxdecore-devel|multimedia/libdivxdecore-devel|2002-11-28|new category graphics/libdivxdecore|multimedia/libdivxdecore|2002-11-28|new category graphics/libdivxencore|multimedia/libdivxencore|2002-11-28|new category graphics/libdvdcss|multimedia/libdvdcss|2002-11-28|new category graphics/libdvdread|multimedia/libdvdread|2002-11-28|new category graphics/libdv|multimedia/libdv|2002-11-28|new category graphics/libmovtar|multimedia/libmovtar|2002-11-28|new category graphics/libmpeg2|multimedia/libmpeg2|2002-11-28|new category graphics/linux-divxplayer|multimedia/linux-divxplayer|2002-11-28|new category graphics/mjpegtools|multimedia/mjpegtools|2002-11-28|new category graphics/mpeg4ip|multimedia/mpeg4ip|2002-11-28|new category graphics/mplayer-fonts|multimedia/mplayer-fonts|2002-11-28|new category graphics/mplayer-skins|multimedia/mplayer-skins|2002-11-28|new category graphics/mplayer|multimedia/mplayer|2002-11-28|new category graphics/ogle-gui|multimedia/ogle-gui|2002-11-28|new category graphics/ogle|multimedia/ogle|2002-11-28|new category graphics/ogmtools|multimedia/ogmtools|2002-11-28|new category graphics/okle|multimedia/okle|2002-11-28|new category graphics/openquicktime|multimedia/openquicktime|2002-11-28|new category graphics/oqtencoder|multimedia/oqtencoder|2002-11-28|new category graphics/oqtplayer|multimedia/oqtplayer|2002-11-28|new category graphics/win32-codecs|multimedia/win32-codecs|2002-11-28|new category graphics/xmps-opendivx-plugin|multimedia/xmps-opendivx-plugin|2002-11-28|new category graphics/xmps-win32-plugin|multimedia/xmps-win32-plugin|2002-11-28|new category editors/ooodict-pt_BR|portuguese/ooodict-pt_BR|2002-12-06|new category editors/ooodict-pt_PT|portuguese/ooodict-pt_PT|2002-12-06|new category editors/openoffice-pt|portuguese/openoffice|2002-12-06|new category editors/staroffice52-pt|portuguese/staroffice52|2002-12-06|new category www/frontpage-pt_BR|portuguese/frontpage-pt_BR|2002-12-06|new category audio/kdemultimedia3|multimedia/kdemultimedia3|2002-12-08|new category japanese/gn-mnews||2002-12-08|security vulnerability japanese/mnews||2002-12-08|security vulnerability japanese/mnews-gnspool||2002-12-08|security vulnerability japanese/mnews-im||2002-12-08|security vulnerability print/pips-sc20||2002-12-08|license problems print/pips-sc40||2002-12-08|license problems print/pips-sc480||2002-12-08|license problems print/pips-sc580||2002-12-08|license problems print/pips-sc880||2002-12-08|license problems print/pips-sc980||2002-12-08|license problems print/pips-sp810_820||2002-12-08|license problems print/pips720||2002-12-08|license problems print/pips780cs||2002-12-08|license problems print/pips790||2002-12-08|license problems print/pips820ug||2002-12-08|license problems print/pips920||2002-12-08|license problems print/pips-sc680_777||2002-12-08|license problems x11/launch.app||2002-12-08|security vulnerability net/icradius||2002-12-08|security vulnerability net/p5-IC-Radius||2002-12-08|security vulnerability net/radius||2002-12-08|security vulnerability net/xtradius||2002-12-08|security vulnerability net/gated||2002-12-13|no longer distributed by vendor japanese/gnomecore|x11/gnomecore|2002-12-16|patches integrated into the upstream www/comline|www/libwww|2003-01-03|part of libwww devel/dbregc||2003-01-05|no longer relevant lang/smalleiffel|lang/smarteiffel|2003-01-06|change name graphics/tosvcd|multimedia/tosvcd|2003-01-06|new category graphics/vcdgear|multimedia/vcdgear|2003-01-06|new category graphics/vcdimager|multimedia/vcdimager|2003-01-06|new category graphics/vcdpad|multimedia/vcdpad|2003-01-06|new category graphics/vcdtools|multimedia/vcdtools|2003-01-06|new category devel/autoconf254|devel/autoconf257|2003-01-06|new version from FSF devel/ncurses-dialog|devel/cdialog|2003-01-11|renamed by delete+add graphics/dvdrip|multimedia/dvdrip|2003-01-17|new category misc/pipebench|benchmarks/pipebench|2003-01-18|fix category math/xmgr||2003-01-19|removed, obsoleted, successor is grace x11/libhelp||2003-01-19|removed, didn't compile on current motif, only used by xmgr mail/xfaces||2003-01-19|removed, obsoleted, functionality taken over by faces devel/gnustep-devel|devel/gnustep|2003-01-20|merged devel/gnustep-devel|devel/gnustep|2003-01-20|merged x11-toolkits/gnustep-gui-devel|x11-toolkits/gnustep-gui|2003-01-20|merged x11-toolkits/gnustep-xgps|x11-toolkits/gnustep-back|2003-01-20|full substitute devel/ruby-unit|devel/ruby-testunit|2003-01-23|succeeded mail/p5-Mail-SpamAssassin-devel|mail/p5-Mail-SpamAssassin-snapshot|2003-01-25|directory renamed devel/uml|devel/umbrello|2003-01-26|project renamed x11-toolkits/qt30|x11-toolkits/qt31|2003-01-28|qt30 replaced by qt31 misc/kde3-i18n-pt|portuguese/kde3-i18n|2003-01-28|new category misc/kde3-i18n-pt_BR|portuguese/kde3-i18n-pt_BR|2003-01-28|new category lang/php4||2003-01-29|integrated into www/mod_php4 biology/gaussian||2003-01-31|deleted maintain is hard and gray in license graphics/xine_dvdnav_plugin||2003-02-01|integrated into graphics/libxine devel/ossp-mm||2003-02-01|accidental dupe of devel/mm archivers/linux_rar||2003-02-03|FreeBSD/i386 binary is available security/krb5-beta||2003-08-07|deleted: no longer in beta, MIT KRB5 1.3 released security/pam_krb5||2003-02-12|resurrected: required when MIT KRB5 used in place of base system KRB5 deskutils/gnucash|finance/gnucash|2003-02-05|new category x11-toolkits/crux||2003-02-07|deleted: added to GNOME 2.2 desktop textproc/ruby-erb||2003-02-09|ERb 1.x is obsolete: use the one included in ruby 1.8 or ruby16-shim-ruby18 audio/lame-devel||2003-02-09|obsolete x11-fm/gnomemc||2003-02-10|obsolete x11/wmshutdown|sysutils/wmshutdown|2003-02-13|fix category security/kgpgapplet||2003-02-19|merged into kgpg net/ip-tun||2003-02-19|obsoleted by gif interfaces net/edonkey-gui-gtk-kioslave||2003-02-19|merged into edonkey-gui-gtk print/dvipdfm||2003-02-20|merged into teTeX net/amcl|net/gnome-mud|2003-02-23|project renamed net/openldap|net/openldap12|2003-02-23|port renamed net/openldap2|net/openldap20|2003-02-23|port renamed www/caudium|www/caudium10|2003-02-23|port renamed mail/imp||2003-02-24|security vulnerability graphics/libdvdnav|multimedia/libdvdnav|2003-02-24|new category graphics/libxine|multimedia/libxine|2003-02-24|new category graphics/xine|multimedia/xine|2003-02-24|new category net/rdesktop-devel|net/rdesktop|2003-02-24|obsolete beta version java/jikes-devel|java/jikes|2003-02-24|stable version caught up with development version www/horde||2003-02-25|obsolete astro/kstars|misc/kdeedu3|2003-03-02|kstars included in kdeedu package devel/ruby-testunit||2003-03-03|integrated into ruby16-shim-ruby18 graphics/qdraw||2003-03-24|obsolete x11-fm/rox-base||2003-03-24|obsolete graphics/xvid|multimedia/xvid|2003-03-29|new category print/dvipdfm-cjk|print/dvipdfmx|2003-03-29|port renamed games/tetris|games/bsdtris|2003-04-02|port renamed (see ports/13693) misc/p5-Business-CreditCard|finance/p5-Business-CreditCard|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment|finance/p5-Business-OnlinePayment|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-2CheckOut|finance/p5-Business-OnlinePayment-2CheckOut|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-AuthorizeNet|finance/p5-Business-OnlinePayment-AuthorizeNet|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-BankOfAmerica|finance/p5-Business-OnlinePayment-BankOfAmerica|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-Beanstream|finance/p5-Business-OnlinePayment-Beanstream|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-Cardstream|finance/p5-Business-OnlinePayment-Cardstream|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-Jettis|finance/p5-Business-OnlinePayment-Jettis|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-LinkPoint|finance/p5-Business-OnlinePayment-LinkPoint|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-MerchantCommerce|finance/p5-Business-OnlinePayment-MerchantCommerce|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-Network1Financial|finance/p5-Business-OnlinePayment-Network1Financial|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-PayConnect|finance/p5-Business-OnlinePayment-PayConnect|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-PaymentsGateway|finance/p5-Business-OnlinePayment-PaymentsGateway|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-SurePay|finance/p5-Business-OnlinePayment-SurePay|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-TCLink|finance/p5-Business-OnlinePayment-TCLink|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-VirtualNet|finance/p5-Business-OnlinePayment-VirtualNet|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-eSec|finance/p5-Business-OnlinePayment-eSec|2003-04-03|port renamed (see ports/50557) misc/p5-Business-OnlinePayment-WorldPay-Junior|finance/p5-Business-WorldPay-Junior|2003-04-03|port renamed (see ports/50557) math/p5-Math-Trig||2003-04-03|in base perl5 suite graphics/avidemux|multimedia/avidemux|2003-04-04|new category graphics/avinfo|multimedia/avinfo|2003-04-04|new category graphics/camserv|multimedia/camserv|2003-04-04|new category graphics/dtv|multimedia/dtv|2003-04-04|new category graphics/dumpmpeg|multimedia/dumpmpeg|2003-04-04|new category graphics/enjoympeg|multimedia/enjoympeg|2003-04-04|new category graphics/fxtv|multimedia/fxtv|2003-04-04|new category graphics/gopchop|multimedia/gopchop|2003-04-04|new category graphics/gxanim|multimedia/gxanim|2003-04-04|new category graphics/libdvbpsi|multimedia/libdvbpsi|2003-04-04|new category graphics/libfame|multimedia/libfame|2003-04-04|new category graphics/libquicktime|multimedia/libquicktime|2003-04-04|new category graphics/mmsclient|multimedia/mmsclient|2003-04-04|new category graphics/mpeg2codec|multimedia/mpeg2codec|2003-04-04|new category graphics/mpeg2play|multimedia/mpeg2play|2003-04-04|new category graphics/mpeg_encode|multimedia/mpeg_encode|2003-04-04|new category graphics/mpeg_play|multimedia/mpeg_play|2003-04-04|new category graphics/mpeg_stat|multimedia/mpeg_stat|2003-04-04|new category graphics/mpegedit|multimedia/mpegedit|2003-04-04|new category graphics/mpeg|multimedia/mpeg|2003-04-04|new category graphics/mpgtx|multimedia/mpgtx|2003-04-04|new category graphics/mplex|multimedia/mplex|2003-04-04|new category graphics/mtv|multimedia/mtv|2003-04-04|new category graphics/netshow|multimedia/netshow|2003-04-04|new category graphics/ppm2fli|multimedia/ppm2fli|2003-04-04|new category graphics/smpeg-xmms|multimedia/smpeg-xmms|2003-04-04|new category graphics/smpeg|multimedia/smpeg|2003-04-04|new category graphics/splitmpg|multimedia/splitmpg|2003-04-04|new category graphics/tkxanim|multimedia/tkxanim|2003-04-04|new category graphics/totem|multimedia/totem|2003-04-04|new category graphics/transcode|multimedia/transcode|2003-04-04|new category graphics/vlc|multimedia/vlc|2003-04-04|new category graphics/xanim|multimedia/xanim|2003-04-04|new category graphics/xawtv|multimedia/xawtv|2003-04-04|new category graphics/xine_d4d_plugin|multimedia/xine_d4d_plugin|2003-04-04|new category graphics/xine_d5d_plugin|multimedia/xine_d5d_plugin|2003-04-04|new category graphics/xmovie|multimedia/xmovie|2003-04-04|new category graphics/xmps|multimedia/xmps|2003-04-04|new category graphics/xtheater|multimedia/xtheater|2003-04-04|new category graphics/recmpeg|multimedia/recmpeg|2003-04-04|new category graphics/spigot|multimedia/spigot|2003-04-04|new category net/gaim-snapshot|net/gaim|2003-04-05|rolled into net/gaim net/gift||2003-04-05|no current official releases net/jift||2003-04-05|lack of development x11-toolkits/pike-gtk||2003-04-09|included in pike japanese/samba20|japanese/samba|2003-04-13|security vulnerability japanese/ptex-euc|japanese/ptex|2003-04-13|all 3 charset are supported japanese/ptex-jis|japanese/ptex|2003-04-13|all 3 charset are supported by japanese/ptex japanese/ptex-sjis|japanese/ptex|2003-04-13|all 3 charset are supported by japanese/ptex japanese/ptex-common|japanese/ptex-base|2003-04-13|only used by one port misc/kde3-i18n-he|hebrew/kde3-i18n|2003-04-13|new category misc/kde3-i18n-hu|hungarian/kde3-i18n|2003-04-13|new category misc/kde3-i18n-vi|vietnamese/kde3-i18n|2003-04-13|new category devel/linux_devtools|linux/linux_devtools-6|2003-04-17|finished repocopy emulators/linux-vmware-toolbox|emulators/linux-vmware-toolbox2|2003-04-19|port renamed emulators/vmware-guestd|emulators/vmware-guestd3|2003-04-19|port renamed archivers/ruby-zlib||2003-04-19|integrated into ruby16-shim-ruby18 math/ruby-bigfloat||2003-04-19|integrated into ruby16-shim-ruby18 palm/prc-tools-binutils||2003-04-27|integrate into palm/prc-tools palm/prc-tools-gcc||2003-04-27|integrate into palm/prc-tools multimedia/gini|net/gini|2003-04-27|inappropriate primary CATEGORIES graphics/gimp-manual-ps||2003-04-29|new versions of the manual not available as PS archivers/pkzip||2003-05-05|port contained a security vulnerability with no sign of a fix audio/mxv||2003-05-05|port was broken with no sign of a fix audio/openag||2003-05-05|port was broken with no sign of a fix databases/libodbc++||2003-05-05|port was broken with no sign of a fix databases/p5-Msql||2003-05-05|port was broken with no sign of a fix databases/sixpack||2003-05-05|port was broken with no sign of a fix devel/arm-aout-gcc295||2003-05-05|port was broken with no sign of a fix devel/arm-elf-gcc31||2003-05-05|port was broken with no sign of a fix devel/codemedic||2003-05-05|port was broken with no sign of a fix devel/flux||2003-05-05|port was broken with no sign of a fix devel/gecc||2003-05-05|port was broken with no sign of a fix devel/glade--||2003-05-05|port was broken with no sign of a fix devel/ilu||2003-05-05|port was broken with no sign of a fix emulators/vmware||2003-05-05|port was broken with no sign of a fix graphics/ruby-gimp||2003-05-05|port was broken with no sign of a fix graphics/p5-Gimp||2003-05-05|port depended on the broken PDL port which was removed irc/kvirc||2003-05-05|port was broken with no sign of a fix japanese/ee||2003-05-05|port was broken with no sign of a fix japanese/kdevelop||2003-05-05|port was broken with no sign of a fix korean/byeoroo||2003-05-05|port was broken with no sign of a fix lang/gpc||2003-05-05|port was broken with no sign of a fix math/PDL||2003-05-05|port was broken with no sign of a fix misc/cassowary||2003-05-05|port was broken with no sign of a fix net/coda_client||2003-05-05|port was broken with no sign of a fix net/coda_server||2003-05-05|port was broken with no sign of a fix net/gtk+licq||2003-05-05|port was broken with no sign of a fix net/icukrell||2003-05-05|port was broken with no sign of a fix net/macipgw||2003-05-05|port was broken with no sign of a fix net/trafcount||2003-05-05|port was broken with no sign of a fix net/zephyr||2003-05-05|port was broken with no sign of a fix news/xvnews||2003-05-05|port was broken with no sign of a fix print/pdflib3||2003-05-05|port was broken with no sign of a fix textproc/xsl-docbook-modular||2003-05-05|port was broken with no sign of a fix www/eddie||2003-05-05|port was broken with no sign of a fix www/wn||2003-05-05|port contained a security vulnerability with no sign of a fix x11-fm/jafm||2003-05-05|port was broken with no sign of a fix x11-servers/Xatm||2003-05-05|port was broken with no sign of a fix audio/gdcd||2003-05-05|port was broken with no sign of a fix devel/SN|devel/sourcenav|2003-05-07|renamed by upstream japanese/gp||2003-05-07|development discontinued and distfile unavailable www/orion-devel|www/orion|2003-05-08|stable version caught up with development version editors/xemacs21-mule-common||2003-05-09|needless since new xemacs21-mule is 21.4.12 x11-toolkits/fltk-xunicode|x11-toolkits/fltk|2003-05-011|maintenance discontinued www/nautilus-gtkhtml||2003-05-11|maintenance discontinued editors/xemacs21-sumo||2003-05-12|needless since merged to xemacs-{mule-}packages editors/xemacs21-mule-sumo||2003-05-12|needless since merged to xemacs-{mule-}packages japanese/xemacs21-sumo-canna||2003-05-12|needless since merged to xemacs-{mule-}packages japanese/xemacs21-sumo-canna+freewnn||2003-05-12|needless since merged to xemacs-{mule-}packages japanese/xemacs21-sumo-canna+wnn6||2003-05-12|needless since merged to xemacs-{mule-}packages japanese/xemacs21-sumo-freewnn||2003-05-12|needless since merged to xemacs-{mule-}packages japanese/xemacs21-sumo-wnn6||2003-05-12|needless since merged to xemacs-{mule-}packages editors/xemacs-additional-packages||2003-05-12|obsolete xemacs package category editors/xemacs-basic-mule-packages||2003-05-12|obsolete xemacs package category editors/xemacs-comm-packages||2003-05-12|obsolete xemacs package category editors/xemacs-games-packages||2003-05-12|obsolete xemacs package category editors/xemacs-libs-packages||2003-05-12|obsolete xemacs package category editors/xemacs-oa-packages||2003-05-12|obsolete xemacs package category editors/xemacs-prog-packages||2003-05-12|obsolete xemacs package category editors/xemacs-wp-packages||2003-05-12|obsolete xemacs package category devel/p5-Time|devel/p5-Time-modules|2003-05-13|Use devel/p5-Time-modules port instead www/sqmgrlog|www/sarg|2003-05-15|Renamed into sarg devel/adabroker||2003-05-19|no longer maintained, does not compile with latest compiler chinese/rxvt||2003-05-20|no longer needed chinese/rxvt-big5||2003-05-20|no longer needed chinese/rxvt-gb||2003-05-20|no longer needeD misc/p5-DataCash||2003-05-20|No longer available net/p5-Net-BGP4|net/p5-Net-BGP|2003-05-21|module was renamed x11-wm/kde-icontheme-crystal||2003-05-22|Included in kdelibs devel/p5-File-Tools||2003-05-22|Newer version included into Perl distribution x11-servers/XttXF98srv-EGC||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-GA968||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-GANBWAP||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-MGA||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-NEC480||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-NECS3||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-NKVNEC||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-PWLB||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-PWSKB||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-SVGA||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-TGUI||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-WABEP||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-WABS||2003-05-23|obsoleted by x11-servers/XFree86-4-Server x11-servers/XttXF98srv-WSNA||2003-05-23|obsoleted by x11-servers/XFree86-4-Server www/phoenix|www/mozilla-firebird|2003-06-02|project changed names x11/gswitchit_applet||2003-06-02|replaced by GNOME 2 version in x11/gswitchit audio/agsatellite|net/linux-agsatellite|2003-06-02|accurate category and name devel/understand_ada|devel/linux-understand_ada|2003-06-02|accurate naming devel/understand_c|devel/linux-understand_c|2003-06-02|accurate naming misc/edonkey-tool-list|misc/linux-edonkey-tool-list|2003-06-02|accurate naming misc/edonkey-tool-recovermet|misc/linux-edonkey-tool-recovermet|2003-06-02|accurate naming multimedia/xmovie|multimedia/linux-xmovie|2003-06-02|accurate naming net/edonkey-core|net/linux-edonkey-core|2003-06-02|accurate naming audio/xnap|net/xnap|2003-06-02|accurate category x11-wm/bbrun|x11/bbrun|2003-06-03|accurate category x11-wm/bbapm|sysutils/bbapm|2003-06-03|accurate category x11-wm/icemc|misc/icemc|2003-06-03|accurate category net/bittorrent|net/py-bittorrent|2003-06-06|duplicate entry textproc/py-trex||2003-06-08|part of py-xml devel/pear-install|devel/pear-PEAR|2003-06-08|merged textproc/gnomespell-devel|textproc/gnomespell|2003-06-11|rolled into gnomespell mail/evolution-devel|mail/evolution|2003-06-11|rolled into evolution misc/wmessage|x11/wmessage|2003-06-12|accurate category net/mldonkey-src|net/mldonkey|2003-06-15|no londer needed news/straw||2003-06-20|port was broken with no sign of a fix devel/libtool|devel/libtool13|2003-06-26|move to versioned libtool portnames www/mozilla-vendor|www/mozilla|2003-07-01|vendor tree in sync with 1.4 www/mozilla-embedded-vendor|www/mozilla-embedded|2003-07-01|vendor tree in sync with 1.4 www/mozilla-headers-vendor|www/mozilla-headers|2003-07-01|vendor tree in sync with 1.4 www/skipstone||2003-07-01|port is more than a year old with no update in sight graphics/glass||2003-07-03|useless www/linux-phoenix|www/linux-mozillafirebird|2003-07-03|legal problem with name graphics/kpovmodeler||2003-07-03|now part of kdegraphics www/linux-opera7|www/linux-opera|2003-07-09|move to www/linux-opera www/xswallow||2003-07-12|port is obsolete net/gnut||2003-07-12|security vulnerability, and no active development www/mod_log_mysql|www/mod_log_sql|2003-07-12|renamed by author in new version x11/gnomecore||2003-07-15|removed as part of GNOME 1.4 desktop phase out x11/gdm||2003-07-15|removed as part of GNOME 1.4 desktop phase out x11/gnomeapplets||2003-07-15|removed as part of GNOME 1.4 desktop phase out x11/xalf||2003-07-15|removed as part of GNOME 1.4 desktop phase out x11/linux-xalf||2003-07-15|removed as part of GNOME 1.4 desktop phase out x11/gnome||2003-07-15|removed as part of GNOME 1.4 desktop phase out x11/gnome-fifth-toe||2003-07-15|removed as part of GNOME 1.4 desktop phase out editors/gedit||2003-07-15|removed as part of GNOME 1.4 desktop phase out x11-wm/sawfish||2003-07-15|removed as part of GNOME 1.4 desktop phase out audio/gnomemedia||2003-07-15|removed as part of GNOME 1.4 desktop phase out sysutils/gtop||2003-07-15|removed as part of GNOME 1.4 desktop phase out x11-fm/nautilus||2003-07-15|removed as part of GNOME 1.4 desktop phase out devel/bugbuddy||2003-07-15|removed as part of GNOME 1.4 desktop phase out audio/gnomeaudio||2003-07-15|removed as part of GNOME 1.4 desktop phase out games/gnomegames||2003-07-15|removed as part of GNOME 1.4 desktop phase out misc/gnomeutils||2003-07-15|removed as part of GNOME 1.4 desktop phase out misc/gnomeuserdocs||2003-07-15|removed as part of GNOME 1.4 desktop phase out graphics/eog||2003-07-15|removed as part of GNOME 1.4 desktop phase out print/ggv||2003-07-15|removed as part of GNOME 1.4 desktop phase out x11-wm/spager||2003-07-15|removed as it depends on sawfish mail/gtkgrepmail||2003-07-15|removed as it depends on gnomecore x11-toolkits/eazel-themes||2003-07-15|removed as it depends on sawfish chinese/pycodec||2003-07-20|is replaced by converters/py-cjkcodecs korean/pycodec||2003-07-20|is replaced by converters/py-cjkcodecs devel/jakarta-ant|devel/apache-ant|2003-07-21|project renamed games/newkind||2003-07-22|project abandoned print/acroread4|print/acroread5|2003-07-24|security vulnerability print/acroread-commfont|print/acroread5-commfont|2003-07-24|security vulnerability japanese/acroread-jpnfont|japanese/acroread5-jpnfont|2003-07-24|security vulnerability korean/acroread-korfont|korean/acroread5-korfont|2003-07-24|security vulnerability chinese/acroread-chsfont|chinese/acroread5-chsfont|2003-07-24|security vulnerability chinese/acroread-chtfont|chinese/acroread5-chtfont|2003-07-24|security vulnerability x11-wm/xfwm4|x11-wm/xfce4-wm|2003-07-27|rename it to be consistent with other xfce4 ports misc/shc||2003-07-30|broken for nearly a year mail/icqmail||2003-07-30|port no longer works, and is no longer developed games/bnetd||2003-07-30|project was abandoned for legal reasons devel/gnome-devel||2003-07-30|no longer needed after GNOME 1.4 removal devel/gnome2-devel||2003-07-30|no longer needed after GNOME 1.4 removal x11-toolkits/Motif-dummy||2003-07-31|dummy port is no longer used korean/netdic||2003-08-05|not functional and not maintained anymore misc/gnomeutils2|deskutils/gnomeutils2|2003-08-06|repo move to a better category misc/gucharmap|deskutils/gucharmap|2003-08-06|repo move to a better category net/cphone||2003-08-06|port was marked broken for 3 months with no fix submitted devel/crystal||2003-08-06|port was marked broken for 3 months with no fix submitted net/cvsupit||2003-08-06|port was marked broken for 3 months with no fix submitted www/encompass||2003-08-06|port was marked broken for 3 months with no fix submitted news/glitter||2003-08-06|port was marked broken for 3 months with no fix submitted x11-toolkits/iv||2003-08-06|port was marked broken for 3 months with no fix submitted japanese/jtex209-both||2003-08-06|port was marked broken for 3 months with no fix submitted japanese/jtex209-ascii||2003-08-06|port was marked broken for 3 months with no fix submitted japanese/jtex209-ntt||2003-08-06|port was marked broken for 3 months with no fix submitted japanese/sjxa||2003-08-06|port was marked broken for 3 months with no fix submitted japanese/skk-elisp||2003-08-06|port was marked broken for 3 months with no fix submitted japanese/vfghostscript||2003-08-06|port was marked broken for 3 months with no fix submitted japanese/vfghostscript5||2003-08-06|port was marked broken for 3 months with no fix submitted japanese/vfghostscript55||2003-08-06|port was marked broken for 3 months with no fix submitted japanese/xnetmaj||2003-08-06|port was marked broken for 3 months with no fix submitted devel/kelp||2003-08-06|port was marked broken for 3 months with no fix submitted korean/ftghostscript5||2003-08-06|port was marked broken for 3 months with no fix submitted korean/ghostscript55httf||2003-08-06|port was marked broken for 3 months with no fix submitted korean/htexp||2003-08-06|port was marked broken for 3 months with no fix submitted textproc/no-ispell||2003-08-06|port was marked broken for 3 months with no fix submitted net/opengatekeeper||2003-08-06|port was marked broken for 3 months with no fix submitted net/openh323proxy||2003-08-06|port was marked broken for 3 months with no fix submitted security/p5-Authen-Krb4||2003-08-06|port was marked broken for 3 months with no fix submitted x11-toolkits/p5-GnomeApplet||2003-08-06|port was marked broken for 3 months with no fix submitted lang/ruby|lang/ruby16|2003-08-07|renamed lang/ruby-devel|lang/ruby18|2003-08-07|renamed lang/ruby_r|lang/ruby16_r|2003-08-07|renamed lang/ruby_r-devel|lang/ruby18_r|2003-08-07|renamed lang/ruby_static|lang/ruby16_static|2003-08-07|renamed lang/ruby_static-devel|lang/ruby18_static|2003-08-07|renamed x11-wm/metacity-setup||2003-08-07|distfiles have disappeared and functionality exists in x11-wm/metacity biology/p5-bioperl-devel|biology/p5-bioperl|2003-08-07|port was marked broken for 3 months with no fix submitted cad/pisces||2003-08-07|port was marked broken for 3 months with no fix submitted cad/sis||2003-08-07|port was marked broken for 3 months with no fix submitted chinese/dia||2003-08-07|port was marked broken for 3 months with no fix submitted chinese/mozilla-tclp||2003-08-07|port was marked broken for 3 months with no fix submitted devel/uds||2003-08-07|port was marked broken for 3 months with no fix submitted devel/py-htmlkit||2003-08-07|port was marked broken for 3 months with no fix submitted devel/sdcc||2003-08-07|port was marked broken for 3 months with no fix submitted devel/ptl||2003-08-07|port was marked broken for 3 months with no fix submitted devel/silc-toolkit||2003-08-07|port was marked broken for 3 months with no fix submitted lang/pnet||2003-08-07|port was marked broken for 3 months with no fix submitted lang/wxbasic||2003-08-07|port was marked broken for 3 months with no fix submitted math/siag||2003-08-07|port was marked broken for 3 months with no fix submitted net/samba-tng||2003-08-07|port was marked broken for 3 months with no fix submitted net/qtella||2003-08-07|port was marked broken for 3 months with no fix submitted print/xpp||2003-08-07|port was marked broken for 3 months with no fix submitted www/slash||2003-08-07|port was marked broken for 3 months with no fix submitted www/viewml||2003-08-07|port was marked broken for 3 months with no fix submitted x11/wscan||2003-08-07|port was marked broken for 3 months with no fix submitted x11-toolkits/ruby-fltk||2003-08-07|port was marked broken for 3 months with no fix submitted x11-wm/scwm||2003-08-07|port was marked broken for 3 months with no fix submitted chinese/cce||2003-08-07|port contains a security vulnerability and is no longer developed net/ruby-romp||2003-08-08|discontinued audio/ruby-qt2sound||2003-08-09|obsolete graphics/ruby-qt2gl||2003-08-09|obsolete textproc/ruby-qt2xml||2003-08-09|obsolete x11-toolkits/ruby-qt2||2003-08-09|obsolete x11-toolkits/ruby-qt2canvas||2003-08-09|obsolete x11-toolkits/ruby-qt2iconview||2003-08-09|obsolete x11-toolkits/ruby-qt2table||2003-08-09|obsolete x11-wm/toolbox||2003-08-09|superseded by bbconf devel/p5-DateTime-LeapSecond|devel/p5-DateTime|2003-08-09|integrated into devel/p5-DateTime astro/glunarclock||2003-08-12|removed as part of GNOME 1.4 desktop phase out astro/seti_applet||2003-08-12|removed as part of GNOME 1.4 desktop phase out deskutils/bulb||2003-08-12|removed as part of GNOME 1.4 desktop phase out ftp/gtm||2003-08-12|removed as part of GNOME 1.4 desktop phase out net/gnomicu||2003-08-12|removed as part of GNOME 1.4 desktop phase out palm/gnomepilot||2003-08-12|removed as part of GNOME 1.4 desktop phase out palm/gnomepilot-conduits||2003-08-12|removed as part of GNOME 1.4 desktop phase out sysutils/bubblemon||2003-08-12|removed as part of GNOME 1.4 desktop phase out sysutils/battstat-applet||2003-08-12|removed as part of GNOME 1.4 desktop phase out x11/gbackground||2003-08-12|removed as part of GNOME 1.4 desktop phase out x11/gnoclip||2003-08-12|removed as part of GNOME 1.4 desktop phase out x11/gvid||2003-08-12|removed as part of GNOME 1.4 desktop phase out x11/libpanel||2003-08-12|removed as part of GNOME 1.4 desktop phase out x11-fm/file_applet_menu||2003-08-12|removed as part of GNOME 1.4 desktop phase out x11-toolkits/panel--||2003-08-12|removed as part of GNOME 1.4 desktop phase out mail/flink||2003-08-12|removed as part of GNOME 1.4 desktop phase out net/openldap20|net/openldap20-server|2003-08-13|split into -client and -server net/openldap21|net/openldap21-server|2003-08-13|split into -client and -server net/openldap22|net/openldap22-server|2003-08-13|split into -client and -server x11-toolkits/gtk-industrial-theme|x11-toolkits/gnome-themes-extras|2003-08-14|gtk-industrial-theme is now included with gnome-themes-extras devel/gnomedebug||2003-08-17|remove stale, broken port devel/gide|devel/anjuta|2003-08-17|gide was superceded by anjuta +graphics/gd2|graphics/gd|2003-08-19|Cleanup gd-related ports +graphics/gd-nox11|graphics/gd|2003-08-19|Cleanup gd-related ports +graphics/p5-GD2|graphics/p5-GD|2003-08-19|Cleanup gd-related ports Property changes on: head/MOVED ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.202 \ No newline at end of property +1.203 \ No newline at end of property Index: head/astro/rmap/Makefile =================================================================== --- head/astro/rmap/Makefile (revision 87213) +++ head/astro/rmap/Makefile (revision 87214) @@ -1,27 +1,27 @@ # New ports collection makefile for: rmap # Date created: 29 Mar 2000 # Whom: trevor@jpj.net # # $FreeBSD$ # PORTNAME= rmap PORTVERSION= 1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= astro MASTER_SITES= http://www.reza.net/rmap/ MAINTAINER= trevor@FreeBSD.org COMMENT= Generates images of the Earth centered at a particular location -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2 +LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd MAN1= rmap.1 USE_GETOPT_LONG=yes GNU_CONFIGURE= yes USE_GMAKE= yes CPPFLAGS= -I${LOCALBASE}/include CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib" .include Property changes on: head/astro/rmap/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/biology/emboss/Makefile =================================================================== --- head/biology/emboss/Makefile (revision 87213) +++ head/biology/emboss/Makefile (revision 87214) @@ -1,143 +1,141 @@ # New ports collection makefile for: emboss # Date created: 31 July 2000 # Whom: Johann Visagie # # $FreeBSD$ # PORTNAME= emboss PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology MASTER_SITES= ftp://ftp.uk.embnet.org/pub/EMBOSS/old/ \ - ftp://ftp.es.embnet.org/pub/software/emboss/EMBOSS/ \ + ftp://ftp.es.embnet.org/pub/software/emboss/EMBOSS/old \ ftp://ftp.ebi.ac.uk/pub/software/unix/EMBOSS/ DISTFILES= ${PORTNAME:U}-${PORTVERSION}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${PORTNAME:U}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= wjv@FreeBSD.org COMMENT= A collection of open source tools for genetic sequence analysis -BROKEN= Checksum mismatch +LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2 - USE_SUBMAKE= yes USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes USE_XLIB= yes USE_MOTIF= yes PKGMESSAGE= ${WRKDIR}/pkg-message .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/gd" \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" SCRIPTS_ENV+= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" RM="${RM}" WRKSRC= ${WRKDIR}/${PORTNAME:U}-${PORTVERSION} EMBASSY_WRKDIR= ${WRKSRC}/EMBASSY EMNU_VERSION= 1.0.5 HMMER_VERSION= 2.1.1 MEME_VERSION= 2.3.1 MSE_VERSION= 0.0.4 TOPO_VERSION= 0.1 PHYLIP_VERSION= 3.573c DOC_DIRS= doc/manuals doc/tutorials doc/programs/text doc/programs/html CONFIG_FILE= ${WRKSRC}/emboss/emboss.default.template .for app in EMNU HMMER MEME MSE PHYLIP TOPO SCRIPTS_ENV+= ${app}_VERSION="${${app}_VERSION}" .if defined(WITH_${app}) APPLIST+= ${app} ${app}_WRKSRC= ${EMBASSY_WRKDIR}/${app}-${${app}_VERSION} ${app}_DISTFILE=${app}-${${app}_VERSION}${EXTRACT_SUFX} DISTFILES+= ${${app}_DISTFILE} PLIST_${app}= "" .else PLIST_${app}= "@comment " .endif PLIST_SUB+= PLIST_${app}=${PLIST_${app}} .endfor # Jemboss support is a work in progress. # #.if defined(WITH_JEMBOSS) #USE_JAVA= 1.3+ #CONFIGURE_ARGS+= --with-java=${JAVA_HOME}/include \ # --with-javaos=${JAVA_HOME}/include/${JAVA_OS:L} #CONFIGURE_ENV+= PATH=${PATH}:${JAVA_HOME}/bin #MAKE_ENV+= PATH=${PATH}:${JAVA_HOME}/bin #JEMBOSS_WRKSRC= ${WRKSRC}/jemboss #.endif pre-fetch: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.${PORTNAME} post-extract: .for app in ${APPLIST} @ ${MKDIR} ${EMBASSY_WRKDIR} @ cd ${EMBASSY_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${_DISTDIR}/${${app}_DISTFILE} ${EXTRACT_AFTER_ARGS} @ if [ `id -u` = 0 ]; then \ ${CHMOD} -R ug-s ${${app}_WRKSRC}; \ ${CHOWN} -R 0:0 ${${app}_WRKSRC}; \ fi .endfor post-patch: .for DIR in ${DOC_DIRS} @ ${PERL} -pi.orig -e \ 's#\$$\(prefix\)/share/\$$\(PACKAGE\)/doc#\$$\(datadir\)/doc/\$$\(PACKAGE\)#' \ ${WRKSRC}/${DIR}/Makefile.in .endfor post-configure: .for app in ${APPLIST} @ cd ${${app}_WRKSRC} && \ ${SETENV} CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} .endfor post-build: .for app in ${APPLIST} @ cd ${${app}_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} .endfor #.if defined(WITH_JEMBOSS) # @ cd ${JEMBOSS_WRKSRC} && \ # ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} \ # ${MAKE_ARGS} #.endif post-install: .for app in ${APPLIST} @ cd ${${app}_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor @ ${PERL} -pe 's#%%PREFIX%%#${PREFIX}#' \ ${CONFIG_FILE} > ${PREFIX}/etc/emboss.default.sample && \ ${CHOWN} ${SHAREOWN}:${SHAREGRP} \ ${PREFIX}/etc/emboss.default.sample @ ${PERL} -pe 's#%%PREFIX%%#${PREFIX}#' \ pkg-message > ${PKGMESSAGE} .if !defined(BATCH) @ ${CAT} ${PKGMESSAGE} .endif post-clean: @ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/biology/emboss/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.34 \ No newline at end of property +1.35 \ No newline at end of property Index: head/biology/genpak/Makefile =================================================================== --- head/biology/genpak/Makefile (revision 87213) +++ head/biology/genpak/Makefile (revision 87214) @@ -1,34 +1,34 @@ # ex:ts=8 # New ports collection makefile for: genpak # Date created: Feb 28, 2001 # Whom: Ying-Chieh Liao # # $FreeBSD$ # PORTNAME= genpak PORTVERSION= 0.26 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology MASTER_SITES= http://www.bioinformatics.org/genpak/download/ DISTNAME= gp-${PORTVERSION} EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= GP is a set of small utilities to manipulate DNA sequences +COMMENT= A set of small utilities to manipulate DNA sequences -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2 +LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd USE_GMAKE= yes MAKE_ENV= GMAKE="${GMAKE}" MANPREFIX="${MANPREFIX}" MAN1= Genpak.1 gp_acc.1 gp_adjust.1 gp_cdndev.1 gp_cusage.1 gp_digest.1 \ gp_dimer.1 gp_findorf.1 gp_gc.1 gp_getseq.1 gp_matrix.1 gp_mkmtx.1 \ gp_pattern.1 gp_qs.1 gp_randseq.1 gp_seq2prot.1 gp_slen.1 gp_tm.1 \ gp_trimer.1 gp_primer.1 .if !defined(NOPORTDOCS) INSTALL_TARGET= install docs .endif .include Property changes on: head/biology/genpak/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/comms/hamlib/Makefile =================================================================== --- head/comms/hamlib/Makefile (revision 87213) +++ head/comms/hamlib/Makefile (revision 87214) @@ -1,79 +1,80 @@ # New ports collection makefile for: hamlib # Date created: 30 April 2003 # Whom: Sebastian Yepes # # $FreeBSD$ # PORTNAME= hamlib PORTVERSION= 1.1.4 +PORTREVISION= 1 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= esn@x123.info COMMENT= Shared libraries for Amateur Radio Equipment Control Applications USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" MAN1= rigctl.1 rotctl.1 MAN8= rpc.rigd.8 rpc.rotd.8 .include .if defined(WITH_TCL) LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl8.3 PLIST_SUB+= TCL="" .else CONFIGURE_ARGS+= --without-with-tcl --without-with-tcl-binding PLIST_SUB+= TCL="@comment " .endif .if defined(WITH_RIGMATRIX) -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2 +LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd CONFIGURE_ARGS+= --with-rigmatrix PLIST_SUB+= RIGMATRIX="" .else CONFIGURE_ARGS+= --without-with-rigmatrix PLIST_SUB+= RIGMATRIX="@comment " .endif .if defined(WITH_GNURADIO) CONFIGURE_ARGS+= --with-gnuradio PLIST_SUB+= GNURADIO="" .else CONFIGURE_ARGS+= --without-with-gnuradio PLIST_SUB+= GNURADIO="@comment " .endif .if defined(WITH_MICROTUNE) CONFIGURE_ARGS+= --with-microtune PLIST_SUB+= MICROTUNE="" .else CONFIGURE_ARGS+= --without-with-microtune PLIST_SUB+= MICROTUNE="@comment " .endif pre-everything:: .if !defined(WITH_TCL) || !defined(WITH_RIGMATRIX) @${ECHO_MSG} "You can specify the following command lines:" @${ECHO_MSG} "" .endif .if !defined(WITH_TCL) @${ECHO_MSG} "WITH_TCL=yes for TCL support" .endif .if !defined(WITH_RIGMATRIX) @${ECHO_MSG} "WITH_RIGMATRIX=yes for RigMatrix support" .endif #.if !defined(WITH_GNURADIO) # @${ECHO_MSG} "WITH_GNURADIO=yes for GNURadio support" #.endif #.if !defined(WITH_MICROTUNE) # @${ECHO_MSG} "WITH_MICROTUNE=yes for MicroTune support" #.endif .include Property changes on: head/comms/hamlib/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/databases/grass/Makefile =================================================================== --- head/databases/grass/Makefile (revision 87213) +++ head/databases/grass/Makefile (revision 87214) @@ -1,68 +1,67 @@ # New ports collection makefile for: grass # Date created: 15 January 2000 # Whom: reg # # $FreeBSD$ # PORTNAME= grass PORTVERSION= 5.0.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= http://grass.itc.it/grass5/source/ \ ftp://grass.baylor.edu/pub/grass/grass5/source/ DISTNAME= ${PORTNAME}-${PORTVERSION}_src MAINTAINER= reg@FreeBSD.org COMMENT= An open source Geographical Information System (GIS) BROKEN= Broken dependency POSTGRESQL_PORT?= databases/postgresql7 LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - gd.4:${PORTSDIR}/graphics/gd2 \ + gd.4:${PORTSDIR}/graphics/gd \ fftw.2:${PORTSDIR}/math/fftw \ iconv.3:${PORTSDIR}/converters/libiconv \ freetype.9:${PORTSDIR}/print/freetype2 \ gdbm.3:${PORTSDIR}/databases/gdbm \ pq.3:${PORTSDIR}/${POSTGRESQL_PORT} \ odbc.1:${PORTSDIR}/databases/unixODBC \ lapack.3:${PORTSDIR}/math/lapack BUILD_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83 \ wish8.3:${PORTSDIR}/x11-toolkits/tk83 RUN_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83 \ wish8.3:${PORTSDIR}/x11-toolkits/tk83 EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude *CVS* WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XLIB= yes USE_MESA= yes USE_PERL5= yes USE_BISON= yes USE_GMAKE= yes USE_AUTOCONF_VER= 213 CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \ --with-libs=${LOCALBASE}/lib \ - --with-gd-includes=${LOCALBASE}/include/gd \ --with-tcltk-includes="${LOCALBASE}/include/tcl8.3 \ ${LOCALBASE}/include/tk8.3" \ --with-postgres-includes=${LOCALBASE}/include/postgresql/internal/ \ --with-opengl-includes=${X11BASE}/include \ --with-opengl-libs=${X11BASE}/lib \ --with-freetype \ --with-freetype-includes=${LOCALBASE}/include/freetype2 \ --with-blas \ --with-lapack \ --with-nls \ --without-motif post-install: -(cd ${PREFIX} && ${GREP} -v "@" ${PLIST} | \ ${XARGS} ${STRIP_CMD} 2> /dev/null || ${TRUE}) .include Property changes on: head/databases/grass/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/databases/grass-i18n/Makefile =================================================================== --- head/databases/grass-i18n/Makefile (revision 87213) +++ head/databases/grass-i18n/Makefile (revision 87214) @@ -1,68 +1,67 @@ # New ports collection makefile for: grass # Date created: 15 January 2000 # Whom: reg # # $FreeBSD$ # PORTNAME= grass PORTVERSION= 5.0.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= http://grass.itc.it/grass5/source/ \ ftp://grass.baylor.edu/pub/grass/grass5/source/ DISTNAME= ${PORTNAME}-${PORTVERSION}_src MAINTAINER= reg@FreeBSD.org COMMENT= An open source Geographical Information System (GIS) BROKEN= Broken dependency POSTGRESQL_PORT?= databases/postgresql7 LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - gd.4:${PORTSDIR}/graphics/gd2 \ + gd.4:${PORTSDIR}/graphics/gd \ fftw.2:${PORTSDIR}/math/fftw \ iconv.3:${PORTSDIR}/converters/libiconv \ freetype.9:${PORTSDIR}/print/freetype2 \ gdbm.3:${PORTSDIR}/databases/gdbm \ pq.3:${PORTSDIR}/${POSTGRESQL_PORT} \ odbc.1:${PORTSDIR}/databases/unixODBC \ lapack.3:${PORTSDIR}/math/lapack BUILD_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83 \ wish8.3:${PORTSDIR}/x11-toolkits/tk83 RUN_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83 \ wish8.3:${PORTSDIR}/x11-toolkits/tk83 EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude *CVS* WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XLIB= yes USE_MESA= yes USE_PERL5= yes USE_BISON= yes USE_GMAKE= yes USE_AUTOCONF_VER= 213 CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \ --with-libs=${LOCALBASE}/lib \ - --with-gd-includes=${LOCALBASE}/include/gd \ --with-tcltk-includes="${LOCALBASE}/include/tcl8.3 \ ${LOCALBASE}/include/tk8.3" \ --with-postgres-includes=${LOCALBASE}/include/postgresql/internal/ \ --with-opengl-includes=${X11BASE}/include \ --with-opengl-libs=${X11BASE}/lib \ --with-freetype \ --with-freetype-includes=${LOCALBASE}/include/freetype2 \ --with-blas \ --with-lapack \ --with-nls \ --without-motif post-install: -(cd ${PREFIX} && ${GREP} -v "@" ${PLIST} | \ ${XARGS} ${STRIP_CMD} 2> /dev/null || ${TRUE}) .include Property changes on: head/databases/grass-i18n/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/devel/cvsgraph/Makefile =================================================================== --- head/devel/cvsgraph/Makefile (revision 87213) +++ head/devel/cvsgraph/Makefile (revision 87214) @@ -1,91 +1,91 @@ # New ports collection makefile for: cvsgraph # Date created: 2001-02-21 # Whom: trevor # # $FreeBSD$ # PORTNAME= cvsgraph PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel graphics MASTER_SITES= http://www.akhphd.au.dk/~bertho/cvsgraph/release/ MAINTAINER= trevor@FreeBSD.org COMMENT= Graph the life story of a file under CVS or RCS -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2 \ +LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAN1= cvsgraph.1 MAN5= cvsgraph.conf.5 USE_BISON= yes ALL_TARGET= cvsgraph DOCDIR= share/doc/${PORTNAME} DOCS= ChangeLog LICENSE README EXAMPLES= cvsgraphwrapper.php3 mkimage.php3 PLIST= ${WRKDIR}/pkg-plist USE_REINPLACE= yes USE_AUTOCONF= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-freetype2-inc=${X11BASE}/include/freetype2/freetype \ --with-freetype2-lib=${X11BASE}/lib \ - --with-gd-inc=${LOCALBASE}/include/gd \ + --with-gd-inc=${LOCALBASE}/include \ --with-gd-lib=${LOCALBASE}/lib \ --with-jpeg-inc=${LOCALBASE}/include \ --with-jpeg-lib=${LOCALBASE}/lib \ --with-png-inc=${LOCALBASE}/include \ --with-png-lib=${LOCALBASE}/lib \ --with-z-inc=/usr/include \ --with-z-lib=/usr/lib \ --with-freetype2 \ --with-gd \ --with-jpeg \ --with-png \ --with-z pre-patch: ${REINPLACE_CMD} -e "s:/home/bertho/tmp/cvstest:/home/ncvs:g" \ ${WRKSRC}/cvsgraph.conf post-configure: ${REINPLACE_CMD} -e \ "s|CFLAGS =|CFLAGS += -I${LOCALBASE}/include \ -I${LOCALBASE}/include/gd|g" \ ${WRKSRC}/Makefile pre-install: ${ECHO_CMD} bin/cvsgraph > ${PLIST} ${ECHO_CMD} etc/cvsgraph.conf >> ${PLIST} .if !defined(NOPORTDOCS) .for i in ${DOCS} ${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST} .endfor .for i in ${EXAMPLES} ${ECHO_CMD} share/examples/${PORTNAME}/${i} >> ${PLIST} .endfor ${ECHO_CMD} @dirrm share/examples/${PORTNAME} >> ${PLIST} ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST} .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/cvsgraph.conf ${PREFIX}/etc ${INSTALL_MAN} ${WRKSRC}/cvsgraph.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/cvsgraph.conf.5 ${PREFIX}/man/man5 .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/${DOCDIR} ${MKDIR} ${PREFIX}/share/examples/${PORTNAME} .for i in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR} .endfor .for i in ${EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/${PORTNAME} .endfor .endif .include Property changes on: head/devel/cvsgraph/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/devel/veepee/Makefile =================================================================== --- head/devel/veepee/Makefile (revision 87213) +++ head/devel/veepee/Makefile (revision 87214) @@ -1,55 +1,53 @@ # Ports collection Makefile for: veepee # Date created: 2 August 2000 # Whom: Maxim Sobolev # # $FreeBSD$ # PORTNAME= veepee PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python gnome MASTER_SITES= http://www.river-bank.demon.co.uk/software/ DISTNAME= VeePee-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A user orientated scripting environment for embedding in applications -BROKEN= "Does not configure" +LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2 - USE_GNOME= gnomelibs USE_XLIB= yes USE_PYTHON= yes USE_LIBTOOL= yes USE_REINPLACE= yes CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} ${PYTHON_LIBS}" -CONFIGURE_ARGS= --with-gd-includes=${LOCALBASE}/include/gd \ +CONFIGURE_ARGS= --with-gd-includes=${LOCALBASE}/include \ --disable-kde .if exists(/usr/lib/libcrypto.a) PYTHON_LIBS+= -lssl -lcrypto .endif pre-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|#include ||g' \ ${WRKSRC}/pymod/gdchart/gdc_pie.c post-configure: @${REINPLACE_CMD} -e \ 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ ${WRKSRC}/libtool post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/veepee ${MKDIR} ${PREFIX}/share/examples/veepee cd ${WRKSRC}/doc && \ ${INSTALL_DATA} GNOMEapi.txt controls.txt ${PREFIX}/share/doc/veepee cd ${WRKSRC}/examples && \ ${INSTALL_SCRIPT} *.py ${PREFIX}/share/examples/veepee .endif .include Property changes on: head/devel/veepee/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property Index: head/graphics/gd-nox11/Makefile =================================================================== --- head/graphics/gd-nox11/Makefile (revision 87213) +++ head/graphics/gd-nox11/Makefile (nonexistent) @@ -1,21 +0,0 @@ -# New ports collection makefile for: gnustep-art -# Date created: 29.Mar.2003 -# Whom: dirk.meyer@dinoex.sub.org -# -# $FreeBSD$ -# - -CATEGORIES= graphics -PKGNAMESUFFIX= -nox11 - -MAINTAINER= dinoex@FreeBSD.org - -WITHOUT_X11= yes -WITHOUT_XPM= yes -MASTERDIR?= ${.CURDIR}/../gd2 - -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - -.include "${MASTERDIR}/Makefile" Property changes on: head/graphics/gd-nox11/Makefile ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/gd2/pkg-descr =================================================================== --- head/graphics/gd2/pkg-descr (revision 87213) +++ head/graphics/gd2/pkg-descr (nonexistent) @@ -1,16 +0,0 @@ -gd is a graphics library. It allows your code to quickly draw images -complete with lines, arcs, text, multiple colors, cut and paste from -other images, and flood fills, and write out the result as a PNG, GIF -or JPEG file. This is particularly useful in World Wide Web applications, -where PNG, GIF and JPEG are three of the formats accepted for inline -images by most browsers. - -gd does not provide for every possible desirable graphics operation, -but version 2.0 does include most frequently requested features, -including both truecolor and palette images, resampling (smooth -resizing of truecolor images) and so forth. - -WWW: http://www.boutell.com/gd/ - -- Alex Dupre -sysadmin@alexdupre.com Property changes on: head/graphics/gd2/pkg-descr ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.7 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/graphics/gd2/scripts/configure =================================================================== --- head/graphics/gd2/scripts/configure (revision 87213) +++ head/graphics/gd2/scripts/configure (nonexistent) @@ -1,44 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# The GD_FONTS environment variable can be set to specify the gzipped -# tar-ball containing the fonts in bdf format and the bdf file names. -# -# For example: -# GD_FONTS="/usr/ports/distfiles/x-koi8u.tgz koi6x10.bdf koi8x13.bdf \ -# koi9x15.bdf koi12x24.bdf koi10x20.bdf" -# -# This can be usefull for slave ports, like ukrainian/gd, which may -# now provide alternative fonts easily. - -# TODO: . handle multiple archiving formats: tgz, tar.bz2, zip -# . allow for passing already extracted font-files - -if [ -z "$GD_FONTS" ] -then - echo "GD_FONTS can be set to specify an alternative list of .bdf files" - echo "See $0 for details..." - exit 0 -fi - -set $GD_FONTS -# -# The tarball is the first argument, the tiny, small, medium-bold, -# large, and giant fonts follow. -# - -tarball=$1 -shift -tar -xvzpf $tarball -C $WRKSRC $@ - -rm -f $WRKSRC/Makefile.fonts - -for font in Tiny Small MediumBold Large Giant -do - f=`echo $font | tr -d [[:lower:]] | tr [[:upper:]] [[:lower:]]` - rm -f $WRKSRC/gdfont$f.[ch] - printf 'gdfont%s.c gdfont%s.h: %s\ - perl ${.CURDIR}/bdftogd gdFont%s font%s < %s\n' \ - $f $f $1 $font $f $1 >> $WRKSRC/Makefile.fonts - shift -done Property changes on: head/graphics/gd2/scripts/configure ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/gd2/distinfo =================================================================== --- head/graphics/gd2/distinfo (revision 87213) +++ head/graphics/gd2/distinfo (nonexistent) @@ -1 +0,0 @@ -MD5 (gd-2.0.15.tar.gz) = 6ededf633b4fd054662ec123c7825fbb Property changes on: head/graphics/gd2/distinfo ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.21 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/graphics/gd2/pkg-plist =================================================================== --- head/graphics/gd2/pkg-plist (revision 87213) +++ head/graphics/gd2/pkg-plist (nonexistent) @@ -1,25 +0,0 @@ -bin/annotate -bin/bdftogd -bin/gd2copypal -bin/gd2togif -bin/gd2topng -bin/gdcmpgif -bin/gdparttopng -bin/gdtopng -bin/giftogd2 -bin/pngtogd -bin/pngtogd2 -bin/webpng -include/gd.h -include/gd_io.h -include/gdcache.h -include/gdfontg.h -include/gdfontl.h -include/gdfontmb.h -include/gdfonts.h -include/gdfontt.h -lib/libgd.a -lib/libgd.so -lib/libgd.so.4 -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% Property changes on: head/graphics/gd2/pkg-plist ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.16 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/graphics/gd2/Makefile =================================================================== --- head/graphics/gd2/Makefile (revision 87213) +++ head/graphics/gd2/Makefile (nonexistent) @@ -1,72 +0,0 @@ -# New ports collection makefile for: gd -# Date created: 27 Mar 1998 -# Whom: jeff@cetlink.net -# -# $FreeBSD$ -# - -PORTNAME= gd -PORTVERSION= 2.0.15 -CATEGORIES+= graphics -MASTER_SITES= http://www.boutell.com/gd/http/ \ - ftp://ftp.boutell.com/pub/boutell/gd/ \ - ${MASTER_SITE_RINGSERVER} -MASTER_SITE_SUBDIR= graphics/gd - -MAINTAINER?= ports@FreeBSD.org -COMMENT?= A graphics library for fast creation of images - -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - freetype.9:${PORTSDIR}/print/freetype2 - -LATEST_LINK= gd2 - -MAKE_ENV= WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -MAKEFILE= ${FILESDIR}/Makefile.bsd -INSTALLS_SHLIB= yes - -.include - -.if defined(WITHOUT_X11) || defined(WITHOUT_XPM) -PKGNAMESUFFIX= -nox11 -.if !defined(WITHOUT_XPM) -LIB_DEPENDS+= Xpm:${PORTSDIR}/graphics/xpm -CPPFLAGS+= -I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM \ - -DXPM_NOX -LDFLAGS+= -L${X11BASE}/lib -lXpm -.endif -.else -USE_XPM= yes -CPPFLAGS+= -I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM -LDFLAGS+= -L${X11BASE}/lib -lXpm -lX11 -.endif - -.if defined(WITH_LZW) || defined(HAVE_UNISYS_LICENSE) || \ - (defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES") -CPPFLAGS+= -DLZW_LICENSED -.endif - -.if defined(GD_FONTS) -USE_PERL5_BUILD= yes -SCRIPTS_ENV+= GD_FONTS="${GD_FONTS}" -.endif - -pre-everything:: -.if !defined(WITH_LZW) - @${ECHO_MSG} "************************************************************" - @${ECHO_MSG} "* If you live outside US and Canada, you can define *" - @${ECHO_MSG} "* WITH_LZW to enable GIF compression support. *" - @${ECHO_MSG} "************************************************************" -.endif - -post-extract: - @${CP} ${FILESDIR}/g* ${WRKSRC} - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR} -.endif - -.include Property changes on: head/graphics/gd2/Makefile ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.67 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/gd2/files/patch-gdft.c =================================================================== --- head/graphics/gd2/files/patch-gdft.c (revision 87213) +++ head/graphics/gd2/files/patch-gdft.c (nonexistent) @@ -1,92 +0,0 @@ ---- gdft.c Thu Jan 16 13:29:32 2003 -+++ gdft.c Mon Mar 24 17:09:54 2003 -@@ -546,8 +546,8 @@ - a->tweencolor = gdTrueColorAlpha (gdTrueColorGetRed (fg), - gdTrueColorGetGreen (fg), - gdTrueColorGetBlue (fg), -- gdAlphaMax - -- (gdTrueColorGetAlpha (fg) * -+ gdAlphaMax - ((gdAlphaMax - -+ gdTrueColorGetAlpha (fg)) * - pixel / NUMCOLORS)); - } - else -@@ -680,10 +680,14 @@ - if (y >= im->sy || y < 0) - continue; - -- for (col = 0; col < bitmap.width; col++, pc++) -- { -- if (bitmap.pixel_mode == ft_pixel_mode_grays) -- { -+ for (col = 0; col < bitmap.width; col++, pc++) { -+ x = pen_x + col; -+ /* clip if out of bounds */ -+ if (x >= im->sx || x < 0) -+ continue; -+ -+ switch(bitmap.pixel_mode) { -+ case ft_pixel_mode_grays: - /* - * Round to NUMCOLORS levels of antialiasing for - * index color images since only 256 colors are -@@ -692,44 +696,38 @@ - tc_key.pixel = ((bitmap.buffer[pc] * NUMCOLORS) - + bitmap.num_grays / 2) - / (bitmap.num_grays - 1); -- } -- else if (bitmap.pixel_mode == ft_pixel_mode_mono) -- { -- tc_key.pixel = ((bitmap.buffer[pc / 8] -- << (pc % 8)) & 128) ? NUMCOLORS : 0; -+ break; -+ case ft_pixel_mode_mono: - /* 2.0.5: mode_mono fix from Giuliano Pochini */ - tc_key.pixel = - ((bitmap. - buffer[(col >> 3) + - pcr]) & (1 << (~col & 0x07))) ? NUMCOLORS : 0; -- } -- else -- { -+ break; -+ default: - return "Unsupported ft_pixel_mode"; -- } -+ } -+ - if (tc_key.pixel > 0) /* if not background */ - { -- x = pen_x + col; -- -- /* clip if out of bounds */ -- if (x >= im->sx || x < 0) -- continue; -- /* get pixel location in gd buffer */ -- pixel = &im->pixels[y][x]; -- if (tc_key.pixel == NUMCOLORS) -- { -+ if (im->trueColor) { -+ tc_elem = (tweencolor_t *)gdCacheGet(tc_cache, &tc_key); -+ gdImageSetPixel(im, x, y, tc_elem->tweencolor); -+ } else { -+ /* get pixel location in gd buffer */ -+ pixel = &im->pixels[y][x]; -+ if (tc_key.pixel == NUMCOLORS) - /* use fg color directly. gd 2.0.2: watch out for - negative indexes (thanks to David Marwood). */ - *pixel = (fg < 0) ? -fg : fg; -- } -- else -- { -+ else { - /* find antialised color */ - - tc_key.bgcolor = *pixel; - tc_elem = (tweencolor_t *) gdCacheGet (tc_cache, &tc_key); - *pixel = tc_elem->tweencolor; - } -+ } - } - } - } Property changes on: head/graphics/gd2/files/patch-gdft.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/graphics/gd2/files/patch-gdtest.c =================================================================== --- head/graphics/gd2/files/patch-gdtest.c (revision 87213) +++ head/graphics/gd2/files/patch-gdtest.c (nonexistent) @@ -1,81 +0,0 @@ ---- gdtest.c.orig Thu Apr 25 14:16:47 2002 -+++ gdtest.c Tue Nov 6 15:53:38 2001 -@@ -84,6 +84,35 @@ - gdImageDestroy (im2); - ctx->gd_free (ctx); - -+ /* */ -+ /* Send to GIF File then Ptr */ -+ /* */ -+ sprintf(of, "%s.gif", argv[1]); -+ out = fopen(of, "wb"); -+ gdImageGif(im, out); -+ fclose(out); -+ -+ in = fopen(of, "rb"); -+ if (!in) { -+ fprintf(stderr, "GIF Output file does not exist!\n"); -+ exit(1); -+ } -+ im2 = gdImageCreateFromGif(in); -+ fclose(in); -+ -+ CompareImages("GD->GIF File->GD", ref, im2); -+ -+ unlink(of); -+ gdImageDestroy(im2); -+ -+ iptr = gdImageGifPtr(im,&sz); -+ ctx = gdNewDynamicCtx(sz,iptr); -+ im2 = gdImageCreateFromGifCtx(ctx); -+ -+ CompareImages("GD->GIF ptr->GD", ref, im2); -+ -+ gdImageDestroy(im2); -+ ctx->gd_free(ctx); - - /* */ - /* Send to GD2 File then Ptr */ -@@ -200,7 +229,30 @@ - gdImageDestroy (im2); - }; - -- unlink (of); -+ /* -+ ** Test gdImageCreateFromGifSource -+ **/ -+ -+ in = fopen(of, "rb"); -+ -+ if (!in) -+ { -+ fprintf (stderr, "GD Source: ERROR - GD Source input file does not exist - Sink may have failed!\n"); -+ }; -+ -+ imgsrc.source = freadWrapper; -+ imgsrc.context = in; -+ im2 = gdImageCreateFromGifSource(&imgsrc); -+ fclose(in); -+ -+ if (im2 == NULL) { -+ printf("GD Source (GIF): ERROR Null returned by gdImageCreateFromGifSource\n"); -+ } else { -+ CompareImages("GD Source (GIF)", ref, im2); -+ gdImageDestroy(im2); -+ }; -+ -+ unlink(of); - - /* */ - /* Test Extraction */ -@@ -266,6 +318,10 @@ - - printf ("[Merged Image has %d colours]\n", im2->colorsTotal); - CompareImages ("Merged (gdtest.png, gdtest_merge.png)", im2, im3); -+ -+ out = fopen ("test/gdtest_merge_out.png", "wb"); -+ gdImagePng(im2, out); -+ close(out); - - gdImageDestroy (im2); - gdImageDestroy (im3); Property changes on: head/graphics/gd2/files/patch-gdtest.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/graphics/gd2/files/gd2togif.c =================================================================== --- head/graphics/gd2/files/gd2togif.c (revision 87213) +++ head/graphics/gd2/files/gd2togif.c (nonexistent) @@ -1,40 +0,0 @@ -#include -#include "gd.h" - -/* A short program which converts a .gif file into a .gd file, for - your convenience in creating images on the fly from a - basis image that must be loaded quickly. The .gd format - is not intended to be a general-purpose format. */ - -int main(int argc, char **argv) -{ - gdImagePtr im; - FILE *in, *out; - if (argc != 3) { - fprintf(stderr, "Usage: gd2togif filename.gd2 filename.gif\n"); - exit(1); - } - in = fopen(argv[1], "rb"); - if (!in) { - fprintf(stderr, "Input file does not exist!\n"); - exit(1); - } - im = gdImageCreateFromGd2(in); - fclose(in); - if (!im) { - fprintf(stderr, "Input is not in GIF format!\n"); - exit(1); - } - out = fopen(argv[2], "wb"); - if (!out) { - fprintf(stderr, "Output file cannot be written to!\n"); - gdImageDestroy(im); - exit(1); - } - gdImageGif(im, out); - fclose(out); - gdImageDestroy(im); - - return 0; -} - Property changes on: head/graphics/gd2/files/gd2togif.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/graphics/gd2/files/gd_biggif_out.c =================================================================== --- head/graphics/gd2/files/gd_biggif_out.c (revision 87213) +++ head/graphics/gd2/files/gd_biggif_out.c (nonexistent) @@ -1,823 +0,0 @@ -#include -#include -#include -#include -#include "gd.h" - -/* -** Wrapper functions for this module. -*/ - -void gdImageBigGif(gdImagePtr im, FILE *outFile) -{ - gdIOCtx *out = gdNewFileCtx(outFile); - gdImageBigGifCtx(im, out); - out->gd_free(out); -} - -void* gdImageBigGifPtr(gdImagePtr im, int *size) -{ - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - gdImageBigGifCtx(im, out); - rv = gdDPExtractData(out,size); - out->gd_free(out); - return rv; -} - -/* Code drawn from ppmtogif.c, from the pbmplus package -** -** Based on GIFENCOD by David Rowley . A -** Lempel-Zim compression based on "compress". -** -** Modified by Marcel Wijkstra -** -** Copyright (C) 1989 by Jef Poskanzer. -** -** Permission to use, copy, modify, and distribute this software and its -** documentation for any purpose and without fee is hereby granted, provided -** that the above copyright notice appear in all copies and that both that -** copyright notice and this permission notice appear in supporting -** documentation. This software is provided "as is" without express or -** implied warranty. -** -** The Graphics Interchange Format(c) is the Copyright property of -** CompuServe Incorporated. GIF(sm) is a Service Mark property of -** CompuServe Incorporated. -* -* Heavily modified by Mouse, 1998-02-12. -* Remove LZW compression. -* Added miGIF run length compression. -* -*/ - -/* - * a code_int must be able to hold 2**GIFBITS values of type int, and also -1 - */ -typedef int code_int; - -static int colorstobpp(int colors); -static void BumpPixel (void); -static int GIFNextPixel (gdImagePtr im); -static void GIFEncode (gdIOCtx *fp, int GWidth, int GHeight, int GInterlace, int Background, int Transparent, int BitsPerPixel, int *Red, int *Green, int *Blue, gdImagePtr im); -/*static void Putword (int w, gdIOCtx *fp); */ -static void GIFcompress (int, gdIOCtx *, gdImagePtr, int); -static void output (code_int code); - -/* UNUSED -* static void char_init (void); -* static void char_out (int c); -*/ - -/* Allows for reuse */ -static void init_statics(void); - -void gdImageBigGifCtx(gdImagePtr im, gdIOCtx *out) -{ - int interlace, transparent, BitsPerPixel; - - interlace = im->interlace; - transparent = im->transparent; - - BitsPerPixel = colorstobpp(im->colorsTotal); - /* Clear any old values in statics strewn through the GIF code */ - init_statics(); - /* All set, let's do it. */ - GIFEncode( - out, im->sx, im->sy, interlace, 0, transparent, BitsPerPixel, - im->red, im->green, im->blue, im); -} - -static int -colorstobpp(int colors) -{ - int bpp = 0; - - if ( colors <= 2 ) - bpp = 1; - else if ( colors <= 4 ) - bpp = 2; - else if ( colors <= 8 ) - bpp = 3; - else if ( colors <= 16 ) - bpp = 4; - else if ( colors <= 32 ) - bpp = 5; - else if ( colors <= 64 ) - bpp = 6; - else if ( colors <= 128 ) - bpp = 7; - else if ( colors <= 256 ) - bpp = 8; - return bpp; - } - -/***************************************************************************** - * - * GIFENCODE.C - GIF Image compression interface - * - * GIFEncode( FName, GHeight, GWidth, GInterlace, Background, Transparent, - * BitsPerPixel, Red, Green, Blue, gdImagePtr ) - * - *****************************************************************************/ - -#define TRUE 1 -#define FALSE 0 - -static int Width, Height; -static int curx, cury; -static long CountDown; -static int Pass = 0; -static int Interlace; - -/* - * Bump the 'curx' and 'cury' to point to the next pixel - */ -static void -BumpPixel(void) -{ - /* - * Bump the current X position - */ - ++curx; - - /* - * If we are at the end of a scan line, set curx back to the beginning - * If we are interlaced, bump the cury to the appropriate spot, - * otherwise, just increment it. - */ - if( curx == Width ) { - curx = 0; - - if( !Interlace ) - ++cury; - else { - switch( Pass ) { - - case 0: - cury += 8; - if( cury >= Height ) { - ++Pass; - cury = 4; - } - break; - - case 1: - cury += 8; - if( cury >= Height ) { - ++Pass; - cury = 2; - } - break; - - case 2: - cury += 4; - if( cury >= Height ) { - ++Pass; - cury = 1; - } - break; - - case 3: - cury += 2; - break; - } - } - } -} - -/* - * Return the next pixel from the image - */ -static int -GIFNextPixel(gdImagePtr im) -{ - int r; - - if( CountDown == 0 ) - return EOF; - - --CountDown; - - r = gdImageGetPixel(im, curx, cury); - - BumpPixel(); - - return r; -} - -/* public */ - -static void -GIFEncode(gdIOCtx *fp, int GWidth, int GHeight, int GInterlace, int Background, int Transparent, int BitsPerPixel, int *Red, int *Green, int *Blue, gdImagePtr im) -{ - int B; - int RWidth, RHeight; - int LeftOfs, TopOfs; - int Resolution; - int ColorMapSize; - int InitCodeSize; - int i; - - Interlace = GInterlace; - - ColorMapSize = 1 << BitsPerPixel; - - RWidth = Width = GWidth; - RHeight = Height = GHeight; - LeftOfs = TopOfs = 0; - - Resolution = BitsPerPixel; - - /* - * Calculate number of bits we are expecting - */ - CountDown = (long)Width * (long)Height; - - /* - * Indicate which pass we are on (if interlace) - */ - Pass = 0; - - /* - * The initial code size - */ - if( BitsPerPixel <= 1 ) - InitCodeSize = 2; - else - InitCodeSize = BitsPerPixel; - - /* - * Set up the current x and y position - */ - curx = cury = 0; - - /* - * Write the Magic header - */ - gdPutBuf( Transparent < 0 ? "GIF87a" : "GIF89a", 6, fp ); - - /* - * Write out the screen width and height - */ - Putword( RWidth, fp ); - Putword( RHeight, fp ); - - /* - * Indicate that there is a global colour map - */ - B = 0x80; /* Yes, there is a color map */ - - /* - * OR in the resolution - */ - B |= (Resolution - 1) << 4; - - /* - * OR in the Bits per Pixel - */ - B |= (BitsPerPixel - 1); - - /* - * Write it out - */ - gdPutC( B, fp ); - - /* - * Write out the Background colour - */ - gdPutC( Background, fp ); - - /* - * Byte of 0's (future expansion) - */ - gdPutC( 0, fp ); - - /* - * Write out the Global Colour Map - */ - for( i=0; i= 0 ) { - gdPutC( '!', fp ); - gdPutC( 0xf9, fp ); - gdPutC( 4, fp ); - gdPutC( 1, fp ); - gdPutC( 0, fp ); - gdPutC( 0, fp ); - gdPutC( (unsigned char) Transparent, fp ); - gdPutC( 0, fp ); - } - - /* - * Write an Image separator - */ - gdPutC( ',', fp ); - - /* - * Write the Image header - */ - - Putword( LeftOfs, fp ); - Putword( TopOfs, fp ); - Putword( Width, fp ); - Putword( Height, fp ); - - /* - * Write out whether or not the image is interlaced - */ - if( Interlace ) - gdPutC( 0x40, fp ); - else - gdPutC( 0x00, fp ); - - /* - * Write out the initial code size - */ - gdPutC( InitCodeSize, fp ); - - /* - * Go and actually compress the data - */ - GIFcompress( InitCodeSize+1, fp, im, Background ); - - /* - * Write out a Zero-length packet (to end the series) - */ - gdPutC( 0, fp ); - - /* - * Write the GIF file terminator - */ - gdPutC( ';', fp ); -} - -/* Write out a word to the GIF file */ -/*static void */ -/*Putword(int w, gdIOCtx *fp) */ -/*{ */ -/* fputc( w & 0xff, fp ); */ -/* fputc( (w / 256) & 0xff, fp ); */ -/*} */ - -#define GIFBITS 12 - -/*----------------------------------------------------------------------- - * - * miGIF Compression - mouse and ivo's GIF-compatible compression - * - * -run length encoding compression routines- - * - * Copyright (C) 1998 Hutchison Avenue Software Corporation - * http://www.hasc.com - * info@hasc.com - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, provided - * that the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation. This software is provided "AS IS." The Hutchison Avenue - * Software Corporation disclaims all warranties, either express or implied, - * including but not limited to implied warranties of merchantability and - * fitness for a particular purpose, with respect to this code and accompanying - * documentation. - * - * The miGIF compression routines do not, strictly speaking, generate files - * conforming to the GIF spec, since the image data is not LZW-compressed - * (this is the point: in order to avoid transgression of the Unisys patent - * on the LZW algorithm.) However, miGIF generates data streams that any - * reasonably sane LZW decompresser will decompress to what we want. - * - * miGIF compression uses run length encoding. It compresses horizontal runs - * of pixels of the same color. This type of compression gives good results - * on images with many runs, for example images with lines, text and solid - * shapes on a solid-colored background. It gives little or no compression - * on images with few runs, for example digital or scanned photos. - * - * der Mouse - * mouse@rodents.montreal.qc.ca - * 7D C8 61 52 5D E7 2D 39 4E F1 31 3E E8 B3 27 4B - * - * ivo@hasc.com - * - * The Graphics Interchange Format(c) is the Copyright property of - * CompuServe Incorporated. GIF(sm) is a Service Mark property of - * CompuServe Incorporated. - * - */ - -static int rl_pixel; -static int rl_basecode; -static int rl_count; -static int rl_table_pixel; -static int rl_table_max; -static int just_cleared; -static int out_bits; -static int out_bits_init; -static int out_count; -static int out_bump; -static int out_bump_init; -static int out_clear; -static int out_clear_init; -static int max_ocodes; -static int code_clear; -static int code_eof; -static unsigned int obuf; -static int obits; -static gdIOCtx *ofile; -static unsigned char oblock[256]; -static int oblen; - -/* Used only when debugging GIF compression code */ -/* #define DEBUGGING_ENVARS */ - -#ifdef DEBUGGING_ENVARS - -static int verbose_set = 0; -static int verbose; -#define VERBOSE (verbose_set?verbose:set_verbose()) - -static int set_verbose(void) -{ - verbose = !!getenv("GIF_VERBOSE"); - verbose_set = 1; - return(verbose); -} - -#else - -#define VERBOSE 0 - -#endif - - -static const char *binformat(unsigned int v, int nbits) -{ - static char bufs[8][64]; - static int bhand = 0; - unsigned int bit; - int bno; - char *bp; - - bhand --; - if (bhand < 0) bhand = (sizeof(bufs)/sizeof(bufs[0]))-1; - bp = &bufs[bhand][0]; - for (bno=nbits-1,bit=1U<=0;bno--,bit>>=1) - { *bp++ = (v & bit) ? '1' : '0'; - if (((bno&3) == 0) && (bno != 0)) *bp++ = '.'; - } - *bp = '\0'; - return(&bufs[bhand][0]); -} - -static void write_block(void) -{ - int i; - - if (VERBOSE) - { printf("write_block %d:",oblen); - for (i=0;i= 255) write_block(); -} - -static void block_flush(void) -{ - if (VERBOSE) printf("block_flush\n"); - if (oblen > 0) write_block(); -} - -static void output(int val) -{ - if (VERBOSE) printf("output %s [%s %d %d]\n",binformat(val,out_bits),binformat(obuf,obits),obits,out_bits); - obuf |= val << obits; - obits += out_bits; - while (obits >= 8) - { block_out(obuf&0xff); - obuf >>= 8; - obits -= 8; - } - if (VERBOSE) printf("output leaving [%s %d]\n",binformat(obuf,obits),obits); -} - -static void output_flush(void) -{ - if (VERBOSE) printf("output_flush\n"); - if (obits > 0) block_out(obuf); - block_flush(); -} - -static void did_clear(void) -{ - if (VERBOSE) printf("did_clear\n"); - out_bits = out_bits_init; - out_bump = out_bump_init; - out_clear = out_clear_init; - out_count = 0; - rl_table_max = 0; - just_cleared = 1; -} - -static void output_plain(int c) -{ - if (VERBOSE) printf("output_plain %s\n",binformat(c,out_bits)); - just_cleared = 0; - output(c); - out_count ++; - if (out_count >= out_bump) - { out_bits ++; - out_bump += 1 << (out_bits - 1); - } - if (out_count >= out_clear) - { output(code_clear); - did_clear(); - } -} - -static unsigned int isqrt(unsigned int x) -{ - unsigned int r; - unsigned int v; - - if (x < 2) return(x); - for (v=x,r=1;v;v>>=2,r<<=1) ; - while (1) - { v = ((x / r) + r) / 2; - if ((v == r) || (v == r+1)) return(r); - r = v; - } -} - -static unsigned int compute_triangle_count(unsigned int count, unsigned int nrepcodes) -{ - unsigned int perrep; - unsigned int cost; - - cost = 0; - perrep = (nrepcodes * (nrepcodes+1)) / 2; - while (count >= perrep) - { cost += nrepcodes; - count -= perrep; - } - if (count > 0) - { unsigned int n; - n = isqrt(count); - while ((n*(n+1)) >= 2*count) n --; - while ((n*(n+1)) < 2*count) n ++; - cost += n; - } - return(cost); -} - -static void max_out_clear(void) -{ - out_clear = max_ocodes; -} - -static void reset_out_clear(void) -{ - out_clear = out_clear_init; - if (out_count >= out_clear) - { output(code_clear); - did_clear(); - } -} - -static void rl_flush_fromclear(int count) -{ - int n; - - if (VERBOSE) printf("rl_flush_fromclear %d\n",count); - max_out_clear(); - rl_table_pixel = rl_pixel; - n = 1; - while (count > 0) - { if (n == 1) - { rl_table_max = 1; - output_plain(rl_pixel); - count --; - } - else if (count >= n) - { rl_table_max = n; - output_plain(rl_basecode+n-2); - count -= n; - } - else if (count == 1) - { rl_table_max ++; - output_plain(rl_pixel); - count = 0; - } - else - { rl_table_max ++; - output_plain(rl_basecode+count-2); - count = 0; - } - if (out_count == 0) n = 1; else n ++; - } - reset_out_clear(); - if (VERBOSE) printf("rl_flush_fromclear leaving table_max=%d\n",rl_table_max); -} - -static void rl_flush_clearorrep(int count) -{ - int withclr; - - if (VERBOSE) printf("rl_flush_clearorrep %d\n",count); - withclr = 1 + compute_triangle_count(count,max_ocodes); - if (withclr < count) - { output(code_clear); - did_clear(); - rl_flush_fromclear(count); - } - else - { for (;count>0;count--) output_plain(rl_pixel); - } -} - -static void rl_flush_withtable(int count) -{ - int repmax; - int repleft; - int leftover; - - if (VERBOSE) printf("rl_flush_withtable %d\n",count); - repmax = count / rl_table_max; - leftover = count % rl_table_max; - repleft = (leftover ? 1 : 0); - if (out_count+repmax+repleft > max_ocodes) - { repmax = max_ocodes - out_count; - leftover = count - (repmax * rl_table_max); - repleft = 1 + compute_triangle_count(leftover,max_ocodes); - } - if (VERBOSE) printf("rl_flush_withtable repmax=%d leftover=%d repleft=%d\n",repmax,leftover,repleft); - if (1+compute_triangle_count(count,max_ocodes) < repmax+repleft) - { output(code_clear); - did_clear(); - rl_flush_fromclear(count); - return; - } - max_out_clear(); - for (;repmax>0;repmax--) output_plain(rl_basecode+rl_table_max-2); - if (leftover) - { if (just_cleared) - { rl_flush_fromclear(leftover); - } - else if (leftover == 1) - { output_plain(rl_pixel); - } - else - { output_plain(rl_basecode+leftover-2); - } - } - reset_out_clear(); -} - -static void rl_flush(void) -{ - /* UNUSED int table_reps; */ - /* UNUSED int table_extra; */ - - if (VERBOSE) printf("rl_flush [ %d %d\n",rl_count,rl_pixel); - if (rl_count == 1) - { output_plain(rl_pixel); - rl_count = 0; - if (VERBOSE) printf("rl_flush ]\n"); - return; - } - if (just_cleared) - { rl_flush_fromclear(rl_count); - } - else if ((rl_table_max < 2) || (rl_table_pixel != rl_pixel)) - { rl_flush_clearorrep(rl_count); - } - else - { rl_flush_withtable(rl_count); - } - if (VERBOSE) printf("rl_flush ]\n"); - rl_count = 0; -} - -static void GIFcompress(int init_bits, gdIOCtx *outfile, gdImagePtr im, int background) -{ - int c; - - ofile = outfile; - obuf = 0; - obits = 0; - oblen = 0; - code_clear = 1 << (init_bits - 1); - code_eof = code_clear + 1; - rl_basecode = code_eof + 1; - out_bump_init = (1 << (init_bits - 1)) - 1; - /* for images with a lot of runs, making out_clear_init larger will - give better compression. */ - out_clear_init = (init_bits <= 3) ? 9 : (out_bump_init-1); -#ifdef DEBUGGING_ENVARS - { const char *ocienv; - ocienv = getenv("GIF_OUT_CLEAR_INIT"); - if (ocienv) - { out_clear_init = atoi(ocienv); - if (VERBOSE) printf("[overriding out_clear_init to %d]\n",out_clear_init); - } - } -#endif - out_bits_init = init_bits; - max_ocodes = (1 << GIFBITS) - ((1 << (out_bits_init - 1)) + 3); - did_clear(); - output(code_clear); - rl_count = 0; - while (1) - { c = GIFNextPixel(im); - if ((rl_count > 0) && (c != rl_pixel)) rl_flush(); - if (c == EOF) break; - if (rl_pixel == c) - { rl_count ++; - } - else - { rl_pixel = c; - rl_count = 1; - } - } - output(code_eof); - output_flush(); -} - -/*----------------------------------------------------------------------- - * - * End of miGIF section - See copyright notice at start of section. - * - *----------------------------------------------------------------------- -*/ - -/****************************************************************************** - * - * GIF Specific routines - * - ******************************************************************************/ - -/* - * Number of characters so far in this 'packet' - */ -static int a_count; - -/* - * Set up the 'byte output' routine - */ - -/* UNUSED -* static void -* char_init(void) -* { -* a_count = 0; -* } -*/ - -/* - * Define the storage for the packet accumulator - */ - -/* UNUSED static char accum[ 256 ]; */ - -static void init_statics(void) { - /* Some of these are properly initialized later. What I'm doing - here is making sure code that depends on C's initialization - of statics doesn't break when the code gets called more - than once. */ - Width = 0; - Height = 0; - curx = 0; - cury = 0; - CountDown = 0; - Pass = 0; - Interlace = 0; - a_count = 0; -} - - -/* +-------------------------------------------------------------------+ */ -/* | Copyright 1990, 1991, 1993, David Koblas. (koblas@netcom.com) | */ -/* | Permission to use, copy, modify, and distribute this software | */ -/* | and its documentation for any purpose and without fee is hereby | */ -/* | granted, provided that the above copyright notice appear in all | */ -/* | copies and that both that copyright notice and this permission | */ -/* | notice appear in supporting documentation. This software is | */ -/* | provided "as is" without express or implied warranty. | */ -/* +-------------------------------------------------------------------+ */ - Property changes on: head/graphics/gd2/files/gd_biggif_out.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/graphics/gd2/files/patch-index.html =================================================================== --- head/graphics/gd2/files/patch-index.html (revision 87213) +++ head/graphics/gd2/files/patch-index.html (nonexistent) @@ -1,71 +0,0 @@ ---- index.html Mon Nov 25 11:39:31 2002 -+++ index.html Wed Nov 27 12:47:38 2002 -@@ -35,4 +35,9 @@ - modern image formats such as PNG and JPEG as soon as possible. - -+

Note, that the FreeBSD port of gd2 includes support for GIF files -+ported from the earlier releases of gd. If the WITH_LZW was defined at -+build time, the software will also use LZW-compression when creating -+GIF files. -+ -

- gd 2.0.8 requires that the following libraries -@@ -116,4 +121,18 @@ - Portions relating to WBMP copyright 2000, 2001, 2002 Maurice Szmurlo and Johan Van - den Brande. -+ -+

-+GIF decompression code copyright 1990, 1991, 1993, by David Koblas -+(koblas@netcom.com). -+

-+Non-LZW-based GIF compression code copyright 1998, by Hutchison Avenue -+Software Corporation (http://www.hasc.com/, -+info@hasc.com). -+

-+LZW-based GIF compression code David Rowley. -+Obtaining a license for the Unisys LZW compression patent is -+entirely between the user and Unisys. The authors of gd can provide -+NO assistance in this matter. -+ -

- Permission has been granted to copy, distribute and modify gd in any -@@ -192,5 +211,22 @@ -

  • fly, by Martin Gleeson - --

    -+ -+

    What does the FreeBSD port add?

    -+ -+

    This version reinstates GIF support. Specifically, the following -+functions are added: gdImageGif, gdImageGifPtr, gdImageGifCtx, -+gdImageGifToSink, gdImageCreateFromGif, gdImageCreateFromGifCtx, -+gdImageCreateFromGifSource. -+The can be used just like the corresponding functions for the other -+image formats. -+ -+

    Other functions added, but not documented, are: gdImageLzw, -+gdImageLzwPtr, gdImageLzwCtx, gdImageBigGif, gdImageBigGifPtr, -+gdImageBigGifCtx. -+ -+

    The gdImageOpenPolygon is added. -+This is basically the same as gdImagePolygon, -+but it does not join the start and end points. It is required by GD.pm. -+ -

    What's new in version 2.0.8?

    -

    -@@ -1058,5 +1094,6 @@ -

    - Represents a point in the coordinate space of the image; used --by gdImagePolygon and -+by gdImagePolygon, -+gdImageOpenPolygon, and - gdImageFilledPolygon. - 
    -@@ -1068,5 +1105,6 @@
- 
    
- A pointer to a gdPoint structure; passed
--as an argument to gdImagePolygon
-+as an argument to gdImagePolygon,
-+gdImageOpenPolygon,
- and gdImageFilledPolygon.
- 

Property changes on: head/graphics/gd2/files/patch-index.html
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd2/files/Makefile.bsd
===================================================================
--- head/graphics/gd2/files/Makefile.bsd	(revision 87213)
+++ head/graphics/gd2/files/Makefile.bsd	(nonexistent)
@@ -1,53 +0,0 @@
-PROGS!=	${MAKE} -V BIN_PROGRAMS -f ${WRKSRC}/makefile.sample
-PROGS+=	gd2togif gdcmpgif giftogd2
-PROGS+=	annotate	# new utility, not included in makefile.sample
-TESTS=	gdtest gddemo gd2time gdtestft testac fontsizetest fontwheeltest
-SRCS=	gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c \
-	gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c \
-	gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \
-	gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h \
-	gdkanji.c gdtables.c gdxpm.c jisx0208.h \
-	wbmp.c wbmp.h
-SRCS+=	gd_gif_in.c gd_gif_out.c gd_biggif_out.c gd_lzw_out.c
-MAKEDIR=/usr/share/mk
-LIB=gd
-SHLIB_MAJOR=4
-SHLIB_MINOR=0
-INCS=	gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
-	gdfonts.h gdfontt.h
-SHLIB_NAME!=	${MAKE} -V SHLIB_NAME LIB=${LIB} \
-	SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} -f ${MAKEDIR}/bsd.lib.mk
-
-CFLAGS+=	-I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \
-		-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \
-		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ \
-		${CPPFLAGS}
-LDADD=		-L${LOCALBASE}/lib -lpng -lz -ljpeg -lfreetype -lm \
-		${LDFLAGS}
-
-# The package comes with tests, but without any sort of test-harness,
-# to run them all automaticly. So building tests is disabled here.	-mi
-all: lib${LIB}.a ${SHLIB_NAME} ${PROGS} # ${TESTS}
-
-lib${LIB}.a ${SHLIB_NAME}: ${SRCS}
-	${MAKE} LIB=${LIB} SRCS="${SRCS}" \
-		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
-		CFLAGS="${CFLAGS}" -ECFLAGS LDADD="${LDADD}" \
-		-f ${MAKEDIR}/bsd.lib.mk ${.TARGET}
-
-${PROGS} ${TESTS}: ${SHLIB_NAME} lib${LIB}.a
-	${MAKE} PROG=${.TARGET} NOMAN=1 LDADD="-L${.CURDIR} -lgd" \
-		CFLAGS="${CFLAGS}" -ECFLAGS -f ${MAKEDIR}/bsd.prog.mk
-
-install:
-	mkdir -p ${PREFIX}/include
-	${MAKE} LIB=${LIB} LIBDIR=${PREFIX}/lib NOPROFILE=true \
-		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
-		-f ${MAKEDIR}/bsd.lib.mk install
-	cd ${.CURDIR} && ${BSD_INSTALL_DATA} ${INCS} ${PREFIX}/include
-	cd ${.CURDIR} && ${BSD_INSTALL_PROGRAM} ${PROGS} ${PREFIX}/bin/
-	${BSD_INSTALL_SCRIPT} ${.CURDIR}/bdftogd ${PREFIX}/bin/
-
-.if exists(${.CURDIR}/Makefile.fonts)
-.include "Makefile.fonts"
-.endif

Property changes on: head/graphics/gd2/files/Makefile.bsd
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.12
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd2/files/gd_gif_out.c
===================================================================
--- head/graphics/gd2/files/gd_gif_out.c	(revision 87213)
+++ head/graphics/gd2/files/gd_gif_out.c	(nonexistent)
@@ -1,44 +0,0 @@
-#include 
-#include 
-#include 
-#include 
-#include "gd.h"
-
-/*
-** Wrapper functions for GIF output.
-*/
-
-void gdImageGifToSink(gdImagePtr im, gdSinkPtr outSink)
-{
-        gdIOCtx   *out = gdNewSSCtx(NULL,outSink);
-        gdImageGifCtx(im, out);
-        out->gd_free(out);
-}
-
-void gdImageGifCtx(gdImagePtr im, gdIOCtx *out)
-{
-#ifdef LZW_LICENCED
-	gdImageLzwCtx(im, out);
-#else
-        gdImageBigGifCtx(im, out);
-#endif
-}
-
-void gdImageGif(gdImagePtr im, FILE *outFile)
-{
-#ifdef LZW_LICENCED
-        gdImageLzw(im, outFile);
-#else
-        gdImageBigGif(im, outFile);
-#endif
-}
-
-void* gdImageGifPtr(gdImagePtr im, int *size)
-{
-#ifdef LZW_LICENCED
-        return gdImageLzwPtr(im, size);
-#else
-        return gdImageBigGifPtr(im, size);
-#endif
-}
-

Property changes on: head/graphics/gd2/files/gd_gif_out.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd2/files/gd_lzw_out.c
===================================================================
--- head/graphics/gd2/files/gd_lzw_out.c	(revision 87213)
+++ head/graphics/gd2/files/gd_lzw_out.c	(nonexistent)
@@ -1,795 +0,0 @@
-#include 
-#include 
-#include 
-#include 
-#include "gd.h"
-
-/* Code drawn from ppmtogif.c, from the pbmplus package
-**
-** Based on GIFENCOD by David Rowley . A
-** Lempel-Zim compression based on "compress".
-**
-** Modified by Marcel Wijkstra 
-**
-** Copyright (C) 1989 by Jef Poskanzer.
-**
-** Permission to use, copy, modify, and distribute this software and its
-** documentation for any purpose and without fee is hereby granted, provided
-** that the above copyright notice appear in all copies and that both that
-** copyright notice and this permission notice appear in supporting
-** documentation.  This software is provided "as is" without express or
-** implied warranty.
-**
-** The Graphics Interchange Format(c) is the Copyright property of
-** CompuServe Incorporated.  GIF(sm) is a Service Mark property of
-** CompuServe Incorporated.
-*/
-
-/*
- * a code_int must be able to hold 2**GIFBITS values of type int, and also -1
- */
-typedef int             code_int;
-
-#ifdef SIGNED_COMPARE_SLOW
-typedef unsigned long int count_int;
-typedef unsigned short int count_short;
-#else /*SIGNED_COMPARE_SLOW*/
-typedef long int          count_int;
-#endif /*SIGNED_COMPARE_SLOW*/
-
-static int colorstobpp(int colors);
-static void BumpPixel (void);
-static int GIFNextPixel (gdImagePtr im);
-static void GIFEncode (gdIOCtx *fp, int GWidth, int GHeight, int GInterlace, int Background, int Transparent, int BitsPerPixel, int *Red, int *Green, int *Blue, gdImagePtr im);
-/*static void Putword (int w, gdIOCtx *fp); */
-static void compress (int init_bits, gdIOCtx *outfile, gdImagePtr im);
-static void output (code_int code);
-static void cl_block (void);
-static void cl_hash (register count_int hsize);
-static void char_init (void);
-static void char_out (int c);
-static void flush_char (void);
-/* Allows for reuse */
-static void init_statics(void);
-
-void gdImageLzwCtx(gdImagePtr im, gdIOCtx *out)
-{
-	int interlace, transparent, BitsPerPixel;
-
-	interlace = im->interlace;
-	transparent = im->transparent;
-
-	BitsPerPixel = colorstobpp(im->colorsTotal);
-	/* Clear any old values in statics strewn through the GIF code */
-	init_statics();
-	/* All set, let's do it. */
-	GIFEncode(
-		out, im->sx, im->sy, interlace, 0, transparent, BitsPerPixel,
-		im->red, im->green, im->blue, im);
-}
-
-void gdImageLzw(gdImagePtr im, FILE *outFile)
-{
-        gdIOCtx   *out = gdNewFileCtx(outFile);
-        gdImageLzwCtx(im, out);
-        out->gd_free(out);
-}
-
-void* gdImageLzwPtr(gdImagePtr im, int *size)
-{
-	void	*rv;
-        gdIOCtx   *out = gdNewDynamicCtx(2048, NULL);
-        gdImageLzwCtx(im, out);
-        rv = gdDPExtractData(out,size);
-	out->gd_free(out);
-	return rv;
-}
-
-
-
-static int
-colorstobpp(int colors)
-{
-    int bpp = 0;
-
-    if ( colors <= 2 )
-        bpp = 1;
-    else if ( colors <= 4 )
-        bpp = 2;
-    else if ( colors <= 8 )
-        bpp = 3;
-    else if ( colors <= 16 )
-        bpp = 4;
-    else if ( colors <= 32 )
-        bpp = 5;
-    else if ( colors <= 64 )
-        bpp = 6;
-    else if ( colors <= 128 )
-        bpp = 7;
-    else if ( colors <= 256 )
-        bpp = 8;
-    return bpp;
-    }
-
-/*****************************************************************************
- *
- * GIFENCODE.C    - GIF Image compression interface
- *
- * GIFEncode( FName, GHeight, GWidth, GInterlace, Background, Transparent,
- *            BitsPerPixel, Red, Green, Blue, gdImagePtr )
- *
- *****************************************************************************/
-
-#define TRUE 1
-#define FALSE 0
-
-static int Width, Height;
-static int curx, cury;
-static long CountDown;
-static int Pass = 0;
-static int Interlace;
-
-/*
- * Bump the 'curx' and 'cury' to point to the next pixel
- */
-static void
-BumpPixel(void)
-{
-        /*
-         * Bump the current X position
-         */
-        ++curx;
-
-        /*
-         * If we are at the end of a scan line, set curx back to the beginning
-         * If we are interlaced, bump the cury to the appropriate spot,
-         * otherwise, just increment it.
-         */
-        if( curx == Width ) {
-                curx = 0;
-
-                if( !Interlace )
-                        ++cury;
-                else {
-                     switch( Pass ) {
-
-                       case 0:
-                          cury += 8;
-                          if( cury >= Height ) {
-                                ++Pass;
-                                cury = 4;
-                          }
-                          break;
-
-                       case 1:
-                          cury += 8;
-                          if( cury >= Height ) {
-                                ++Pass;
-                                cury = 2;
-                          }
-                          break;
-
-                       case 2:
-                          cury += 4;
-                          if( cury >= Height ) {
-                             ++Pass;
-                             cury = 1;
-                          }
-                          break;
-
-                       case 3:
-                          cury += 2;
-                          break;
-                        }
-                }
-        }
-}
-
-/*
- * Return the next pixel from the image
- */
-static int
-GIFNextPixel(gdImagePtr im)
-{
-        int r;
-
-        if( CountDown == 0 )
-                return EOF;
-
-        --CountDown;
-
-        r = gdImageGetPixel(im, curx, cury);
-
-        BumpPixel();
-
-        return r;
-}
-
-/* public */
-
-static void
-GIFEncode(gdIOCtx *fp, int GWidth, int GHeight, int GInterlace, int Background, int Transparent, int BitsPerPixel, int *Red, int *Green, int *Blue, gdImagePtr im)
-{
-        int B;
-        int RWidth, RHeight;
-        int LeftOfs, TopOfs;
-        int Resolution;
-        int ColorMapSize;
-        int InitCodeSize;
-        int i;
-
-        Interlace = GInterlace;
-
-        ColorMapSize = 1 << BitsPerPixel;
-
-        RWidth = Width = GWidth;
-        RHeight = Height = GHeight;
-        LeftOfs = TopOfs = 0;
-
-        Resolution = BitsPerPixel;
-
-        /*
-         * Calculate number of bits we are expecting
-         */
-        CountDown = (long)Width * (long)Height;
-
-        /*
-         * Indicate which pass we are on (if interlace)
-         */
-        Pass = 0;
-
-        /*
-         * The initial code size
-         */
-        if( BitsPerPixel <= 1 )
-                InitCodeSize = 2;
-        else
-                InitCodeSize = BitsPerPixel;
-
-        /*
-         * Set up the current x and y position
-         */
-        curx = cury = 0;
-
-        /*
-         * Write the Magic header
-         */
-        gdPutBuf( Transparent < 0 ? "GIF87a" : "GIF89a", 6, fp );
-
-        /*
-         * Write out the screen width and height
-         */
-        Putword( RWidth, fp );
-        Putword( RHeight, fp );
-
-        /*
-         * Indicate that there is a global colour map
-         */
-        B = 0x80;       /* Yes, there is a color map */
-
-        /*
-         * OR in the resolution
-         */
-        B |= (Resolution - 1) << 5;
-
-        /*
-         * OR in the Bits per Pixel
-         */
-        B |= (BitsPerPixel - 1);
-
-        /*
-         * Write it out
-         */
-        gdPutC( B, fp );
-
-        /*
-         * Write out the Background colour
-         */
-        gdPutC( Background, fp );
-
-        /*
-         * Byte of 0's (future expansion)
-         */
-        gdPutC( 0, fp );
-
-        /*
-         * Write out the Global Colour Map
-         */
-        for( i=0; i= 0 ) {
-	    gdPutC( '!', fp );
-	    gdPutC( 0xf9, fp );
-	    gdPutC( 4, fp );
-	    gdPutC( 1, fp );
-	    gdPutC( 0, fp );
-	    gdPutC( 0, fp );
-	    gdPutC( (unsigned char) Transparent, fp );
-	    gdPutC( 0, fp );
-	}
-
-        /*
-         * Write an Image separator
-         */
-        gdPutC( ',', fp );
-
-        /*
-         * Write the Image header
-         */
-
-        Putword( LeftOfs, fp );
-        Putword( TopOfs, fp );
-        Putword( Width, fp );
-        Putword( Height, fp );
-
-        /*
-         * Write out whether or not the image is interlaced
-         */
-        if( Interlace )
-                gdPutC( 0x40, fp );
-        else
-                gdPutC( 0x00, fp );
-
-        /*
-         * Write out the initial code size
-         */
-        gdPutC( InitCodeSize, fp );
-
-        /*
-         * Go and actually compress the data
-         */
-        compress( InitCodeSize+1, fp, im );
-
-        /*
-         * Write out a Zero-length packet (to end the series)
-         */
-        gdPutC( 0, fp );
-
-        /*
-         * Write the GIF file terminator
-         */
-        gdPutC( ';', fp );
-}
-
-/* */
-/* * Write out a word to the GIF file */
-/* */
-/*static void */
-/*Putword(int w, FILE *fp) */
-/*{ */
-/*        fputc( w & 0xff, fp ); */
-/*        fputc( (w / 256) & 0xff, fp ); */
-/*} */
-
-
-/***************************************************************************
- *
- *  GIFCOMPR.C       - GIF Image compression routines
- *
- *  Lempel-Ziv compression based on 'compress'.  GIF modifications by
- *  David Rowley (mgardi@watdcsu.waterloo.edu)
- *
- ***************************************************************************/
-
-/*
- * General DEFINEs
- */
-
-#define GIFBITS    12
-
-#define HSIZE  5003            /* 80% occupancy */
-
-#ifdef NO_UCHAR
- typedef char   char_type;
-#else /*NO_UCHAR*/
- typedef        unsigned char   char_type;
-#endif /*NO_UCHAR*/
-
-/*
- *
- * GIF Image compression - modified 'compress'
- *
- * Based on: compress.c - File compression ala IEEE Computer, June 1984.
- *
- * By Authors:  Spencer W. Thomas       (decvax!harpo!utah-cs!utah-gr!thomas)
- *              Jim McKie               (decvax!mcvax!jim)
- *              Steve Davies            (decvax!vax135!petsd!peora!srd)
- *              Ken Turkowski           (decvax!decwrl!turtlevax!ken)
- *              James A. Woods          (decvax!ihnp4!ames!jaw)
- *              Joe Orost               (decvax!vax135!petsd!joe)
- *
- */
-#include 
-
-#define ARGVAL() (*++(*argv) || (--argc && *++argv))
-
-static int n_bits;                        /* number of bits/code */
-static int maxbits = GIFBITS;                /* user settable max # bits/code */
-static code_int maxcode;                  /* maximum code, given n_bits */
-static code_int maxmaxcode = (code_int)1 << GIFBITS; /* should NEVER generate this code */
-#ifdef COMPATIBLE               /* But wrong! */
-# define MAXCODE(n_bits)        ((code_int) 1 << (n_bits) - 1)
-#else /*COMPATIBLE*/
-# define MAXCODE(n_bits)        (((code_int) 1 << (n_bits)) - 1)
-#endif /*COMPATIBLE*/
-
-static count_int htab [HSIZE];
-static unsigned short codetab [HSIZE];
-#define HashTabOf(i)       htab[i]
-#define CodeTabOf(i)    codetab[i]
-
-static code_int hsize = HSIZE;                 /* for dynamic table sizing */
-
-/*
- * To save much memory, we overlay the table used by compress() with those
- * used by decompress().  The tab_prefix table is the same size and type
- * as the codetab.  The tab_suffix table needs 2**GIFBITS characters.  We
- * get this from the beginning of htab.  The output stack uses the rest
- * of htab, and contains characters.  There is plenty of room for any
- * possible stack (stack used to be 8000 characters).
- */
-
-#define tab_prefixof(i) CodeTabOf(i)
-#define tab_suffixof(i)        ((char_type*)(htab))[i]
-#define de_stack               ((char_type*)&tab_suffixof((code_int)1< 0 )
-            goto probe;
-nomatch:
-        output ( (code_int) ent );
-        ++out_count;
-        ent = c;
-#ifdef SIGNED_COMPARE_SLOW
-        if ( (unsigned) free_ent < (unsigned) maxmaxcode) {
-#else /*SIGNED_COMPARE_SLOW*/
-        if ( free_ent < maxmaxcode ) {  /* } */
-#endif /*SIGNED_COMPARE_SLOW*/
-            CodeTabOf (i) = free_ent++; /* code -> hashtable */
-            HashTabOf (i) = fcode;
-        } else
-                cl_block();
-    }
-    /*
-     * Put out the final code.
-     */
-    output( (code_int)ent );
-    ++out_count;
-    output( (code_int) EOFCode );
-}
-
-/*****************************************************************
- * TAG( output )
- *
- * Output the given code.
- * Inputs:
- *      code:   A n_bits-bit integer.  If == -1, then EOF.  This assumes
- *              that n_bits =< (long)wordsize - 1.
- * Outputs:
- *      Outputs code to the file.
- * Assumptions:
- *      Chars are 8 bits long.
- * Algorithm:
- *      Maintain a GIFBITS character long buffer (so that 8 codes will
- * fit in it exactly).  Use the VAX insv instruction to insert each
- * code in turn.  When the buffer fills up empty it and start over.
- */
-
-static unsigned long cur_accum = 0;
-static int cur_bits = 0;
-
-static unsigned long masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
-                                  0x001F, 0x003F, 0x007F, 0x00FF,
-                                  0x01FF, 0x03FF, 0x07FF, 0x0FFF,
-                                  0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
-
-static void
-output(code_int code)
-{
-    cur_accum &= masks[ cur_bits ];
-
-    if( cur_bits > 0 )
-        cur_accum |= ((long)code << cur_bits);
-    else
-        cur_accum = code;
-
-    cur_bits += n_bits;
-
-    while( cur_bits >= 8 ) {
-        char_out( (unsigned int)(cur_accum & 0xff) );
-        cur_accum >>= 8;
-        cur_bits -= 8;
-    }
-
-    /*
-     * If the next entry is going to be too big for the code size,
-     * then increase it, if possible.
-     */
-   if ( free_ent > maxcode || clear_flg ) {
-
-            if( clear_flg ) {
-
-                maxcode = MAXCODE (n_bits = g_init_bits);
-                clear_flg = 0;
-
-            } else {
-
-                ++n_bits;
-                if ( n_bits == maxbits )
-                    maxcode = maxmaxcode;
-                else
-                    maxcode = MAXCODE(n_bits);
-            }
-        }
-
-    if( code == EOFCode ) {
-        /*
-         * At EOF, write the rest of the buffer.
-         */
-        while( cur_bits > 0 ) {
-                char_out( (unsigned int)(cur_accum & 0xff) );
-                cur_accum >>= 8;
-                cur_bits -= 8;
-        }
-
-        flush_char();
-
-/*        fflush( g_outfile ); */
-/* */
-/*        if( ferror( g_outfile ) ) */
-/*		return; */
-    }
-}
-
-/*
- * Clear out the hash table
- */
-static void
-cl_block (void)             /* table clear for block compress */
-{
-
-        cl_hash ( (count_int) hsize );
-        free_ent = ClearCode + 2;
-        clear_flg = 1;
-
-        output( (code_int)ClearCode );
-}
-
-static void
-cl_hash(register count_int hsize)          /* reset code table */
-                         
-{
-
-        register count_int *htab_p = htab+hsize;
-
-        register long i;
-        register long m1 = -1;
-
-        i = hsize - 16;
-        do {                            /* might use Sys V memset(3) here */
-                *(htab_p-16) = m1;
-                *(htab_p-15) = m1;
-                *(htab_p-14) = m1;
-                *(htab_p-13) = m1;
-                *(htab_p-12) = m1;
-                *(htab_p-11) = m1;
-                *(htab_p-10) = m1;
-                *(htab_p-9) = m1;
-                *(htab_p-8) = m1;
-                *(htab_p-7) = m1;
-                *(htab_p-6) = m1;
-                *(htab_p-5) = m1;
-                *(htab_p-4) = m1;
-                *(htab_p-3) = m1;
-                *(htab_p-2) = m1;
-                *(htab_p-1) = m1;
-                htab_p -= 16;
-        } while ((i -= 16) >= 0);
-
-        for ( i += 16; i > 0; --i )
-                *--htab_p = m1;
-}
-
-/******************************************************************************
- *
- * GIF Specific routines
- *
- ******************************************************************************/
-
-/*
- * Number of characters so far in this 'packet'
- */
-static int a_count;
-
-/*
- * Set up the 'byte output' routine
- */
-static void
-char_init(void)
-{
-        a_count = 0;
-}
-
-/*
- * Define the storage for the packet accumulator
- */
-static char accum[ 256 ];
-
-/*
- * Add a character to the end of the current packet, and if it is 254
- * characters, flush the packet to disk.
- */
-static void
-char_out(int c)
-{
-        accum[ a_count++ ] = c;
-        if( a_count >= 254 )
-                flush_char();
-}
-
-/*
- * Flush the packet to disk, and reset the accumulator
- */
-static void
-flush_char(void)
-{
-        if( a_count > 0 ) {
-                gdPutC( a_count, g_outfile );
-                gdPutBuf( accum, a_count, g_outfile );
-                a_count = 0;
-        }
-}
-
-static void init_statics(void) {
-	/* Some of these are properly initialized later. What I'm doing
-		here is making sure code that depends on C's initialization
-		of statics doesn't break when the code gets called more
-		than once. */
-	Width = 0;
-	Height = 0;
-	curx = 0;
-	cury = 0;
-	CountDown = 0;
-	Pass = 0;
-	Interlace = 0;
-	a_count = 0;
-	cur_accum = 0;
-	cur_bits = 0;
-	g_init_bits = 0;
-	g_outfile = 0;
-	ClearCode = 0;
-	EOFCode = 0;
-	free_ent = 0;
-	clear_flg = 0;
-	offset = 0;
-	in_count = 1;
-	out_count = 0;	
-	hsize = HSIZE;
-	n_bits = 0;
-	maxbits = GIFBITS;
-	maxcode = 0;
-	maxmaxcode = (code_int)1 << GIFBITS;
-}
-
-
-/* +-------------------------------------------------------------------+ */
-/* | Copyright 1990, 1991, 1993, David Koblas.  (koblas@netcom.com)    | */
-/* |   Permission to use, copy, modify, and distribute this software   | */
-/* |   and its documentation for any purpose and without fee is hereby | */
-/* |   granted, provided that the above copyright notice appear in all | */
-/* |   copies and that both that copyright notice and this permission  | */
-/* |   notice appear in supporting documentation.  This software is    | */
-/* |   provided "as is" without express or implied warranty.           | */
-/* +-------------------------------------------------------------------+ */

Property changes on: head/graphics/gd2/files/gd_lzw_out.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd2/files/patch-gd.h
===================================================================
--- head/graphics/gd2/files/patch-gd.h	(revision 87213)
+++ head/graphics/gd2/files/patch-gd.h	(nonexistent)
@@ -1,41 +0,0 @@
---- gd.h	Thu Jan 16 11:28:09 2003
-+++ gd.h	Mon Mar 24 16:26:14 2003
-@@ -209,4 +209,8 @@
-   gdImagePtr gdImageCreateFromPngSource (gdSourcePtr in);
- 
-+  gdImagePtr gdImageCreateFromGif(FILE *fd);
-+  gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
-+  gdImagePtr gdImageCreateFromGifSource(gdSourcePtr in);
-+
-   gdImagePtr gdImageCreateFromGd (FILE * in);
-   gdImagePtr gdImageCreateFromGdCtx (gdIOCtxPtr in);
-@@ -300,4 +304,5 @@
- 
-   void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c);
-+  void gdImageOpenPolygon(gdImagePtr im, gdPointPtr p, int n, int c);
-   void gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
- 
-@@ -395,4 +400,13 @@
-   void *gdImageJpegPtr (gdImagePtr im, int *size, int quality);
- 
-+  void gdImageLzw(gdImagePtr im, FILE *out);
-+  void* gdImageLzwPtr(gdImagePtr im, int *size);
-+  void gdImageLzwCtx(gdImagePtr im, gdIOCtxPtr out);
-+
-+  void gdImageBigGif(gdImagePtr im, FILE *out);
-+  void* gdImageBigGifPtr(gdImagePtr im, int *size);
-+  void gdImageBigGifCtx(gdImagePtr im, gdIOCtxPtr out);
-+
-+
- /* A custom data sink. For backwards compatibility. Use
- 	gdIOCtx instead. */
-@@ -408,4 +422,9 @@
- 
-   void gdImagePngToSink (gdImagePtr im, gdSinkPtr out);
-+
-+  void gdImageGif(gdImagePtr im, FILE *out);
-+  void* gdImageGifPtr(gdImagePtr im, int *size);
-+  void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
-+  void gdImageGifToSink(gdImagePtr im, gdSinkPtr out);
- 
-   void gdImageGd (gdImagePtr im, FILE * out);

Property changes on: head/graphics/gd2/files/patch-gd.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd2/files/giftogd2.c
===================================================================
--- head/graphics/gd2/files/giftogd2.c	(revision 87213)
+++ head/graphics/gd2/files/giftogd2.c	(nonexistent)
@@ -1,48 +0,0 @@
-#include 
-#include 
-
-#include "gd.h"
-
-/* A short program which converts a .gif file into a .gd file, for
-	your convenience in creating images on the fly from a
-	basis image that must be loaded quickly. The .gd format
-	is not intended to be a general-purpose format. */
-
-int main(int argc, char **argv)
-{
-	gdImagePtr im;
-	FILE *in, *out;
-	int	cs, fmt;
-
-	if (argc != 5) {
-		fprintf(stderr, "Usage: giftogd2 filename.gif filename.gd2 cs fmt\n");
-                fprintf(stderr, "    where cs is the chunk size\n");
-		fprintf(stderr, "          fmt is 1 for raw, 2 for compressed\n");
-		exit(1);
-	}
-	in = fopen(argv[1], "rb");
-	if (!in) {
-		fprintf(stderr, "Input file does not exist!\n");
-		exit(1);
-	}
-	im = gdImageCreateFromGif(in);
-	fclose(in);
-	if (!im) {
-		fprintf(stderr, "Input is not in GIF format!\n");
-		exit(1);
-	}
-	out = fopen(argv[2], "wb");
-	if (!out) {
-		fprintf(stderr, "Output file cannot be written to!\n");
-		gdImageDestroy(im);
-		exit(1);	
-	}
-	cs = atoi(argv[3]);
-	fmt = atoi(argv[4]);
-	gdImageGd2(im, out, cs, fmt);
-	fclose(out);
-	gdImageDestroy(im);
-
-	return 0;
-}
-

Property changes on: head/graphics/gd2/files/giftogd2.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd2/files/gd_gif_in.c
===================================================================
--- head/graphics/gd2/files/gd_gif_in.c	(revision 87213)
+++ head/graphics/gd2/files/gd_gif_in.c	(nonexistent)
@@ -1,573 +0,0 @@
-#include 
-#include 
-#include 
-#include 
-#include "gd.h"
-
-/* Used only when debugging GIF compression code */
-/* #define DEBUGGING_ENVARS */
-
-#ifdef DEBUGGING_ENVARS
-
-static int verbose_set = 0;
-static int verbose;
-#define VERBOSE (verbose_set?verbose:set_verbose())
-
-static int set_verbose(void)
-{
- verbose = !!getenv("GIF_VERBOSE");
- verbose_set = 1;
- return(verbose);
-}
-
-#else
-
-#define VERBOSE 0
-
-#endif
-
-
-#define        MAXCOLORMAPSIZE         256
-
-#define        TRUE    1
-#define        FALSE   0
-
-#define CM_RED         0
-#define CM_GREEN       1
-#define CM_BLUE                2
-
-#define        MAX_LWZ_BITS            12
-
-#define INTERLACE              0x40
-#define LOCALCOLORMAP  0x80
-#define BitSet(byte, bit)      (((byte) & (bit)) == (bit))
-
-#define        ReadOK(file,buffer,len) (gdGetBuf(buffer, len, file) != 0)
-
-#define LM_to_uint(a,b)                        (((b)<<8)|(a))
-
-/* We may eventually want to use this information, but def it out for now */
-#if 0
-static struct {
-       unsigned int    Width;
-       unsigned int    Height;
-       unsigned char   ColorMap[3][MAXCOLORMAPSIZE];
-       unsigned int    BitPixel;
-       unsigned int    ColorResolution;
-       unsigned int    Background;
-       unsigned int    AspectRatio;
-} GifScreen;
-#endif
-
-static struct {
-       int     transparent;
-       int     delayTime;
-       int     inputFlag;
-       int     disposal;
-} Gif89 = { -1, -1, -1, 0 };
-
-static int ReadColorMap (gdIOCtx *fd, int number, unsigned char (*buffer)[256]);
-static int DoExtension (gdIOCtx *fd, int label, int *Transparent);
-static int GetDataBlock (gdIOCtx *fd, unsigned char *buf);
-static int GetCode (gdIOCtx *fd, int code_size, int flag);
-static int LWZReadByte (gdIOCtx *fd, int flag, int input_code_size);
-
-static void ReadImage (gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace); /*1.4//, int ignore); */
-
-int ZeroDataBlock;
-
-gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource)
-{
-        gdIOCtx         *in = gdNewSSCtx(inSource, NULL);
-        gdImagePtr      im;
-
-        im = gdImageCreateFromGifCtx(in);
-
-        in->gd_free(in);
-
-        return im;
-}
-
-gdImagePtr
-gdImageCreateFromGif(FILE *fdFile)
-{
-        gdIOCtx		*fd = gdNewFileCtx(fdFile);
-        gdImagePtr    	im = 0;
-
-        im = gdImageCreateFromGifCtx(fd);
-
-        fd->gd_free(fd);
-
-        return im;
-}
-
-gdImagePtr
-gdImageCreateFromGifCtx(gdIOCtxPtr fd)
-{
-/* 1.4       int imageNumber; */
-       int BitPixel;
-       int ColorResolution;
-       int Background;
-       int AspectRatio;
-       int Transparent = (-1);
-       unsigned char   buf[16];
-       unsigned char   c;
-       unsigned char   ColorMap[3][MAXCOLORMAPSIZE];
-       unsigned char   localColorMap[3][MAXCOLORMAPSIZE];
-       int             imw, imh;
-       int             useGlobalColormap;
-       int             bitPixel;
-       int	       i;
-       /*1.4//int             imageCount = 0; */
-       char            version[4];
-
-       gdImagePtr im = 0;
-       ZeroDataBlock = FALSE;
-
-       /*1.4//imageNumber = 1; */
-       if (! ReadOK(fd,buf,6)) {
-		return 0;
-	}
-       if (strncmp((char *)buf,"GIF",3) != 0) {
-		return 0;
-	}
-       strncpy(version, (char *)buf + 3, 3);
-       version[3] = '\0';
-
-       if ((strcmp(version, "87a") != 0) && (strcmp(version, "89a") != 0)) {
-		return 0;
-	}
-       if (! ReadOK(fd,buf,7)) {
-		return 0;
-	}
-       BitPixel        = 2<<(buf[4]&0x07);
-       ColorResolution = (int) (((buf[4]&0x70)>>3)+1);
-       Background      = buf[5];
-       AspectRatio     = buf[6];
-
-       if (BitSet(buf[4], LOCALCOLORMAP)) {    /* Global Colormap */
-               if (ReadColorMap(fd, BitPixel, ColorMap)) {
-			return 0;
-		}
-       }
-       for (;;) {
-               if (! ReadOK(fd,&c,1)) {
-                       return 0;
-               }
-               if (c == ';') {         /* GIF terminator */
-			goto terminated;
-	       }
-
-               if (c == '!') {         /* Extension */
-                       if (! ReadOK(fd,&c,1)) {
-                               return 0;
-                       }
-                       DoExtension(fd, c, &Transparent);
-                       continue;
-               }
-
-               if (c != ',') {         /* Not a valid start character */
-                       continue;
-               }
-
-               /*1.4//++imageCount; */
-
-               if (! ReadOK(fd,buf,9)) {
-	               return 0;
-               }
-
-               useGlobalColormap = ! BitSet(buf[8], LOCALCOLORMAP);
-
-               bitPixel = 1<<((buf[8]&0x07)+1);
-
-               imw = LM_to_uint(buf[4],buf[5]);
-               imh = LM_to_uint(buf[6],buf[7]);
-	       if (!(im = gdImageCreate(imw, imh))) {
-			 return 0;
-	       }
-               im->interlace = BitSet(buf[8], INTERLACE);
-               if (! useGlobalColormap) {
-                       if (ReadColorMap(fd, bitPixel, localColorMap)) { 
-                                 return 0;
-                       }
-                       ReadImage(im, fd, imw, imh, localColorMap, 
-                                 BitSet(buf[8], INTERLACE)); 
-                                 /*1.4//imageCount != imageNumber); */
-               } else {
-                       ReadImage(im, fd, imw, imh,
-                                 ColorMap, 
-                                 BitSet(buf[8], INTERLACE));
-                                 /*1.4//imageCount != imageNumber); */
-               }
-               if (Transparent != (-1)) {
-                       gdImageColorTransparent(im, Transparent);
-               }	   
-	       goto terminated;
-       }
-
-terminated:
-       /* Terminator before any image was declared! */
-       if (!im) {
-		return 0;
-       }
-       /* Check for open colors at the end, so
-          we can reduce colorsTotal and ultimately
-          BitsPerPixel */
-       for (i=((im->colorsTotal-1)); (i>=0); i--) {
-		if (im->open[i]) {
-                	im->colorsTotal--;
-                } else {
-                	break;
-                }
-       } 
-       return im;
-}
-
-static int
-ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256])
-{
-       int             i;
-       unsigned char   rgb[3];
-
-
-       for (i = 0; i < number; ++i) {
-               if (! ReadOK(fd, rgb, sizeof(rgb))) {
-                       return TRUE;
-               }
-               buffer[CM_RED][i] = rgb[0] ;
-               buffer[CM_GREEN][i] = rgb[1] ;
-               buffer[CM_BLUE][i] = rgb[2] ;
-       }
-
-
-       return FALSE;
-}
-
-static int
-DoExtension(gdIOCtx *fd, int label, int *Transparent)
-{
-       static unsigned char     buf[256];
-
-       switch (label) {
-       case 0xf9:              /* Graphic Control Extension */
-               (void) GetDataBlock(fd, (unsigned char*) buf);
-               Gif89.disposal    = (buf[0] >> 2) & 0x7;
-               Gif89.inputFlag   = (buf[0] >> 1) & 0x1;
-               Gif89.delayTime   = LM_to_uint(buf[1],buf[2]);
-               if ((buf[0] & 0x1) != 0)
-                       *Transparent = buf[3];
-
-               while (GetDataBlock(fd, (unsigned char*) buf) != 0)
-                       ;
-               return FALSE;
-       default:
-               break;
-       }
-       while (GetDataBlock(fd, (unsigned char*) buf) != 0)
-               ;
-
-       return FALSE;
-}
-
-static int
-GetDataBlock_(gdIOCtx *fd, unsigned char *buf)
-{
-       unsigned char   count;
-
-       if (! ReadOK(fd,&count,1)) {
-               return -1;
-       }
-
-       ZeroDataBlock = count == 0;
-
-       if ((count != 0) && (! ReadOK(fd, buf, count))) {
-               return -1;
-       }
-
-       return count;
-}
-
-static int
-GetDataBlock(gdIOCtx *fd, unsigned char *buf)
-{
- int rv;
- int i;
-
- rv = GetDataBlock_(fd,buf);
- if (VERBOSE)
-  { printf("[GetDataBlock returning %d",rv);
-    if (rv > 0)
-     { printf(":");
-       for (i=0;i= lastbit) {
-               if (done) {
-                       if (curbit >= lastbit) {
-                                /* Oh well */
-                       }                        
-                       return -1;
-               }
-               buf[0] = buf[last_byte-2];
-               buf[1] = buf[last_byte-1];
-
-               if ((count = GetDataBlock(fd, &buf[2])) == 0)
-                       done = TRUE;
-
-               last_byte = 2 + count;
-               curbit = (curbit - lastbit) + 16;
-               lastbit = (2+count)*8 ;
-       }
-
-       ret = 0;
-       for (i = curbit, j = 0; j < code_size; ++i, ++j)
-               ret |= ((buf[ i / 8 ] & (1 << (i % 8))) != 0) << j;
-
-       curbit += code_size;
-       return ret;
-}
-
-static int
-GetCode(gdIOCtx *fd, int code_size, int flag)
-{
- int rv;
-
- rv = GetCode_(fd,code_size,flag);
- if (VERBOSE) printf("[GetCode(,%d,%d) returning %d]\n",code_size,flag,rv);
- return(rv);
-}
-
-#define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2)
-static int
-LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size)
-{
-       static int      fresh = FALSE;
-       int             code, incode;
-       static int      code_size, set_code_size;
-       static int      max_code, max_code_size;
-       static int      firstcode, oldcode;
-       static int      clear_code, end_code;
-       static int      table[2][(1<< MAX_LWZ_BITS)];
-       static int      stack[STACK_SIZE], *sp;
-       register int    i;
-
-       if (flag) {
-               set_code_size = input_code_size;
-               code_size = set_code_size+1;
-               clear_code = 1 << set_code_size ;
-               end_code = clear_code + 1;
-               max_code_size = 2*clear_code;
-               max_code = clear_code+2;
-
-               GetCode(fd, 0, TRUE);
-               
-               fresh = TRUE;
-
-               for (i = 0; i < clear_code; ++i) {
-                       table[0][i] = 0;
-                       table[1][i] = i;
-               }
-               for (; i < (1< stack)
-               return *--sp;
-
-       while ((code = GetCode(fd, code_size, FALSE)) >= 0) {
-               if (code == clear_code) {
-                       for (i = 0; i < clear_code; ++i) {
-                               table[0][i] = 0;
-                               table[1][i] = i;
-                       }
-                       for (; i < (1< 0)
-                               ;
-
-                       if (count != 0)
-                       return -2;
-               }
-
-               incode = code;
-
-	       if (sp == (stack + STACK_SIZE)) {
-		       /* Bad compressed data stream */
-		       return -1;
-	       }
-
-               if (code >= max_code) {
-                       *sp++ = firstcode;
-                       code = oldcode;
-               }
-
-               while (code >= clear_code) {
-		       if (sp == (stack + STACK_SIZE)) {
-			       /* Bad compressed data stream */
-			       return -1;
-		       }
-                       *sp++ = table[1][code];
-                       if (code == table[0][code]) {
-                               /* Oh well */
-                       }
-                       code = table[0][code];
-               }
-
-               *sp++ = firstcode = table[1][code];
-
-               if ((code = max_code) <(1<= max_code_size) &&
-                               (max_code_size < (1< stack)
-                       return *--sp;
-       }
-       return code;
-}
-
-static int
-LWZReadByte(gdIOCtx *fd, int flag, int input_code_size)
-{
- int rv;
-
- rv = LWZReadByte_(fd,flag,input_code_size);
- if (VERBOSE) printf("[LWZReadByte(,%d,%d) returning %d]\n",flag,input_code_size,rv);
- return(rv);
-}
-
-static void
-ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace) /*1.4//, int ignore) */
-{
-       unsigned char   c;      
-       int             v;
-       int             xpos = 0, ypos = 0, pass = 0;
-       int i;
-       /* Stash the color map into the image */
-       for (i=0; (ired[i] = cmap[CM_RED][i];	
-               im->green[i] = cmap[CM_GREEN][i];	
-               im->blue[i] = cmap[CM_BLUE][i];	
-               im->open[i] = 1;
-       }
-       /* Many (perhaps most) of these colors will remain marked open. */
-       im->colorsTotal = gdMaxColors;
-       /*
-       **  Initialize the Compression routines
-       */
-       if (! ReadOK(fd,&c,1)) {
-               return; 
-       }
-       if (LWZReadByte(fd, TRUE, c) < 0) {
-               return;
-       }
-
-       /*
-       **  If this is an "uninteresting picture" ignore it.
-       **  REMOVED For 1.4
-       */
-       /*if (ignore) { */
-       /*        while (LWZReadByte(fd, FALSE, c) >= 0) */
-       /*                ; */
-       /*        return; */
-       /*} */
-
-       while ((v = LWZReadByte(fd,FALSE,c)) >= 0 ) {
-               /* This how we recognize which colors are actually used. */
-               if (im->open[v]) {
-                       im->open[v] = 0;
-               }
-               gdImageSetPixel(im, xpos, ypos, v);
-               ++xpos;
-               if (xpos == len) {
-                       xpos = 0;
-                       if (interlace) {
-                               switch (pass) {
-                               case 0:
-                               case 1:
-                                       ypos += 8; break;
-                               case 2:
-                                       ypos += 4; break;
-                               case 3:
-                                       ypos += 2; break;
-                               }
-
-                               if (ypos >= height) {
-                                       ++pass;
-                                       switch (pass) {
-                                       case 1:
-                                               ypos = 4; break;
-                                       case 2:
-                                               ypos = 2; break;
-                                       case 3:
-                                               ypos = 1; break;
-                                       default:
-                                               goto fini;
-                                       }
-                               }
-                       } else {
-                               ++ypos;
-                       }
-               }
-               if (ypos >= height)
-                       break;
-       }
-
-fini:
-       if (LWZReadByte(fd,FALSE,c)>=0) {
-               /* Ignore extra */
-       }
-}
-

Property changes on: head/graphics/gd2/files/gd_gif_in.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd2/files/gdcmpgif.c
===================================================================
--- head/graphics/gd2/files/gdcmpgif.c	(revision 87213)
+++ head/graphics/gd2/files/gdcmpgif.c	(nonexistent)
@@ -1,85 +0,0 @@
-#include 
-#include  /* For unlink function */
-#include "gd.h"
-
-/* A short program which converts a .png file into a .gd file, for
-	your convenience in creating images on the fly from a
-	basis image that must be loaded quickly. The .gd format
-	is not intended to be a general-purpose format. */
-
-void CompareImages(char *msg, gdImagePtr im1, gdImagePtr im2);
-
-
-int main(int argc, char **argv)
-{
-	gdImagePtr im1, im2;
-	FILE *in;
-
-	if (argc != 3) {
-		fprintf(stderr, "Usage: gdcmpgif filename.gif filename.gif\n");
-		exit(1);
-	}
-	in = fopen(argv[1], "rb");
-	if (!in) {
-		fprintf(stderr, "Input file does not exist!\n");
-		exit(1);
-	}
-	im1 = gdImageCreateFromGif(in);
-	fclose(in);
-
-	if (!im1) {
-		fprintf(stderr, "Input is not in GIF format!\n");
-		exit(1);
-	}
-
-	in = fopen(argv[2], "rb");
-	if (!in) {
-		fprintf(stderr, "Input file 2 does not exist!\n");
-		exit(1);
-	}
-	im2 = gdImageCreateFromGif(in);
-	fclose(in);
-
-	if (!im2) {
-		fprintf(stderr, "Input 2 is not in GIF format!\n");
-		exit(1);
-	}
-
-	CompareImages("gdcmpgif", im1, im2);
-
-	gdImageDestroy(im1);
-        gdImageDestroy(im2);
-
-	return 0;
-}
-
-void CompareImages(char *msg, gdImagePtr im1, gdImagePtr im2)
-{
-	int cmpRes;
-
-	cmpRes = gdImageCompare(im1, im2);
-
-	if (cmpRes & GD_CMP_IMAGE) {
-		printf("%%%s: ERROR images differ: BAD\n",msg);
-	} else if (cmpRes != 0) {
-		printf("%%%s: WARNING images differ: WARNING - Probably OK\n",msg);
-	} else {
-		printf("%%%s: OK\n",msg);
-		return;
-	}
-
-	if (cmpRes & (GD_CMP_SIZE_X + GD_CMP_SIZE_Y)) {
-		printf("-%s: INFO image sizes differ\n",msg);
-	}
-
-	if (cmpRes & GD_CMP_NUM_COLORS) {
-		printf("-%s: INFO number of pallette entries differ %d Vs. %d\n",msg,
-			im1->colorsTotal, im2->colorsTotal);
-	}
-
-	if (cmpRes & GD_CMP_COLOR) {
-		printf("-%s: INFO actual colours of pixels differ\n",msg);
-	}
-}
-
-

Property changes on: head/graphics/gd2/files/gdcmpgif.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/p5-GD2/pkg-descr
===================================================================
--- head/graphics/p5-GD2/pkg-descr	(revision 87213)
+++ head/graphics/p5-GD2/pkg-descr	(nonexistent)
@@ -1,6 +0,0 @@
-GD.pm is a Perl interface to Thomas Boutell's gd graphics library
-(version 2.01 or higher). GD allows you to create color drawings
-using a large number of graphics primitives, and emit the drawings
-as PNG files.
-
-WWW: http://stein.cshl.org/WWW/software/GD/

Property changes on: head/graphics/p5-GD2/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/p5-GD2/distinfo
===================================================================
--- head/graphics/p5-GD2/distinfo	(revision 87213)
+++ head/graphics/p5-GD2/distinfo	(nonexistent)
@@ -1 +0,0 @@
-MD5 (GD-2.07.tar.gz) = 7a44d308e082471e824fcbff044d8300

Property changes on: head/graphics/p5-GD2/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.13
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/p5-GD2/pkg-plist
===================================================================
--- head/graphics/p5-GD2/pkg-plist	(revision 87213)
+++ head/graphics/p5-GD2/pkg-plist	(nonexistent)
@@ -1,9 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/GD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GD/Polyline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/qd.pl
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GD

Property changes on: head/graphics/p5-GD2/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.10
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/p5-GD2/Makefile
===================================================================
--- head/graphics/p5-GD2/Makefile	(revision 87213)
+++ head/graphics/p5-GD2/Makefile	(nonexistent)
@@ -1,26 +0,0 @@
-# New ports collection makefile for:    p5-GD2
-# Date created:				March 11, 2003
-# Whom:	      				Philip M. Gollucci 
-#
-# $FreeBSD$
-#
-
-PORTNAME=	GD2
-PORTVERSION=	2.07
-CATEGORIES=	graphics perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	GD
-PKGNAMEPREFIX=	p5-
-DISTNAME=	GD-${PORTVERSION}
-
-MAINTAINER=	philip@p6m7g8.com
-COMMENT=	A perl5 interface to Gd Graphics Library version2
-
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
-
-PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	-options "JPEG,FT,XPM" -lib_gd_path ${LOCALBASE} -lib_ft_path ${X11BASE} -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE}
-
-MAN3=		GD.3 GD::Polyline.3
-
-.include 

Property changes on: head/graphics/p5-GD2/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.33
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/graphics/p5-GD2/files/patch-GD.xs
===================================================================
--- head/graphics/p5-GD2/files/patch-GD.xs	(revision 87213)
+++ head/graphics/p5-GD2/files/patch-GD.xs	(nonexistent)
@@ -1,33 +0,0 @@
---- GD.xs.orig	Thu Apr 24 07:00:11 2003
-+++ GD.xs	Wed May 14 17:33:13 2003
-@@ -18,6 +18,30 @@
- /* Copyright 1995 - 1998, Lincoln D. Stein.  See accompanying README file for
- 	usage restrictions */
- 
-+#ifndef PERL_REVISION
-+#   ifndef __PATCHLEVEL_H_INCLUDED__
-+#       include "patchlevel.h"
-+#   endif
-+#   ifndef PERL_REVISION
-+#       define PERL_REVISION    (5)
-+        /* Replace: 1 */
-+#       define PERL_VERSION     PATCHLEVEL
-+#       define PERL_SUBVERSION  SUBVERSION
-+        /* Replace PERL_PATCHLEVEL with PERL_VERSION */
-+        /* Replace: 0 */
-+#   endif
-+#endif
-+
-+#if (PERL_VERSION == 5) && (PERL_SUBVERSION==3)
-+#ifndef PL_na
-+# define PL_na na
-+#endif
-+
-+#ifndef SvPV_nolen
-+# define SvPV_nolen(sv) SvPV(sv, PL_na)
-+#endif
-+#endif /* 5.00503 */
-+
- static int
- not_here(char *s)
- {

Property changes on: head/graphics/p5-GD2/files/patch-GD.xs
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/Makefile
===================================================================
--- head/graphics/Makefile	(revision 87213)
+++ head/graphics/Makefile	(revision 87214)
@@ -1,438 +1,437 @@
 # $FreeBSD$
 #
 
     SUBDIR += 4va
     SUBDIR += Cgraph
     SUBDIR += Coin
     SUBDIR += EZWGL
     SUBDIR += GIFgraph
     SUBDIR += Hermes
     SUBDIR += IPA
     SUBDIR += ImageMagick
     SUBDIR += Mesa3
     SUBDIR += OpenEXR
     SUBDIR += aalib
     SUBDIR += acidwarp
     SUBDIR += animabob
     SUBDIR += aoi
     SUBDIR += aqsis
     SUBDIR += autotrace
     SUBDIR += aview
     SUBDIR += backfract
     SUBDIR += barcode
     SUBDIR += bbrb
     SUBDIR += blender
     SUBDIR += blender-devel
     SUBDIR += cadubi
     SUBDIR += camediaplay
     SUBDIR += chbg
     SUBDIR += claraocr
     SUBDIR += compupic
     SUBDIR += cqcam
     SUBDIR += crw
     SUBDIR += cthumb
     SUBDIR += cybervrml97
     SUBDIR += dataplot
     SUBDIR += dc20ctrl
     SUBDIR += dc20pack
     SUBDIR += dc3play
     SUBDIR += deep_zoom
     SUBDIR += dia
     SUBDIR += diacanvas
     SUBDIR += digikam
     SUBDIR += divxcalc
     SUBDIR += djvulibre
     SUBDIR += dore
     SUBDIR += dri-devel
     SUBDIR += drm-kmod
     SUBDIR += duhdraw
     SUBDIR += dynamechs
     SUBDIR += ecg2png
     SUBDIR += electriceyes
     SUBDIR += enfle
     SUBDIR += entice
     SUBDIR += eog2
     SUBDIR += epix
     SUBDIR += eps2png
     SUBDIR += epstool
     SUBDIR += eterm-bg
     SUBDIR += evas
     SUBDIR += evolvotron
     SUBDIR += exiftags
     SUBDIR += fbm
     SUBDIR += feh
     SUBDIR += figurine
     SUBDIR += filmgimp
     SUBDIR += flashplayer
     SUBDIR += flasm
     SUBDIR += fli2gif
     SUBDIR += flip
     SUBDIR += fly
     SUBDIR += fnlib
     SUBDIR += fractorama
     SUBDIR += frontline
     SUBDIR += fujiplay
     SUBDIR += g2
     SUBDIR += g3dviewer
     SUBDIR += gauche-gl
     SUBDIR += gcolor
     SUBDIR += gd
-    SUBDIR += gd-nox11
-    SUBDIR += gd2
+    SUBDIR += gd1
     SUBDIR += gdal
     SUBDIR += gdchart
     SUBDIR += gdk-pixbuf
     SUBDIR += gdtclft
     SUBDIR += geist
     SUBDIR += geomview
     SUBDIR += gfont
     SUBDIR += giblib
     SUBDIR += gif2png
     SUBDIR += gifmerge
     SUBDIR += gifsicle
     SUBDIR += giftool
     SUBDIR += giftrans
     SUBDIR += gimageview
     SUBDIR += gimp-devel
     SUBDIR += gimp-manual-html
     SUBDIR += gimp-manual-pdf
     SUBDIR += gimp1
     SUBDIR += giram
     SUBDIR += gkrellkam
     SUBDIR += gkrellkam2
     SUBDIR += gle
     SUBDIR += glide3
     SUBDIR += gliv
     SUBDIR += gltk
     SUBDIR += gltt
     SUBDIR += gmt
     SUBDIR += gnofract4d
     SUBDIR += gnomecanvas
     SUBDIR += gnomeiconedit
     SUBDIR += gocr
     SUBDIR += gozer
     SUBDIR += gpaint
     SUBDIR += gphoto2
     SUBDIR += gplot
     SUBDIR += gqview
     SUBDIR += gqview-devel
     SUBDIR += gracula
     SUBDIR += graphviz
     SUBDIR += gridpix
     SUBDIR += gsculpt
     SUBDIR += gthumb
     SUBDIR += gthumb2
     SUBDIR += gtkam
     SUBDIR += gtkdps
     SUBDIR += gtkfig
     SUBDIR += gtkgraph
     SUBDIR += gtksee
     SUBDIR += gts
     SUBDIR += guilib
     SUBDIR += gview
     SUBDIR += gwenview
     SUBDIR += hdf
     SUBDIR += hdf5
     SUBDIR += hobbes-icons-xpm
     SUBDIR += hpoj
     SUBDIR += hppsmtools
     SUBDIR += hs-HOpenGL
     SUBDIR += hs-hgl
     SUBDIR += icod
     SUBDIR += icontact
     SUBDIR += imageindex
     SUBDIR += imagesort
     SUBDIR += imageviewer
     SUBDIR += imc
     SUBDIR += imlib
     SUBDIR += imlib2
     SUBDIR += imlib2_loaders
     SUBDIR += imlib3d
     SUBDIR += inventor
     SUBDIR += ipe
     SUBDIR += irit
     SUBDIR += isreal
     SUBDIR += ivtools
     SUBDIR += jasper
     SUBDIR += jbigkit
     SUBDIR += jgraph
     SUBDIR += jgv
     SUBDIR += jhead
     SUBDIR += jpeg
     SUBDIR += jpeg2ps-a4
     SUBDIR += jpeg2ps-letter
     SUBDIR += jpeginfo
     SUBDIR += jpegpixi
     SUBDIR += jpgraph
     SUBDIR += jpgtn
     SUBDIR += jslice
     SUBDIR += juno-2
     SUBDIR += kalbum
     SUBDIR += kallery
     SUBDIR += kbarcode
     SUBDIR += kdc2tiff
     SUBDIR += kdegraphics3
     SUBDIR += kimagemapeditor
     SUBDIR += kisomandel
     SUBDIR += kludge3d
     SUBDIR += landscape
     SUBDIR += lcms
     SUBDIR += leafpak
     SUBDIR += lfview
     SUBDIR += lib3ds
     SUBDIR += libafterimage
     SUBDIR += libart
     SUBDIR += libart_lgpl2
     SUBDIR += libaux
     SUBDIR += libdjvu++
     SUBDIR += libexif
     SUBDIR += libexif-gtk
     SUBDIR += libflash
     SUBDIR += libfpx
     SUBDIR += libgdgeda
     SUBDIR += libggi
     SUBDIR += libgnomecanvas
     SUBDIR += libgnomecanvasmm
     SUBDIR += libgphoto2
     SUBDIR += libgrass5
     SUBDIR += libimg
     SUBDIR += liblug
     SUBDIR += libmng
     SUBDIR += libmorph
     SUBDIR += librsvg
     SUBDIR += librsvg2
     SUBDIR += libungif
     SUBDIR += libv3d
     SUBDIR += libwmf
     SUBDIR += libwpcg
     SUBDIR += linplasma
     SUBDIR += linux-ac3d
     SUBDIR += linux-bmrt
     SUBDIR += linux-imlib
     SUBDIR += linux-jpeg
     SUBDIR += linux-png
     SUBDIR += linux-tiff
     SUBDIR += linux-ungif
     SUBDIR += linux_dri
     SUBDIR += linux_glide
     SUBDIR += linux_glx
     SUBDIR += linux_mesa3
     SUBDIR += lodju
     SUBDIR += maverik
     SUBDIR += megapov
     SUBDIR += mesagl
     SUBDIR += meshviewer
     SUBDIR += metapixel
     SUBDIR += mgp-gallery
     SUBDIR += ming
     SUBDIR += morpheus
     SUBDIR += mrsidviewer
     SUBDIR += multivideo
     SUBDIR += netpbm
     SUBDIR += nurbs++
     SUBDIR += ocaml-images
     SUBDIR += ocaml-lablgl
     SUBDIR += opendis
     SUBDIR += opendx
     SUBDIR += opendx-samples
     SUBDIR += opengl-man
     SUBDIR += openproducer
     SUBDIR += openrm
     SUBDIR += ophoto
     SUBDIR += optipng
     SUBDIR += osg
     SUBDIR += osgedit
     SUBDIR += p5-Chart-PNGgraph
     SUBDIR += p5-GD
     SUBDIR += p5-GD-Barcode
     SUBDIR += p5-GD-Graph
     SUBDIR += p5-GD-Graph3d
     SUBDIR += p5-GD-TextUtil
-    SUBDIR += p5-GD2
+    SUBDIR += p5-GD1
     SUBDIR += p5-GraphViz
     SUBDIR += p5-GraphViz-Data-Structure
     SUBDIR += p5-Graphics-ColorNames
     SUBDIR += p5-Image-Grab
     SUBDIR += p5-Image-Info
     SUBDIR += p5-Image-Size
     SUBDIR += p5-Imager
     SUBDIR += p5-Imlib2
     SUBDIR += p5-OpenGL
     SUBDIR += p5-SWF-File
     SUBDIR += p5-VCG
     SUBDIR += p5-chart
     SUBDIR += p5-ming
     SUBDIR += panorama
     SUBDIR += peps
     SUBDIR += pgperl
     SUBDIR += pgplot
     SUBDIR += photopc
     SUBDIR += phplot
     SUBDIR += picturebook
     SUBDIR += piddle
     SUBDIR += pixelize
     SUBDIR += pixieplus
     SUBDIR += pixmap
     SUBDIR += plasma-kmod
     SUBDIR += plotmtv
     SUBDIR += plotutils
     SUBDIR += png
     SUBDIR += png2html
     SUBDIR += png2ico
     SUBDIR += pngcheck
     SUBDIR += pngcrush
     SUBDIR += pngquant
     SUBDIR += pornview
     SUBDIR += povray
     SUBDIR += povray31
     SUBDIR += ppmcaption
     SUBDIR += proj
     SUBDIR += pstoedit
     SUBDIR += pstoepsi
     SUBDIR += pvmpov
     SUBDIR += py-chart
     SUBDIR += py-exif
     SUBDIR += py-gd
     SUBDIR += py-gdchart
     SUBDIR += py-graphviz
     SUBDIR += py-imaging
     SUBDIR += py-imaging-handbook
     SUBDIR += py-ming
     SUBDIR += py-opengl
     SUBDIR += py-paint
     SUBDIR += qcread
     SUBDIR += qglviewer
     SUBDIR += qiv
     SUBDIR += qslim
     SUBDIR += qtutils
     SUBDIR += quat
     SUBDIR += quat-gui
     SUBDIR += quickpics
     SUBDIR += qvplay
     SUBDIR += ray++
     SUBDIR += rayshade
     SUBDIR += reallyslick
     SUBDIR += renderpark
     SUBDIR += ruby-evas
     SUBDIR += ruby-gd
     SUBDIR += ruby-gdchart
     SUBDIR += ruby-gdk_imlib
     SUBDIR += ruby-gdk_pixbuf
     SUBDIR += ruby-gdk_pixbuf2
     SUBDIR += ruby-gnomecanvas2
     SUBDIR += ruby-graph
     SUBDIR += ruby-image_size
     SUBDIR += ruby-imlib2
     SUBDIR += ruby-libart
     SUBDIR += ruby-libart2
     SUBDIR += ruby-libexif
     SUBDIR += ruby-libpng
     SUBDIR += ruby-ming
     SUBDIR += ruby-opengl
     SUBDIR += ruby-pgplot
     SUBDIR += ruby-rmagick
     SUBDIR += ruby-svg
     SUBDIR += ruby-tgif
     SUBDIR += rubyphoto
     SUBDIR += s10sh
     SUBDIR += s3switch
     SUBDIR += sam2p
     SUBDIR += sane-backends
     SUBDIR += sane-frontends
     SUBDIR += sced
     SUBDIR += scr2png
     SUBDIR += scrot
     SUBDIR += scwm-icons
     SUBDIR += sdl_gfx
     SUBDIR += sdl_image
     SUBDIR += sdl_ttf
     SUBDIR += seejpeg
     SUBDIR += showimg
     SUBDIR += simage
     SUBDIR += sketch
     SUBDIR += sng
     SUBDIR += sodipodi
     SUBDIR += springgraph
     SUBDIR += stamp
     SUBDIR += svg2swf
     SUBDIR += svgalib
     SUBDIR += swfdec
     SUBDIR += swftools
     SUBDIR += synaesthesia
     SUBDIR += tcm
     SUBDIR += tgif
     SUBDIR += tgif-nls
     SUBDIR += threeDS
     SUBDIR += tif22pnm
     SUBDIR += tiff
     SUBDIR += tiff2png
     SUBDIR += tifmerge
     SUBDIR += togl
     SUBDIR += truevision
     SUBDIR += tulip
     SUBDIR += txtmerge
     SUBDIR += urt
     SUBDIR += utah-glx
     SUBDIR += vcg
     SUBDIR += vertex
     SUBDIR += vid
     SUBDIR += view3ds
     SUBDIR += visionegg
     SUBDIR += vp
     SUBDIR += vterrain-apps
     SUBDIR += vterrain-sdk
     SUBDIR += whirlgif
     SUBDIR += white_dune
     SUBDIR += wings
     SUBDIR += wmgrabimage
     SUBDIR += wmicons
     SUBDIR += xaos
     SUBDIR += xbarcode
     SUBDIR += xbmbrowser
     SUBDIR += xdgagrab
     SUBDIR += xdl
     SUBDIR += xenomorph
     SUBDIR += xface.el
     SUBDIR += xfig
     SUBDIR += xfpovray
     SUBDIR += xfractint
     SUBDIR += xglurbules
     SUBDIR += xgrasp
     SUBDIR += xli
     SUBDIR += xmagv
     SUBDIR += xmandel
     SUBDIR += xmedcon
     SUBDIR += xmfract
     SUBDIR += xmms-blursk
     SUBDIR += xmms-finespectrum
     SUBDIR += xmms-fishmatic
     SUBDIR += xmms-gdancer
     SUBDIR += xmms-gforce
     SUBDIR += xmms-goom
     SUBDIR += xmms-infinity
     SUBDIR += xmms-iris
     SUBDIR += xmms-jess
     SUBDIR += xmms-nebulus
     SUBDIR += xmms-paranormal
     SUBDIR += xmms-xvs
     SUBDIR += xmorph
     SUBDIR += xmountains
     SUBDIR += xmrm
     SUBDIR += xnview
     SUBDIR += xpaint
     SUBDIR += xpcd
     SUBDIR += xpdf
     SUBDIR += xpm
     SUBDIR += xpx
     SUBDIR += xrml
     SUBDIR += xsane
     SUBDIR += xtexcad
     SUBDIR += xv
     SUBDIR += xv-m17n
     SUBDIR += xwpick
     SUBDIR += xzgv
     SUBDIR += yafray
     SUBDIR += zimg
     SUBDIR += zphoto
 
 .include 

Property changes on: head/graphics/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.608
\ No newline at end of property
+1.609
\ No newline at end of property
Index: head/graphics/ecg2png/Makefile
===================================================================
--- head/graphics/ecg2png/Makefile	(revision 87213)
+++ head/graphics/ecg2png/Makefile	(revision 87214)
@@ -1,33 +1,33 @@
 # New ports collection makefile for:	ecg2png
 # Date created:				Sun 2 Jul 2000
 # Whom:					will
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ecg2png
 PORTVERSION=	0.30
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cardiothink.com/downloads/ecg2png/
 
 MAINTAINER=	ports@freebsd.org
 COMMENT=	"Converts scanned 12-lead electrocardiograms into PNGs"
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_REINPLACE=	yes
 USE_QT_VER=	3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-QTCPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/gd
+QTCPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lqt$$|-lqt-mt ${PTHREAD_LIBS}|g' ${WRKSRC}/ecg2png/Makefile.in
 	@${FIND} ${WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|#include ||g'
 	@${CHMOD} ${BINMODE} ${WRKSRC}/missing
 
 .include 

Property changes on: head/graphics/ecg2png/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/graphics/gd/Makefile
===================================================================
--- head/graphics/gd/Makefile	(revision 87213)
+++ head/graphics/gd/Makefile	(revision 87214)
@@ -1,43 +1,72 @@
 # New ports collection makefile for:	gd
-# Date created:         27 Mar 1998
-# Whom:                 jeff@cetlink.net
+# Date created:				27 Mar 1998
+# Whom:					jeff@cetlink.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gd
-PORTVERSION=	1.8.4
-PORTREVISION=	7
-PORTEPOCH=	1
+PORTVERSION=	2.0.15
+PORTREVISION=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
 		${MASTER_SITE_RINGSERVER}
 MASTER_SITE_SUBDIR=	graphics/gd
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	A graphics library for fast creation of images
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-MAKEFILE=	${FILESDIR}/Makefile.lib
+MAKE_ENV=	WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKEFILE=	${FILESDIR}/Makefile.bsd
 INSTALLS_SHLIB=	yes
 
-.if defined(WITH_X11)
+.include 
+
+.if defined(WITH_XPM)
+.if defined(WITHOUT_X11)
+LIB_DEPENDS+=	Xpm:${PORTSDIR}/graphics/xpm
+CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM -DXPM_NOX
+LDFLAGS+=	-L${X11BASE}/lib -lXpm
+.else
 USE_XPM=	yes
+CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
+LDFLAGS+=	-L${X11BASE}/lib -lXpm -lX11
 .endif
+.endif
 
+.if defined(WITH_LZW) || defined(HAVE_UNISYS_LICENSE) || \
+    (defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES")
+CPPFLAGS+=	-DLZW_LICENSED
+.endif
+
+.if defined(GD_FONTS)
+USE_PERL5_BUILD=	yes
+SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
+.endif
+
 pre-everything::
-.if !defined(WITH_X11)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Xpm support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_X11=yes\""
-	@${ECHO_MSG}
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "gd has the following tunables:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	WITH_XPM=yes			Turns on Xpm support"
+	@${ECHO_MSG} "	WITH_XPM=yes WITHOUT_X11=yes	Turns on X-less Xpm support"
+.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != "YES"
+	@${ECHO_MSG} "	WITH_LZW=yes			Turns on GIF compression support"
 .endif
+	@${ECHO_MSG} ""
 
 post-extract:
-	@${CP} ${FILESDIR}/gd_gif_in.c ${WRKSRC}
+	@${CP} ${FILESDIR}/g* ${WRKSRC}
 
-.include 
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
+.endif
+
+.include 

Property changes on: head/graphics/gd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.59
\ No newline at end of property
+1.60
\ No newline at end of property
Index: head/graphics/gd/distinfo
===================================================================
--- head/graphics/gd/distinfo	(revision 87213)
+++ head/graphics/gd/distinfo	(revision 87214)
@@ -1,2 +1 @@
-MD5 (gd-1.8.4.tar.gz) = 2aef76e79f206f9798233f025f5dd28d
-MD5 (gd_gif_in.c.bz2) = 54132aea09471bb997672436dd9a1a96
+MD5 (gd-2.0.15.tar.gz) = 6ededf633b4fd054662ec123c7825fbb

Property changes on: head/graphics/gd/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/graphics/gd/files/Makefile.lib
===================================================================
--- head/graphics/gd/files/Makefile.lib	(revision 87213)
+++ head/graphics/gd/files/Makefile.lib	(nonexistent)
@@ -1,36 +0,0 @@
-# $FreeBSD$
-
-PREFIX?=	/usr/local
-SHLIB_VER?=	2
-
-LIB=		gd1
-LIBDIR=		${PREFIX}/lib
-SHLIB_MAJOR=	${SHLIB_VER}
-SHLIB_MINOR=	0
-NOPROFILE=	yes
-NOOBJ=		yes
-
-INCS=		gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
-		gdfonts.h gdfontt.h
-INCSDIR=	${PREFIX}/include/gd
-INCDIR=		${INSCDIR}	# for pre-bsd.incs.mk API
-
-SRCS=		gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_ss.c \
-		gd_io_ss.c gd_png.c gd_jpeg.c gdxpm.c gdfontt.c gdfonts.c \
-		gdfontmb.c gdfontl.c gdfontg.c gdtables.c gdft.c gdttf.c \
-		gdcache.c gdkanji.c wbmp.c gd_wbmp.c gdhelpers.c gd_gif_in.c
-
-CFLAGS+=	-I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \
-		-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \
-		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ
-LDADD=		-L${LOCALBASE}/lib -lfreetype -ljpeg -lpng -lz
-
-.ifdef WITH_X11
-CFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
-LDADD+=		-L${X11BASE}/lib -lXpm -lX11
-.endif
-
-beforeinstall:
-	mkdir -p ${INCSDIR}
-
-.include 

Property changes on: head/graphics/gd/files/Makefile.lib
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/graphics/gd/files/patch-gdkanji.c
===================================================================
--- head/graphics/gd/files/patch-gdkanji.c	(revision 87213)
+++ head/graphics/gd/files/patch-gdkanji.c	(nonexistent)
@@ -1,87 +0,0 @@
---- gdkanji.c.orig	Fri Feb  2 05:23:56 2001
-+++ gdkanji.c	Wed Feb  7 20:59:08 2001
-@@ -103,14 +103,18 @@
- unsigned char *str;
- #endif
- {
--	static int whatcode;
-+	static int whatcode = ASCII;
-+	int oldcode = ASCII;
- 	int c, i;
- 	char *lang = NULL;
- 
- 	c = '\1';
- 	i = 0;
- 
--	if (whatcode == 0) whatcode = ASCII;
-+	if (whatcode != EUCORSJIS && whatcode != ASCII) {
-+		oldcode = whatcode;
-+		whatcode = ASCII;
-+	}
- 	
- 	while ((whatcode == EUCORSJIS || whatcode == ASCII) && c != '\0') {
- 		if ((c = str[i++]) != '\0') {
-@@ -167,7 +171,7 @@
- 				if ((c >= 64 && c <= 126) || (c >= 128 && c <= 160))
- 					whatcode = SJIS;
- 				else
--				if (c >= 253 && c >= 254) whatcode = EUC;
-+				if (c >= 253 && c <= 254) whatcode = EUC;
- 				else
- 				if (c >= 161 && c <= 252) whatcode = EUCORSJIS;
- 			}
-@@ -184,6 +188,8 @@
- 		debug("Kanji code detected at %d byte.", i);
- #endif
- 
-+	if (whatcode == EUCORSJIS && oldcode != ASCII) whatcode = oldcode;
-+
- 	if (whatcode == EUCORSJIS) {
- 		if (getenv ("LC_ALL")) lang = getenv ("LC_ALL");
- 		else
-@@ -310,7 +316,7 @@
- 			error("invalid code specification: \"%s\" or \"%s\"",
- 								EUCSTR, code);
- #endif
--		strcpy(to, from);
-+		ustrcpy(to, from);
- 		return;
- 	}
- 
-@@ -328,7 +334,7 @@
- 		else
- #endif
- 			error("something happen");
--		strcpy(to, from);
-+		ustrcpy(to, from);
- 		return;
- 	}
- 
-@@ -526,11 +532,10 @@
- 
- 	t = (unsigned char *)gdMalloc(BUFSIZ);
- 	any2eucjp(t, s, BUFSIZ);
--	i = strlen(t);
-+	i = strlen((const char *)t);
- 	gdFree(t);
- 	return i;
- }
--#endif
- 
- #ifdef DEBUG
- int main()
-@@ -543,7 +548,7 @@
- 	while ( (c = fgetc(stdin)) != '\n' && i < BUFSIZ ) input[i++] = c;
- 	input[i] = '\0';
- 
--	printf("input : %d bytes\n", strlen(input));
-+	printf("input : %d bytes\n", strlen((const char *)input));
- 	printf("output: %d bytes\n", strwidth(input));
- 
- 	output = (unsigned char *)gdMalloc(BUFSIZ);
-@@ -555,4 +560,5 @@
- 
- 	return 0;
- }
-+#endif
- #endif

Property changes on: head/graphics/gd/files/patch-gdkanji.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd/files/patch-gdcache.h
===================================================================
--- head/graphics/gd/files/patch-gdcache.h	(revision 87213)
+++ head/graphics/gd/files/patch-gdcache.h	(nonexistent)
@@ -1,10 +0,0 @@
---- gdcache.h.orig	Wed Feb  7 04:44:02 2001
-+++ gdcache.h	Fri Jul  4 21:58:32 2003
-@@ -40,7 +40,6 @@
- /* header                                                */
- /*********************************************************/
- 
--#include 
- #ifndef NULL
- #define NULL (void *)0
- #endif

Property changes on: head/graphics/gd/files/patch-gdcache.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd/files/patch-gif
===================================================================
--- head/graphics/gd/files/patch-gif	(revision 87213)
+++ head/graphics/gd/files/patch-gif	(nonexistent)
@@ -1,11 +0,0 @@
-This  patch  together  with  the old  implementation  (from  gd-1.5)  of
-gd_gif_in.c restore GD's ability to read GIF images. The writing of such
-images is troubled because of Unisys' zeal in patent enforcement.
-
---- gd.h	Tue Feb  6 14:44:01 2001
-+++ gd.h	Fri Jul 27 16:10:38 2001
-@@ -95,2 +95,4 @@
- gdImagePtr gdImageCreate(int sx, int sy);
-+gdImagePtr gdImageCreateFromGif(FILE *fd);
-+gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
- gdImagePtr gdImageCreateFromPng(FILE *fd);

Property changes on: head/graphics/gd/files/patch-gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd/files/patch-gdttf.c
===================================================================
--- head/graphics/gd/files/patch-gdttf.c	(revision 87213)
+++ head/graphics/gd/files/patch-gdttf.c	(nonexistent)
@@ -1,17 +0,0 @@
---- gdttf.c.orig	Fri Feb  2 05:23:56 2001
-+++ gdttf.c	Wed Feb  7 20:57:34 2001
-@@ -221,11 +221,10 @@
-     byte = *((unsigned char *) str);
- #ifdef JISX0208
-     if (0xA1 <= byte && byte <= 0xFE) {
--	int jiscode, ku, ten;
-+	int ku, ten;
- 
--	jiscode = 0x100 * (byte & 0x7F) + (str[1] & 0x7F);
--	ku = (jiscode >> 8) - 0x20;
--	ten = (jiscode % 256) - 0x20;
-+	ku = (byte & 0x7F) - 0x20;
-+	ten = (str[1] & 0x7F) - 0x20;
- 	if ( (ku < 1 || ku > 92) || (ten < 1 || ten > 94) ) {
-     		*chPtr = (Tcl_UniChar) byte;
-     		return 1;

Property changes on: head/graphics/gd/files/patch-gdttf.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/gd/files/Makefile.bsd
===================================================================
--- head/graphics/gd/files/Makefile.bsd	(nonexistent)
+++ head/graphics/gd/files/Makefile.bsd	(revision 87214)
@@ -0,0 +1,53 @@
+PROGS!=	${MAKE} -V BIN_PROGRAMS -f ${WRKSRC}/makefile.sample
+PROGS+=	gd2togif gdcmpgif giftogd2
+PROGS+=	annotate	# new utility, not included in makefile.sample
+TESTS=	gdtest gddemo gd2time gdtestft testac fontsizetest fontwheeltest
+SRCS=	gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c \
+	gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c \
+	gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \
+	gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h \
+	gdkanji.c gdtables.c gdxpm.c jisx0208.h \
+	wbmp.c wbmp.h
+SRCS+=	gd_gif_in.c gd_gif_out.c gd_biggif_out.c gd_lzw_out.c
+MAKEDIR=/usr/share/mk
+LIB=gd
+SHLIB_MAJOR=4
+SHLIB_MINOR=0
+INCS=	gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
+	gdfonts.h gdfontt.h
+SHLIB_NAME!=	${MAKE} -V SHLIB_NAME LIB=${LIB} \
+	SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} -f ${MAKEDIR}/bsd.lib.mk
+
+CFLAGS+=	-I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \
+		-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \
+		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ \
+		${CPPFLAGS}
+LDADD=		-L${LOCALBASE}/lib -lpng -lz -ljpeg -lfreetype -lm \
+		${LDFLAGS}
+
+# The package comes with tests, but without any sort of test-harness,
+# to run them all automaticly. So building tests is disabled here.	-mi
+all: lib${LIB}.a ${SHLIB_NAME} ${PROGS} # ${TESTS}
+
+lib${LIB}.a ${SHLIB_NAME}: ${SRCS}
+	${MAKE} LIB=${LIB} SRCS="${SRCS}" \
+		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
+		CFLAGS="${CFLAGS}" -ECFLAGS LDADD="${LDADD}" \
+		-f ${MAKEDIR}/bsd.lib.mk ${.TARGET}
+
+${PROGS} ${TESTS}: ${SHLIB_NAME} lib${LIB}.a
+	${MAKE} PROG=${.TARGET} NOMAN=1 LDADD="-L${.CURDIR} -lgd" \
+		CFLAGS="${CFLAGS}" -ECFLAGS -f ${MAKEDIR}/bsd.prog.mk
+
+install:
+	mkdir -p ${PREFIX}/include
+	${MAKE} LIB=${LIB} LIBDIR=${PREFIX}/lib NOPROFILE=true \
+		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
+		-f ${MAKEDIR}/bsd.lib.mk install
+	cd ${.CURDIR} && ${BSD_INSTALL_DATA} ${INCS} ${PREFIX}/include
+	cd ${.CURDIR} && ${BSD_INSTALL_PROGRAM} ${PROGS} ${PREFIX}/bin/
+	${BSD_INSTALL_SCRIPT} ${.CURDIR}/bdftogd ${PREFIX}/bin/
+
+.if exists(${.CURDIR}/Makefile.fonts)
+.include "Makefile.fonts"
+.endif

Property changes on: head/graphics/gd/files/Makefile.bsd
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/gd2togif.c
===================================================================
--- head/graphics/gd/files/gd2togif.c	(nonexistent)
+++ head/graphics/gd/files/gd2togif.c	(revision 87214)
@@ -0,0 +1,40 @@
+#include 
+#include "gd.h"
+
+/* A short program which converts a .gif file into a .gd file, for
+	your convenience in creating images on the fly from a
+	basis image that must be loaded quickly. The .gd format
+	is not intended to be a general-purpose format. */
+
+int main(int argc, char **argv)
+{
+	gdImagePtr im;
+	FILE *in, *out;
+	if (argc != 3) {
+		fprintf(stderr, "Usage: gd2togif filename.gd2 filename.gif\n");
+		exit(1);
+	}
+	in = fopen(argv[1], "rb");
+	if (!in) {
+		fprintf(stderr, "Input file does not exist!\n");
+		exit(1);
+	}
+	im = gdImageCreateFromGd2(in);
+	fclose(in);
+	if (!im) {
+		fprintf(stderr, "Input is not in GIF format!\n");
+		exit(1);
+	}
+	out = fopen(argv[2], "wb");
+	if (!out) {
+		fprintf(stderr, "Output file cannot be written to!\n");
+		gdImageDestroy(im);
+		exit(1);	
+	}
+	gdImageGif(im, out);
+	fclose(out);
+	gdImageDestroy(im);
+
+	return 0;
+}
+

Property changes on: head/graphics/gd/files/gd2togif.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/gd_biggif_out.c
===================================================================
--- head/graphics/gd/files/gd_biggif_out.c	(nonexistent)
+++ head/graphics/gd/files/gd_biggif_out.c	(revision 87214)
@@ -0,0 +1,823 @@
+#include 
+#include 
+#include 
+#include 
+#include "gd.h"
+
+/*
+** Wrapper functions for this module.
+*/
+
+void gdImageBigGif(gdImagePtr im, FILE *outFile)
+{
+        gdIOCtx   *out = gdNewFileCtx(outFile);
+        gdImageBigGifCtx(im, out);
+	out->gd_free(out);
+}
+
+void* gdImageBigGifPtr(gdImagePtr im, int *size)
+{
+	void	*rv;
+        gdIOCtx   *out = gdNewDynamicCtx(2048, NULL);
+        gdImageBigGifCtx(im, out);
+	rv = gdDPExtractData(out,size);
+ 	out->gd_free(out);
+	return rv;
+}
+
+/* Code drawn from ppmtogif.c, from the pbmplus package
+**
+** Based on GIFENCOD by David Rowley . A
+** Lempel-Zim compression based on "compress".
+**
+** Modified by Marcel Wijkstra 
+**
+** Copyright (C) 1989 by Jef Poskanzer.
+**
+** Permission to use, copy, modify, and distribute this software and its
+** documentation for any purpose and without fee is hereby granted, provided
+** that the above copyright notice appear in all copies and that both that
+** copyright notice and this permission notice appear in supporting
+** documentation.  This software is provided "as is" without express or
+** implied warranty.
+**
+** The Graphics Interchange Format(c) is the Copyright property of
+** CompuServe Incorporated.  GIF(sm) is a Service Mark property of
+** CompuServe Incorporated.
+*
+*  Heavily modified by Mouse, 1998-02-12.  
+*  Remove LZW compression.
+*  Added miGIF run length compression.
+*
+*/
+
+/*
+ * a code_int must be able to hold 2**GIFBITS values of type int, and also -1
+ */
+typedef int code_int;
+
+static int colorstobpp(int colors);
+static void BumpPixel (void);
+static int GIFNextPixel (gdImagePtr im);
+static void GIFEncode (gdIOCtx *fp, int GWidth, int GHeight, int GInterlace, int Background, int Transparent, int BitsPerPixel, int *Red, int *Green, int *Blue, gdImagePtr im);
+/*static void Putword (int w, gdIOCtx *fp); */
+static void GIFcompress (int, gdIOCtx *, gdImagePtr, int);
+static void output (code_int code);
+
+/* UNUSED
+* static void char_init (void);
+* static void char_out (int c);
+*/
+
+/* Allows for reuse */
+static void init_statics(void);
+
+void gdImageBigGifCtx(gdImagePtr im, gdIOCtx *out)
+{
+	int interlace, transparent, BitsPerPixel;
+
+	interlace = im->interlace;
+	transparent = im->transparent;
+
+	BitsPerPixel = colorstobpp(im->colorsTotal);
+	/* Clear any old values in statics strewn through the GIF code */
+	init_statics();
+	/* All set, let's do it. */
+	GIFEncode(
+		out, im->sx, im->sy, interlace, 0, transparent, BitsPerPixel,
+		im->red, im->green, im->blue, im);
+}
+
+static int
+colorstobpp(int colors)
+{
+    int bpp = 0;
+
+    if ( colors <= 2 )
+        bpp = 1;
+    else if ( colors <= 4 )
+        bpp = 2;
+    else if ( colors <= 8 )
+        bpp = 3;
+    else if ( colors <= 16 )
+        bpp = 4;
+    else if ( colors <= 32 )
+        bpp = 5;
+    else if ( colors <= 64 )
+        bpp = 6;
+    else if ( colors <= 128 )
+        bpp = 7;
+    else if ( colors <= 256 )
+        bpp = 8;
+    return bpp;
+    }
+
+/*****************************************************************************
+ *
+ * GIFENCODE.C    - GIF Image compression interface
+ *
+ * GIFEncode( FName, GHeight, GWidth, GInterlace, Background, Transparent,
+ *            BitsPerPixel, Red, Green, Blue, gdImagePtr )
+ *
+ *****************************************************************************/
+
+#define TRUE 1
+#define FALSE 0
+
+static int Width, Height;
+static int curx, cury;
+static long CountDown;
+static int Pass = 0;
+static int Interlace;
+
+/*
+ * Bump the 'curx' and 'cury' to point to the next pixel
+ */
+static void
+BumpPixel(void)
+{
+        /*
+         * Bump the current X position
+         */
+        ++curx;
+
+        /*
+         * If we are at the end of a scan line, set curx back to the beginning
+         * If we are interlaced, bump the cury to the appropriate spot,
+         * otherwise, just increment it.
+         */
+        if( curx == Width ) {
+                curx = 0;
+
+                if( !Interlace )
+                        ++cury;
+                else {
+                     switch( Pass ) {
+
+                       case 0:
+                          cury += 8;
+                          if( cury >= Height ) {
+                                ++Pass;
+                                cury = 4;
+                          }
+                          break;
+
+                       case 1:
+                          cury += 8;
+                          if( cury >= Height ) {
+                                ++Pass;
+                                cury = 2;
+                          }
+                          break;
+
+                       case 2:
+                          cury += 4;
+                          if( cury >= Height ) {
+                             ++Pass;
+                             cury = 1;
+                          }
+                          break;
+
+                       case 3:
+                          cury += 2;
+                          break;
+                        }
+                }
+        }
+}
+
+/*
+ * Return the next pixel from the image
+ */
+static int
+GIFNextPixel(gdImagePtr im)
+{
+        int r;
+
+        if( CountDown == 0 )
+                return EOF;
+
+        --CountDown;
+
+        r = gdImageGetPixel(im, curx, cury);
+
+        BumpPixel();
+
+        return r;
+}
+
+/* public */
+
+static void
+GIFEncode(gdIOCtx *fp, int GWidth, int GHeight, int GInterlace, int Background, int Transparent, int BitsPerPixel, int *Red, int *Green, int *Blue, gdImagePtr im)
+{
+        int B;
+        int RWidth, RHeight;
+        int LeftOfs, TopOfs;
+        int Resolution;
+        int ColorMapSize;
+        int InitCodeSize;
+        int i;
+
+        Interlace = GInterlace;
+
+        ColorMapSize = 1 << BitsPerPixel;
+
+        RWidth = Width = GWidth;
+        RHeight = Height = GHeight;
+        LeftOfs = TopOfs = 0;
+
+        Resolution = BitsPerPixel;
+
+        /*
+         * Calculate number of bits we are expecting
+         */
+        CountDown = (long)Width * (long)Height;
+
+        /*
+         * Indicate which pass we are on (if interlace)
+         */
+        Pass = 0;
+
+        /*
+         * The initial code size
+         */
+        if( BitsPerPixel <= 1 )
+                InitCodeSize = 2;
+        else
+                InitCodeSize = BitsPerPixel;
+
+        /*
+         * Set up the current x and y position
+         */
+        curx = cury = 0;
+
+        /*
+         * Write the Magic header
+         */
+        gdPutBuf( Transparent < 0 ? "GIF87a" : "GIF89a", 6, fp );
+
+        /*
+         * Write out the screen width and height
+         */
+        Putword( RWidth, fp );
+        Putword( RHeight, fp );
+
+        /*
+         * Indicate that there is a global colour map
+         */
+        B = 0x80;       /* Yes, there is a color map */
+
+        /*
+         * OR in the resolution
+         */
+        B |= (Resolution - 1) << 4;
+
+        /*
+         * OR in the Bits per Pixel
+         */
+        B |= (BitsPerPixel - 1);
+
+        /*
+         * Write it out
+         */
+        gdPutC( B, fp );
+
+        /*
+         * Write out the Background colour
+         */
+        gdPutC( Background, fp );
+
+        /*
+         * Byte of 0's (future expansion)
+         */
+        gdPutC( 0, fp );
+
+        /*
+         * Write out the Global Colour Map
+         */
+        for( i=0; i= 0 ) {
+	    gdPutC( '!', fp );
+	    gdPutC( 0xf9, fp );
+	    gdPutC( 4, fp );
+	    gdPutC( 1, fp );
+	    gdPutC( 0, fp );
+	    gdPutC( 0, fp );
+	    gdPutC( (unsigned char) Transparent, fp );
+	    gdPutC( 0, fp );
+	}
+
+        /*
+         * Write an Image separator
+         */
+        gdPutC( ',', fp );
+
+        /*
+         * Write the Image header
+         */
+
+        Putword( LeftOfs, fp );
+        Putword( TopOfs, fp );
+        Putword( Width, fp );
+        Putword( Height, fp );
+
+        /*
+         * Write out whether or not the image is interlaced
+         */
+        if( Interlace )
+                gdPutC( 0x40, fp );
+        else
+                gdPutC( 0x00, fp );
+
+        /*
+         * Write out the initial code size
+         */
+        gdPutC( InitCodeSize, fp );
+
+        /*
+         * Go and actually compress the data
+         */
+        GIFcompress( InitCodeSize+1, fp, im, Background );
+
+        /*
+         * Write out a Zero-length packet (to end the series)
+         */
+        gdPutC( 0, fp );
+
+        /*
+         * Write the GIF file terminator
+         */
+        gdPutC( ';', fp );
+}
+
+/* Write out a word to the GIF file */
+/*static void */
+/*Putword(int w, gdIOCtx *fp) */
+/*{ */
+/*        fputc( w & 0xff, fp ); */
+/*        fputc( (w / 256) & 0xff, fp ); */
+/*} */
+
+#define GIFBITS 12
+
+/*-----------------------------------------------------------------------
+ *
+ * miGIF Compression - mouse and ivo's GIF-compatible compression
+ *
+ *          -run length encoding compression routines-
+ *
+ * Copyright (C) 1998 Hutchison Avenue Software Corporation
+ *               http://www.hasc.com
+ *               info@hasc.com
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation.  This software is provided "AS IS." The Hutchison Avenue 
+ * Software Corporation disclaims all warranties, either express or implied, 
+ * including but not limited to implied warranties of merchantability and 
+ * fitness for a particular purpose, with respect to this code and accompanying
+ * documentation. 
+ * 
+ * The miGIF compression routines do not, strictly speaking, generate files 
+ * conforming to the GIF spec, since the image data is not LZW-compressed 
+ * (this is the point: in order to avoid transgression of the Unisys patent 
+ * on the LZW algorithm.)  However, miGIF generates data streams that any 
+ * reasonably sane LZW decompresser will decompress to what we want.
+ *
+ * miGIF compression uses run length encoding. It compresses horizontal runs 
+ * of pixels of the same color. This type of compression gives good results
+ * on images with many runs, for example images with lines, text and solid 
+ * shapes on a solid-colored background. It gives little or no compression 
+ * on images with few runs, for example digital or scanned photos.
+ *
+ *                               der Mouse
+ *                      mouse@rodents.montreal.qc.ca
+ *            7D C8 61 52 5D E7 2D 39  4E F1 31 3E E8 B3 27 4B
+ *
+ *                             ivo@hasc.com
+ *
+ * The Graphics Interchange Format(c) is the Copyright property of
+ * CompuServe Incorporated.  GIF(sm) is a Service Mark property of
+ * CompuServe Incorporated.
+ *
+ */
+
+static int rl_pixel;
+static int rl_basecode;
+static int rl_count;
+static int rl_table_pixel;
+static int rl_table_max;
+static int just_cleared;
+static int out_bits;
+static int out_bits_init;
+static int out_count;
+static int out_bump;
+static int out_bump_init;
+static int out_clear;
+static int out_clear_init;
+static int max_ocodes;
+static int code_clear;
+static int code_eof;
+static unsigned int obuf;
+static int obits;
+static gdIOCtx *ofile;
+static unsigned char oblock[256];
+static int oblen;
+
+/* Used only when debugging GIF compression code */
+/* #define DEBUGGING_ENVARS */
+
+#ifdef DEBUGGING_ENVARS
+
+static int verbose_set = 0;
+static int verbose;
+#define VERBOSE (verbose_set?verbose:set_verbose())
+
+static int set_verbose(void)
+{
+ verbose = !!getenv("GIF_VERBOSE");
+ verbose_set = 1;
+ return(verbose);
+}
+
+#else
+
+#define VERBOSE 0
+
+#endif
+
+
+static const char *binformat(unsigned int v, int nbits)
+{
+ static char bufs[8][64];
+ static int bhand = 0;
+ unsigned int bit;
+ int bno;
+ char *bp;
+
+ bhand --;
+ if (bhand < 0) bhand = (sizeof(bufs)/sizeof(bufs[0]))-1;
+ bp = &bufs[bhand][0];
+ for (bno=nbits-1,bit=1U<=0;bno--,bit>>=1)
+  { *bp++ = (v & bit) ? '1' : '0';
+    if (((bno&3) == 0) && (bno != 0)) *bp++ = '.';
+  }
+ *bp = '\0';
+ return(&bufs[bhand][0]);
+}
+
+static void write_block(void)
+{
+ int i;
+
+ if (VERBOSE)
+  { printf("write_block %d:",oblen);
+    for (i=0;i= 255) write_block();
+}
+
+static void block_flush(void)
+{
+ if (VERBOSE) printf("block_flush\n");
+ if (oblen > 0) write_block();
+}
+
+static void output(int val)
+{
+ if (VERBOSE) printf("output %s [%s %d %d]\n",binformat(val,out_bits),binformat(obuf,obits),obits,out_bits);
+ obuf |= val << obits;
+ obits += out_bits;
+ while (obits >= 8)
+  { block_out(obuf&0xff);
+    obuf >>= 8;
+    obits -= 8;
+  }
+ if (VERBOSE) printf("output leaving [%s %d]\n",binformat(obuf,obits),obits);
+}
+
+static void output_flush(void)
+{
+ if (VERBOSE) printf("output_flush\n");
+ if (obits > 0) block_out(obuf);
+ block_flush();
+}
+
+static void did_clear(void)
+{
+ if (VERBOSE) printf("did_clear\n");
+ out_bits = out_bits_init;
+ out_bump = out_bump_init;
+ out_clear = out_clear_init;
+ out_count = 0;
+ rl_table_max = 0;
+ just_cleared = 1;
+}
+
+static void output_plain(int c)
+{
+ if (VERBOSE) printf("output_plain %s\n",binformat(c,out_bits));
+ just_cleared = 0;
+ output(c);
+ out_count ++;
+ if (out_count >= out_bump)
+  { out_bits ++;
+    out_bump += 1 << (out_bits - 1);
+  }
+ if (out_count >= out_clear)
+  { output(code_clear);
+    did_clear();
+  }
+}
+
+static unsigned int isqrt(unsigned int x)
+{
+ unsigned int r;
+ unsigned int v;
+
+ if (x < 2) return(x);
+ for (v=x,r=1;v;v>>=2,r<<=1) ;
+ while (1)
+  { v = ((x / r) + r) / 2;
+    if ((v == r) || (v == r+1)) return(r);
+    r = v;
+  }
+}
+
+static unsigned int compute_triangle_count(unsigned int count, unsigned int nrepcodes)
+{
+ unsigned int perrep;
+ unsigned int cost;
+
+ cost = 0;
+ perrep = (nrepcodes * (nrepcodes+1)) / 2;
+ while (count >= perrep)
+  { cost += nrepcodes;
+    count -= perrep;
+  }
+ if (count > 0)
+  { unsigned int n;
+    n = isqrt(count);
+    while ((n*(n+1)) >= 2*count) n --;
+    while ((n*(n+1)) < 2*count) n ++;
+    cost += n;
+  }
+ return(cost);
+}
+
+static void max_out_clear(void)
+{
+ out_clear = max_ocodes;
+}
+
+static void reset_out_clear(void)
+{
+ out_clear = out_clear_init;
+ if (out_count >= out_clear)
+  { output(code_clear);
+    did_clear();
+  }
+}
+
+static void rl_flush_fromclear(int count)
+{
+ int n;
+
+ if (VERBOSE) printf("rl_flush_fromclear %d\n",count);
+ max_out_clear();
+ rl_table_pixel = rl_pixel;
+ n = 1;
+ while (count > 0)
+  { if (n == 1)
+     { rl_table_max = 1;
+       output_plain(rl_pixel);
+       count --;
+     }
+    else if (count >= n)
+     { rl_table_max = n;
+       output_plain(rl_basecode+n-2);
+       count -= n;
+     }
+    else if (count == 1)
+     { rl_table_max ++;
+       output_plain(rl_pixel);
+       count = 0;
+     }
+    else
+     { rl_table_max ++;
+       output_plain(rl_basecode+count-2);
+       count = 0;
+     }
+    if (out_count == 0) n = 1; else n ++;
+  }
+ reset_out_clear();
+ if (VERBOSE) printf("rl_flush_fromclear leaving table_max=%d\n",rl_table_max);
+}
+
+static void rl_flush_clearorrep(int count)
+{
+ int withclr;
+
+ if (VERBOSE) printf("rl_flush_clearorrep %d\n",count);
+ withclr = 1 + compute_triangle_count(count,max_ocodes);
+ if (withclr < count)
+  { output(code_clear);
+    did_clear();
+    rl_flush_fromclear(count);
+  }
+ else
+  { for (;count>0;count--) output_plain(rl_pixel);
+  }
+}
+
+static void rl_flush_withtable(int count)
+{
+ int repmax;
+ int repleft;
+ int leftover;
+
+ if (VERBOSE) printf("rl_flush_withtable %d\n",count);
+ repmax = count / rl_table_max;
+ leftover = count % rl_table_max;
+ repleft = (leftover ? 1 : 0);
+ if (out_count+repmax+repleft > max_ocodes)
+  { repmax = max_ocodes - out_count;
+    leftover = count - (repmax * rl_table_max);
+    repleft = 1 + compute_triangle_count(leftover,max_ocodes);
+  }
+ if (VERBOSE) printf("rl_flush_withtable repmax=%d leftover=%d repleft=%d\n",repmax,leftover,repleft);
+ if (1+compute_triangle_count(count,max_ocodes) < repmax+repleft)
+  { output(code_clear);
+    did_clear();
+    rl_flush_fromclear(count);
+    return;
+  }
+ max_out_clear();
+ for (;repmax>0;repmax--) output_plain(rl_basecode+rl_table_max-2);
+ if (leftover)
+  { if (just_cleared)
+     { rl_flush_fromclear(leftover);
+     }
+    else if (leftover == 1)
+     { output_plain(rl_pixel);
+     }
+    else
+     { output_plain(rl_basecode+leftover-2);
+     }
+  }
+ reset_out_clear();
+}
+
+static void rl_flush(void)
+{
+ /* UNUSED int table_reps; */
+ /* UNUSED int table_extra; */
+
+ if (VERBOSE) printf("rl_flush [ %d %d\n",rl_count,rl_pixel);
+ if (rl_count == 1)
+  { output_plain(rl_pixel);
+    rl_count = 0;
+    if (VERBOSE) printf("rl_flush ]\n");
+    return;
+  }
+ if (just_cleared)
+  { rl_flush_fromclear(rl_count);
+  }
+ else if ((rl_table_max < 2) || (rl_table_pixel != rl_pixel))
+  { rl_flush_clearorrep(rl_count);
+  }
+ else
+  { rl_flush_withtable(rl_count);
+  }
+ if (VERBOSE) printf("rl_flush ]\n");
+ rl_count = 0;
+}
+
+static void GIFcompress(int init_bits, gdIOCtx *outfile, gdImagePtr im, int background)
+{
+ int c;
+
+ ofile = outfile;
+ obuf = 0;
+ obits = 0;
+ oblen = 0;
+ code_clear = 1 << (init_bits - 1);
+ code_eof = code_clear + 1;
+ rl_basecode = code_eof + 1;
+ out_bump_init = (1 << (init_bits - 1)) - 1;
+ /* for images with a lot of runs, making out_clear_init larger will
+    give better compression. */ 
+ out_clear_init = (init_bits <= 3) ? 9 : (out_bump_init-1);
+#ifdef DEBUGGING_ENVARS
+  { const char *ocienv;
+    ocienv = getenv("GIF_OUT_CLEAR_INIT");
+    if (ocienv)
+     { out_clear_init = atoi(ocienv);
+       if (VERBOSE) printf("[overriding out_clear_init to %d]\n",out_clear_init);
+     }
+  }
+#endif
+ out_bits_init = init_bits;
+ max_ocodes = (1 << GIFBITS) - ((1 << (out_bits_init - 1)) + 3);
+ did_clear();
+ output(code_clear);
+ rl_count = 0;
+ while (1)
+  { c = GIFNextPixel(im);
+    if ((rl_count > 0) && (c != rl_pixel)) rl_flush();
+    if (c == EOF) break;
+    if (rl_pixel == c)
+     { rl_count ++;
+     }
+    else
+     { rl_pixel = c;
+       rl_count = 1;
+     }
+  }
+ output(code_eof);
+ output_flush();
+}
+
+/*-----------------------------------------------------------------------
+ *
+ * End of miGIF section  - See copyright notice at start of section.
+ *
+ *-----------------------------------------------------------------------
+*/
+
+/******************************************************************************
+ *
+ * GIF Specific routines
+ *
+ ******************************************************************************/
+
+/*
+ * Number of characters so far in this 'packet'
+ */
+static int a_count;
+
+/*
+ * Set up the 'byte output' routine
+ */
+
+/* UNUSED
+* static void
+* char_init(void)
+* {
+*        a_count = 0;
+* }
+*/
+
+/*
+ * Define the storage for the packet accumulator
+ */
+
+/* UNUSED static char accum[ 256 ]; */
+
+static void init_statics(void) {
+	/* Some of these are properly initialized later. What I'm doing
+		here is making sure code that depends on C's initialization
+		of statics doesn't break when the code gets called more
+		than once. */
+	Width = 0;
+	Height = 0;
+	curx = 0;
+	cury = 0;
+	CountDown = 0;
+	Pass = 0;
+	Interlace = 0;
+	a_count = 0;
+}
+
+
+/* +-------------------------------------------------------------------+ */
+/* | Copyright 1990, 1991, 1993, David Koblas.  (koblas@netcom.com)    | */
+/* |   Permission to use, copy, modify, and distribute this software   | */
+/* |   and its documentation for any purpose and without fee is hereby | */
+/* |   granted, provided that the above copyright notice appear in all | */
+/* |   copies and that both that copyright notice and this permission  | */
+/* |   notice appear in supporting documentation.  This software is    | */
+/* |   provided "as is" without express or implied warranty.           | */
+/* +-------------------------------------------------------------------+ */
+

Property changes on: head/graphics/gd/files/gd_biggif_out.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/gd_gif_in.c
===================================================================
--- head/graphics/gd/files/gd_gif_in.c	(revision 87213)
+++ head/graphics/gd/files/gd_gif_in.c	(revision 87214)
@@ -1,561 +1,573 @@
 #include 
 #include 
 #include 
 #include 
 #include "gd.h"
 
 /* Used only when debugging GIF compression code */
 /* #define DEBUGGING_ENVARS */
 
 #ifdef DEBUGGING_ENVARS
 
 static int verbose_set = 0;
 static int verbose;
 #define VERBOSE (verbose_set?verbose:set_verbose())
 
 static int set_verbose(void)
 {
  verbose = !!getenv("GIF_VERBOSE");
  verbose_set = 1;
  return(verbose);
 }
 
 #else
 
 #define VERBOSE 0
 
 #endif
 
 
 #define        MAXCOLORMAPSIZE         256
 
 #define        TRUE    1
 #define        FALSE   0
 
 #define CM_RED         0
 #define CM_GREEN       1
 #define CM_BLUE                2
 
 #define        MAX_LWZ_BITS            12
 
 #define INTERLACE              0x40
 #define LOCALCOLORMAP  0x80
 #define BitSet(byte, bit)      (((byte) & (bit)) == (bit))
 
 #define        ReadOK(file,buffer,len) (gdGetBuf(buffer, len, file) != 0)
 
 #define LM_to_uint(a,b)                        (((b)<<8)|(a))
 
 /* We may eventually want to use this information, but def it out for now */
 #if 0
 static struct {
        unsigned int    Width;
        unsigned int    Height;
        unsigned char   ColorMap[3][MAXCOLORMAPSIZE];
        unsigned int    BitPixel;
        unsigned int    ColorResolution;
        unsigned int    Background;
        unsigned int    AspectRatio;
 } GifScreen;
 #endif
 
 static struct {
        int     transparent;
        int     delayTime;
        int     inputFlag;
        int     disposal;
 } Gif89 = { -1, -1, -1, 0 };
 
 static int ReadColorMap (gdIOCtx *fd, int number, unsigned char (*buffer)[256]);
 static int DoExtension (gdIOCtx *fd, int label, int *Transparent);
 static int GetDataBlock (gdIOCtx *fd, unsigned char *buf);
 static int GetCode (gdIOCtx *fd, int code_size, int flag);
 static int LWZReadByte (gdIOCtx *fd, int flag, int input_code_size);
 
 static void ReadImage (gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace); /*1.4//, int ignore); */
 
 int ZeroDataBlock;
 
+gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource)
+{
+        gdIOCtx         *in = gdNewSSCtx(inSource, NULL);
+        gdImagePtr      im;
+
+        im = gdImageCreateFromGifCtx(in);
+
+        in->gd_free(in);
+
+        return im;
+}
+
 gdImagePtr
 gdImageCreateFromGif(FILE *fdFile)
 {
         gdIOCtx		*fd = gdNewFileCtx(fdFile);
         gdImagePtr    	im = 0;
 
         im = gdImageCreateFromGifCtx(fd);
 
-        fd->free(fd);
+        fd->gd_free(fd);
 
         return im;
 }
 
 gdImagePtr
 gdImageCreateFromGifCtx(gdIOCtxPtr fd)
 {
-       int imageNumber;
+/* 1.4       int imageNumber; */
        int BitPixel;
        int ColorResolution;
        int Background;
        int AspectRatio;
        int Transparent = (-1);
        unsigned char   buf[16];
        unsigned char   c;
        unsigned char   ColorMap[3][MAXCOLORMAPSIZE];
        unsigned char   localColorMap[3][MAXCOLORMAPSIZE];
        int             imw, imh;
        int             useGlobalColormap;
        int             bitPixel;
        int	       i;
        /*1.4//int             imageCount = 0; */
        char            version[4];
 
        gdImagePtr im = 0;
        ZeroDataBlock = FALSE;
 
        /*1.4//imageNumber = 1; */
        if (! ReadOK(fd,buf,6)) {
 		return 0;
 	}
        if (strncmp((char *)buf,"GIF",3) != 0) {
 		return 0;
 	}
        strncpy(version, (char *)buf + 3, 3);
        version[3] = '\0';
 
        if ((strcmp(version, "87a") != 0) && (strcmp(version, "89a") != 0)) {
 		return 0;
 	}
        if (! ReadOK(fd,buf,7)) {
 		return 0;
 	}
        BitPixel        = 2<<(buf[4]&0x07);
        ColorResolution = (int) (((buf[4]&0x70)>>3)+1);
        Background      = buf[5];
        AspectRatio     = buf[6];
 
        if (BitSet(buf[4], LOCALCOLORMAP)) {    /* Global Colormap */
                if (ReadColorMap(fd, BitPixel, ColorMap)) {
 			return 0;
 		}
        }
        for (;;) {
                if (! ReadOK(fd,&c,1)) {
                        return 0;
                }
                if (c == ';') {         /* GIF terminator */
 			goto terminated;
 	       }
 
                if (c == '!') {         /* Extension */
                        if (! ReadOK(fd,&c,1)) {
                                return 0;
                        }
                        DoExtension(fd, c, &Transparent);
                        continue;
                }
 
                if (c != ',') {         /* Not a valid start character */
                        continue;
                }
 
                /*1.4//++imageCount; */
 
                if (! ReadOK(fd,buf,9)) {
 	               return 0;
                }
 
                useGlobalColormap = ! BitSet(buf[8], LOCALCOLORMAP);
 
                bitPixel = 1<<((buf[8]&0x07)+1);
 
                imw = LM_to_uint(buf[4],buf[5]);
                imh = LM_to_uint(buf[6],buf[7]);
 	       if (!(im = gdImageCreate(imw, imh))) {
 			 return 0;
 	       }
                im->interlace = BitSet(buf[8], INTERLACE);
                if (! useGlobalColormap) {
                        if (ReadColorMap(fd, bitPixel, localColorMap)) { 
                                  return 0;
                        }
                        ReadImage(im, fd, imw, imh, localColorMap, 
                                  BitSet(buf[8], INTERLACE)); 
                                  /*1.4//imageCount != imageNumber); */
                } else {
                        ReadImage(im, fd, imw, imh,
                                  ColorMap, 
                                  BitSet(buf[8], INTERLACE));
                                  /*1.4//imageCount != imageNumber); */
                }
                if (Transparent != (-1)) {
                        gdImageColorTransparent(im, Transparent);
                }	   
 	       goto terminated;
        }
 
 terminated:
        /* Terminator before any image was declared! */
        if (!im) {
 		return 0;
        }
        /* Check for open colors at the end, so
           we can reduce colorsTotal and ultimately
           BitsPerPixel */
        for (i=((im->colorsTotal-1)); (i>=0); i--) {
 		if (im->open[i]) {
                 	im->colorsTotal--;
                 } else {
                 	break;
                 }
        } 
        return im;
 }
 
 static int
 ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256])
 {
        int             i;
        unsigned char   rgb[3];
 
 
        for (i = 0; i < number; ++i) {
                if (! ReadOK(fd, rgb, sizeof(rgb))) {
                        return TRUE;
                }
                buffer[CM_RED][i] = rgb[0] ;
                buffer[CM_GREEN][i] = rgb[1] ;
                buffer[CM_BLUE][i] = rgb[2] ;
        }
 
 
        return FALSE;
 }
 
 static int
 DoExtension(gdIOCtx *fd, int label, int *Transparent)
 {
        static unsigned char     buf[256];
 
        switch (label) {
        case 0xf9:              /* Graphic Control Extension */
                (void) GetDataBlock(fd, (unsigned char*) buf);
                Gif89.disposal    = (buf[0] >> 2) & 0x7;
                Gif89.inputFlag   = (buf[0] >> 1) & 0x1;
                Gif89.delayTime   = LM_to_uint(buf[1],buf[2]);
                if ((buf[0] & 0x1) != 0)
                        *Transparent = buf[3];
 
                while (GetDataBlock(fd, (unsigned char*) buf) != 0)
                        ;
                return FALSE;
        default:
                break;
        }
        while (GetDataBlock(fd, (unsigned char*) buf) != 0)
                ;
 
        return FALSE;
 }
 
 static int
 GetDataBlock_(gdIOCtx *fd, unsigned char *buf)
 {
        unsigned char   count;
 
        if (! ReadOK(fd,&count,1)) {
                return -1;
        }
 
        ZeroDataBlock = count == 0;
 
        if ((count != 0) && (! ReadOK(fd, buf, count))) {
                return -1;
        }
 
        return count;
 }
 
 static int
 GetDataBlock(gdIOCtx *fd, unsigned char *buf)
 {
  int rv;
  int i;
 
  rv = GetDataBlock_(fd,buf);
  if (VERBOSE)
   { printf("[GetDataBlock returning %d",rv);
     if (rv > 0)
      { printf(":");
        for (i=0;i= lastbit) {
                if (done) {
                        if (curbit >= lastbit) {
                                 /* Oh well */
                        }                        
                        return -1;
                }
                buf[0] = buf[last_byte-2];
                buf[1] = buf[last_byte-1];
 
                if ((count = GetDataBlock(fd, &buf[2])) == 0)
                        done = TRUE;
 
                last_byte = 2 + count;
                curbit = (curbit - lastbit) + 16;
                lastbit = (2+count)*8 ;
        }
 
        ret = 0;
        for (i = curbit, j = 0; j < code_size; ++i, ++j)
                ret |= ((buf[ i / 8 ] & (1 << (i % 8))) != 0) << j;
 
        curbit += code_size;
        return ret;
 }
 
 static int
 GetCode(gdIOCtx *fd, int code_size, int flag)
 {
  int rv;
 
  rv = GetCode_(fd,code_size,flag);
  if (VERBOSE) printf("[GetCode(,%d,%d) returning %d]\n",code_size,flag,rv);
  return(rv);
 }
 
 #define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2)
 static int
 LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size)
 {
        static int      fresh = FALSE;
        int             code, incode;
        static int      code_size, set_code_size;
        static int      max_code, max_code_size;
        static int      firstcode, oldcode;
        static int      clear_code, end_code;
        static int      table[2][(1<< MAX_LWZ_BITS)];
        static int      stack[STACK_SIZE], *sp;
        register int    i;
 
        if (flag) {
                set_code_size = input_code_size;
                code_size = set_code_size+1;
                clear_code = 1 << set_code_size ;
                end_code = clear_code + 1;
                max_code_size = 2*clear_code;
                max_code = clear_code+2;
 
                GetCode(fd, 0, TRUE);
                
                fresh = TRUE;
 
                for (i = 0; i < clear_code; ++i) {
                        table[0][i] = 0;
                        table[1][i] = i;
                }
                for (; i < (1< stack)
                return *--sp;
 
        while ((code = GetCode(fd, code_size, FALSE)) >= 0) {
                if (code == clear_code) {
                        for (i = 0; i < clear_code; ++i) {
                                table[0][i] = 0;
                                table[1][i] = i;
                        }
                        for (; i < (1< 0)
                                ;
 
                        if (count != 0)
                        return -2;
                }
 
                incode = code;
 
 	       if (sp == (stack + STACK_SIZE)) {
 		       /* Bad compressed data stream */
 		       return -1;
 	       }
 
                if (code >= max_code) {
                        *sp++ = firstcode;
                        code = oldcode;
                }
 
                while (code >= clear_code) {
 		       if (sp == (stack + STACK_SIZE)) {
 			       /* Bad compressed data stream */
 			       return -1;
 		       }
                        *sp++ = table[1][code];
                        if (code == table[0][code]) {
                                /* Oh well */
                        }
                        code = table[0][code];
                }
 
                *sp++ = firstcode = table[1][code];
 
                if ((code = max_code) <(1<= max_code_size) &&
                                (max_code_size < (1< stack)
                        return *--sp;
        }
        return code;
 }
 
 static int
 LWZReadByte(gdIOCtx *fd, int flag, int input_code_size)
 {
  int rv;
 
  rv = LWZReadByte_(fd,flag,input_code_size);
  if (VERBOSE) printf("[LWZReadByte(,%d,%d) returning %d]\n",flag,input_code_size,rv);
  return(rv);
 }
 
 static void
 ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace) /*1.4//, int ignore) */
 {
        unsigned char   c;      
        int             v;
        int             xpos = 0, ypos = 0, pass = 0;
        int i;
        /* Stash the color map into the image */
        for (i=0; (ired[i] = cmap[CM_RED][i];	
                im->green[i] = cmap[CM_GREEN][i];	
                im->blue[i] = cmap[CM_BLUE][i];	
                im->open[i] = 1;
        }
        /* Many (perhaps most) of these colors will remain marked open. */
        im->colorsTotal = gdMaxColors;
        /*
        **  Initialize the Compression routines
        */
        if (! ReadOK(fd,&c,1)) {
                return; 
        }
        if (LWZReadByte(fd, TRUE, c) < 0) {
                return;
        }
 
        /*
        **  If this is an "uninteresting picture" ignore it.
        **  REMOVED For 1.4
        */
        /*if (ignore) { */
        /*        while (LWZReadByte(fd, FALSE, c) >= 0) */
        /*                ; */
        /*        return; */
        /*} */
 
        while ((v = LWZReadByte(fd,FALSE,c)) >= 0 ) {
                /* This how we recognize which colors are actually used. */
                if (im->open[v]) {
                        im->open[v] = 0;
                }
                gdImageSetPixel(im, xpos, ypos, v);
                ++xpos;
                if (xpos == len) {
                        xpos = 0;
                        if (interlace) {
                                switch (pass) {
                                case 0:
                                case 1:
                                        ypos += 8; break;
                                case 2:
                                        ypos += 4; break;
                                case 3:
                                        ypos += 2; break;
                                }
 
                                if (ypos >= height) {
                                        ++pass;
                                        switch (pass) {
                                        case 1:
                                                ypos = 4; break;
                                        case 2:
                                                ypos = 2; break;
                                        case 3:
                                                ypos = 1; break;
                                        default:
                                                goto fini;
                                        }
                                }
                        } else {
                                ++ypos;
                        }
                }
                if (ypos >= height)
                        break;
        }
 
 fini:
        if (LWZReadByte(fd,FALSE,c)>=0) {
                /* Ignore extra */
        }
 }
 

Property changes on: head/graphics/gd/files/gd_gif_in.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/graphics/gd/files/gd_gif_out.c
===================================================================
--- head/graphics/gd/files/gd_gif_out.c	(nonexistent)
+++ head/graphics/gd/files/gd_gif_out.c	(revision 87214)
@@ -0,0 +1,44 @@
+#include 
+#include 
+#include 
+#include 
+#include "gd.h"
+
+/*
+** Wrapper functions for GIF output.
+*/
+
+void gdImageGifToSink(gdImagePtr im, gdSinkPtr outSink)
+{
+        gdIOCtx   *out = gdNewSSCtx(NULL,outSink);
+        gdImageGifCtx(im, out);
+        out->gd_free(out);
+}
+
+void gdImageGifCtx(gdImagePtr im, gdIOCtx *out)
+{
+#ifdef LZW_LICENCED
+	gdImageLzwCtx(im, out);
+#else
+        gdImageBigGifCtx(im, out);
+#endif
+}
+
+void gdImageGif(gdImagePtr im, FILE *outFile)
+{
+#ifdef LZW_LICENCED
+        gdImageLzw(im, outFile);
+#else
+        gdImageBigGif(im, outFile);
+#endif
+}
+
+void* gdImageGifPtr(gdImagePtr im, int *size)
+{
+#ifdef LZW_LICENCED
+        return gdImageLzwPtr(im, size);
+#else
+        return gdImageBigGifPtr(im, size);
+#endif
+}
+

Property changes on: head/graphics/gd/files/gd_gif_out.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/gd_lzw_out.c
===================================================================
--- head/graphics/gd/files/gd_lzw_out.c	(nonexistent)
+++ head/graphics/gd/files/gd_lzw_out.c	(revision 87214)
@@ -0,0 +1,795 @@
+#include 
+#include 
+#include 
+#include 
+#include "gd.h"
+
+/* Code drawn from ppmtogif.c, from the pbmplus package
+**
+** Based on GIFENCOD by David Rowley . A
+** Lempel-Zim compression based on "compress".
+**
+** Modified by Marcel Wijkstra 
+**
+** Copyright (C) 1989 by Jef Poskanzer.
+**
+** Permission to use, copy, modify, and distribute this software and its
+** documentation for any purpose and without fee is hereby granted, provided
+** that the above copyright notice appear in all copies and that both that
+** copyright notice and this permission notice appear in supporting
+** documentation.  This software is provided "as is" without express or
+** implied warranty.
+**
+** The Graphics Interchange Format(c) is the Copyright property of
+** CompuServe Incorporated.  GIF(sm) is a Service Mark property of
+** CompuServe Incorporated.
+*/
+
+/*
+ * a code_int must be able to hold 2**GIFBITS values of type int, and also -1
+ */
+typedef int             code_int;
+
+#ifdef SIGNED_COMPARE_SLOW
+typedef unsigned long int count_int;
+typedef unsigned short int count_short;
+#else /*SIGNED_COMPARE_SLOW*/
+typedef long int          count_int;
+#endif /*SIGNED_COMPARE_SLOW*/
+
+static int colorstobpp(int colors);
+static void BumpPixel (void);
+static int GIFNextPixel (gdImagePtr im);
+static void GIFEncode (gdIOCtx *fp, int GWidth, int GHeight, int GInterlace, int Background, int Transparent, int BitsPerPixel, int *Red, int *Green, int *Blue, gdImagePtr im);
+/*static void Putword (int w, gdIOCtx *fp); */
+static void compress (int init_bits, gdIOCtx *outfile, gdImagePtr im);
+static void output (code_int code);
+static void cl_block (void);
+static void cl_hash (register count_int hsize);
+static void char_init (void);
+static void char_out (int c);
+static void flush_char (void);
+/* Allows for reuse */
+static void init_statics(void);
+
+void gdImageLzwCtx(gdImagePtr im, gdIOCtx *out)
+{
+	int interlace, transparent, BitsPerPixel;
+
+	interlace = im->interlace;
+	transparent = im->transparent;
+
+	BitsPerPixel = colorstobpp(im->colorsTotal);
+	/* Clear any old values in statics strewn through the GIF code */
+	init_statics();
+	/* All set, let's do it. */
+	GIFEncode(
+		out, im->sx, im->sy, interlace, 0, transparent, BitsPerPixel,
+		im->red, im->green, im->blue, im);
+}
+
+void gdImageLzw(gdImagePtr im, FILE *outFile)
+{
+        gdIOCtx   *out = gdNewFileCtx(outFile);
+        gdImageLzwCtx(im, out);
+        out->gd_free(out);
+}
+
+void* gdImageLzwPtr(gdImagePtr im, int *size)
+{
+	void	*rv;
+        gdIOCtx   *out = gdNewDynamicCtx(2048, NULL);
+        gdImageLzwCtx(im, out);
+        rv = gdDPExtractData(out,size);
+	out->gd_free(out);
+	return rv;
+}
+
+
+
+static int
+colorstobpp(int colors)
+{
+    int bpp = 0;
+
+    if ( colors <= 2 )
+        bpp = 1;
+    else if ( colors <= 4 )
+        bpp = 2;
+    else if ( colors <= 8 )
+        bpp = 3;
+    else if ( colors <= 16 )
+        bpp = 4;
+    else if ( colors <= 32 )
+        bpp = 5;
+    else if ( colors <= 64 )
+        bpp = 6;
+    else if ( colors <= 128 )
+        bpp = 7;
+    else if ( colors <= 256 )
+        bpp = 8;
+    return bpp;
+    }
+
+/*****************************************************************************
+ *
+ * GIFENCODE.C    - GIF Image compression interface
+ *
+ * GIFEncode( FName, GHeight, GWidth, GInterlace, Background, Transparent,
+ *            BitsPerPixel, Red, Green, Blue, gdImagePtr )
+ *
+ *****************************************************************************/
+
+#define TRUE 1
+#define FALSE 0
+
+static int Width, Height;
+static int curx, cury;
+static long CountDown;
+static int Pass = 0;
+static int Interlace;
+
+/*
+ * Bump the 'curx' and 'cury' to point to the next pixel
+ */
+static void
+BumpPixel(void)
+{
+        /*
+         * Bump the current X position
+         */
+        ++curx;
+
+        /*
+         * If we are at the end of a scan line, set curx back to the beginning
+         * If we are interlaced, bump the cury to the appropriate spot,
+         * otherwise, just increment it.
+         */
+        if( curx == Width ) {
+                curx = 0;
+
+                if( !Interlace )
+                        ++cury;
+                else {
+                     switch( Pass ) {
+
+                       case 0:
+                          cury += 8;
+                          if( cury >= Height ) {
+                                ++Pass;
+                                cury = 4;
+                          }
+                          break;
+
+                       case 1:
+                          cury += 8;
+                          if( cury >= Height ) {
+                                ++Pass;
+                                cury = 2;
+                          }
+                          break;
+
+                       case 2:
+                          cury += 4;
+                          if( cury >= Height ) {
+                             ++Pass;
+                             cury = 1;
+                          }
+                          break;
+
+                       case 3:
+                          cury += 2;
+                          break;
+                        }
+                }
+        }
+}
+
+/*
+ * Return the next pixel from the image
+ */
+static int
+GIFNextPixel(gdImagePtr im)
+{
+        int r;
+
+        if( CountDown == 0 )
+                return EOF;
+
+        --CountDown;
+
+        r = gdImageGetPixel(im, curx, cury);
+
+        BumpPixel();
+
+        return r;
+}
+
+/* public */
+
+static void
+GIFEncode(gdIOCtx *fp, int GWidth, int GHeight, int GInterlace, int Background, int Transparent, int BitsPerPixel, int *Red, int *Green, int *Blue, gdImagePtr im)
+{
+        int B;
+        int RWidth, RHeight;
+        int LeftOfs, TopOfs;
+        int Resolution;
+        int ColorMapSize;
+        int InitCodeSize;
+        int i;
+
+        Interlace = GInterlace;
+
+        ColorMapSize = 1 << BitsPerPixel;
+
+        RWidth = Width = GWidth;
+        RHeight = Height = GHeight;
+        LeftOfs = TopOfs = 0;
+
+        Resolution = BitsPerPixel;
+
+        /*
+         * Calculate number of bits we are expecting
+         */
+        CountDown = (long)Width * (long)Height;
+
+        /*
+         * Indicate which pass we are on (if interlace)
+         */
+        Pass = 0;
+
+        /*
+         * The initial code size
+         */
+        if( BitsPerPixel <= 1 )
+                InitCodeSize = 2;
+        else
+                InitCodeSize = BitsPerPixel;
+
+        /*
+         * Set up the current x and y position
+         */
+        curx = cury = 0;
+
+        /*
+         * Write the Magic header
+         */
+        gdPutBuf( Transparent < 0 ? "GIF87a" : "GIF89a", 6, fp );
+
+        /*
+         * Write out the screen width and height
+         */
+        Putword( RWidth, fp );
+        Putword( RHeight, fp );
+
+        /*
+         * Indicate that there is a global colour map
+         */
+        B = 0x80;       /* Yes, there is a color map */
+
+        /*
+         * OR in the resolution
+         */
+        B |= (Resolution - 1) << 5;
+
+        /*
+         * OR in the Bits per Pixel
+         */
+        B |= (BitsPerPixel - 1);
+
+        /*
+         * Write it out
+         */
+        gdPutC( B, fp );
+
+        /*
+         * Write out the Background colour
+         */
+        gdPutC( Background, fp );
+
+        /*
+         * Byte of 0's (future expansion)
+         */
+        gdPutC( 0, fp );
+
+        /*
+         * Write out the Global Colour Map
+         */
+        for( i=0; i= 0 ) {
+	    gdPutC( '!', fp );
+	    gdPutC( 0xf9, fp );
+	    gdPutC( 4, fp );
+	    gdPutC( 1, fp );
+	    gdPutC( 0, fp );
+	    gdPutC( 0, fp );
+	    gdPutC( (unsigned char) Transparent, fp );
+	    gdPutC( 0, fp );
+	}
+
+        /*
+         * Write an Image separator
+         */
+        gdPutC( ',', fp );
+
+        /*
+         * Write the Image header
+         */
+
+        Putword( LeftOfs, fp );
+        Putword( TopOfs, fp );
+        Putword( Width, fp );
+        Putword( Height, fp );
+
+        /*
+         * Write out whether or not the image is interlaced
+         */
+        if( Interlace )
+                gdPutC( 0x40, fp );
+        else
+                gdPutC( 0x00, fp );
+
+        /*
+         * Write out the initial code size
+         */
+        gdPutC( InitCodeSize, fp );
+
+        /*
+         * Go and actually compress the data
+         */
+        compress( InitCodeSize+1, fp, im );
+
+        /*
+         * Write out a Zero-length packet (to end the series)
+         */
+        gdPutC( 0, fp );
+
+        /*
+         * Write the GIF file terminator
+         */
+        gdPutC( ';', fp );
+}
+
+/* */
+/* * Write out a word to the GIF file */
+/* */
+/*static void */
+/*Putword(int w, FILE *fp) */
+/*{ */
+/*        fputc( w & 0xff, fp ); */
+/*        fputc( (w / 256) & 0xff, fp ); */
+/*} */
+
+
+/***************************************************************************
+ *
+ *  GIFCOMPR.C       - GIF Image compression routines
+ *
+ *  Lempel-Ziv compression based on 'compress'.  GIF modifications by
+ *  David Rowley (mgardi@watdcsu.waterloo.edu)
+ *
+ ***************************************************************************/
+
+/*
+ * General DEFINEs
+ */
+
+#define GIFBITS    12
+
+#define HSIZE  5003            /* 80% occupancy */
+
+#ifdef NO_UCHAR
+ typedef char   char_type;
+#else /*NO_UCHAR*/
+ typedef        unsigned char   char_type;
+#endif /*NO_UCHAR*/
+
+/*
+ *
+ * GIF Image compression - modified 'compress'
+ *
+ * Based on: compress.c - File compression ala IEEE Computer, June 1984.
+ *
+ * By Authors:  Spencer W. Thomas       (decvax!harpo!utah-cs!utah-gr!thomas)
+ *              Jim McKie               (decvax!mcvax!jim)
+ *              Steve Davies            (decvax!vax135!petsd!peora!srd)
+ *              Ken Turkowski           (decvax!decwrl!turtlevax!ken)
+ *              James A. Woods          (decvax!ihnp4!ames!jaw)
+ *              Joe Orost               (decvax!vax135!petsd!joe)
+ *
+ */
+#include 
+
+#define ARGVAL() (*++(*argv) || (--argc && *++argv))
+
+static int n_bits;                        /* number of bits/code */
+static int maxbits = GIFBITS;                /* user settable max # bits/code */
+static code_int maxcode;                  /* maximum code, given n_bits */
+static code_int maxmaxcode = (code_int)1 << GIFBITS; /* should NEVER generate this code */
+#ifdef COMPATIBLE               /* But wrong! */
+# define MAXCODE(n_bits)        ((code_int) 1 << (n_bits) - 1)
+#else /*COMPATIBLE*/
+# define MAXCODE(n_bits)        (((code_int) 1 << (n_bits)) - 1)
+#endif /*COMPATIBLE*/
+
+static count_int htab [HSIZE];
+static unsigned short codetab [HSIZE];
+#define HashTabOf(i)       htab[i]
+#define CodeTabOf(i)    codetab[i]
+
+static code_int hsize = HSIZE;                 /* for dynamic table sizing */
+
+/*
+ * To save much memory, we overlay the table used by compress() with those
+ * used by decompress().  The tab_prefix table is the same size and type
+ * as the codetab.  The tab_suffix table needs 2**GIFBITS characters.  We
+ * get this from the beginning of htab.  The output stack uses the rest
+ * of htab, and contains characters.  There is plenty of room for any
+ * possible stack (stack used to be 8000 characters).
+ */
+
+#define tab_prefixof(i) CodeTabOf(i)
+#define tab_suffixof(i)        ((char_type*)(htab))[i]
+#define de_stack               ((char_type*)&tab_suffixof((code_int)1< 0 )
+            goto probe;
+nomatch:
+        output ( (code_int) ent );
+        ++out_count;
+        ent = c;
+#ifdef SIGNED_COMPARE_SLOW
+        if ( (unsigned) free_ent < (unsigned) maxmaxcode) {
+#else /*SIGNED_COMPARE_SLOW*/
+        if ( free_ent < maxmaxcode ) {  /* } */
+#endif /*SIGNED_COMPARE_SLOW*/
+            CodeTabOf (i) = free_ent++; /* code -> hashtable */
+            HashTabOf (i) = fcode;
+        } else
+                cl_block();
+    }
+    /*
+     * Put out the final code.
+     */
+    output( (code_int)ent );
+    ++out_count;
+    output( (code_int) EOFCode );
+}
+
+/*****************************************************************
+ * TAG( output )
+ *
+ * Output the given code.
+ * Inputs:
+ *      code:   A n_bits-bit integer.  If == -1, then EOF.  This assumes
+ *              that n_bits =< (long)wordsize - 1.
+ * Outputs:
+ *      Outputs code to the file.
+ * Assumptions:
+ *      Chars are 8 bits long.
+ * Algorithm:
+ *      Maintain a GIFBITS character long buffer (so that 8 codes will
+ * fit in it exactly).  Use the VAX insv instruction to insert each
+ * code in turn.  When the buffer fills up empty it and start over.
+ */
+
+static unsigned long cur_accum = 0;
+static int cur_bits = 0;
+
+static unsigned long masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
+                                  0x001F, 0x003F, 0x007F, 0x00FF,
+                                  0x01FF, 0x03FF, 0x07FF, 0x0FFF,
+                                  0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
+
+static void
+output(code_int code)
+{
+    cur_accum &= masks[ cur_bits ];
+
+    if( cur_bits > 0 )
+        cur_accum |= ((long)code << cur_bits);
+    else
+        cur_accum = code;
+
+    cur_bits += n_bits;
+
+    while( cur_bits >= 8 ) {
+        char_out( (unsigned int)(cur_accum & 0xff) );
+        cur_accum >>= 8;
+        cur_bits -= 8;
+    }
+
+    /*
+     * If the next entry is going to be too big for the code size,
+     * then increase it, if possible.
+     */
+   if ( free_ent > maxcode || clear_flg ) {
+
+            if( clear_flg ) {
+
+                maxcode = MAXCODE (n_bits = g_init_bits);
+                clear_flg = 0;
+
+            } else {
+
+                ++n_bits;
+                if ( n_bits == maxbits )
+                    maxcode = maxmaxcode;
+                else
+                    maxcode = MAXCODE(n_bits);
+            }
+        }
+
+    if( code == EOFCode ) {
+        /*
+         * At EOF, write the rest of the buffer.
+         */
+        while( cur_bits > 0 ) {
+                char_out( (unsigned int)(cur_accum & 0xff) );
+                cur_accum >>= 8;
+                cur_bits -= 8;
+        }
+
+        flush_char();
+
+/*        fflush( g_outfile ); */
+/* */
+/*        if( ferror( g_outfile ) ) */
+/*		return; */
+    }
+}
+
+/*
+ * Clear out the hash table
+ */
+static void
+cl_block (void)             /* table clear for block compress */
+{
+
+        cl_hash ( (count_int) hsize );
+        free_ent = ClearCode + 2;
+        clear_flg = 1;
+
+        output( (code_int)ClearCode );
+}
+
+static void
+cl_hash(register count_int hsize)          /* reset code table */
+                         
+{
+
+        register count_int *htab_p = htab+hsize;
+
+        register long i;
+        register long m1 = -1;
+
+        i = hsize - 16;
+        do {                            /* might use Sys V memset(3) here */
+                *(htab_p-16) = m1;
+                *(htab_p-15) = m1;
+                *(htab_p-14) = m1;
+                *(htab_p-13) = m1;
+                *(htab_p-12) = m1;
+                *(htab_p-11) = m1;
+                *(htab_p-10) = m1;
+                *(htab_p-9) = m1;
+                *(htab_p-8) = m1;
+                *(htab_p-7) = m1;
+                *(htab_p-6) = m1;
+                *(htab_p-5) = m1;
+                *(htab_p-4) = m1;
+                *(htab_p-3) = m1;
+                *(htab_p-2) = m1;
+                *(htab_p-1) = m1;
+                htab_p -= 16;
+        } while ((i -= 16) >= 0);
+
+        for ( i += 16; i > 0; --i )
+                *--htab_p = m1;
+}
+
+/******************************************************************************
+ *
+ * GIF Specific routines
+ *
+ ******************************************************************************/
+
+/*
+ * Number of characters so far in this 'packet'
+ */
+static int a_count;
+
+/*
+ * Set up the 'byte output' routine
+ */
+static void
+char_init(void)
+{
+        a_count = 0;
+}
+
+/*
+ * Define the storage for the packet accumulator
+ */
+static char accum[ 256 ];
+
+/*
+ * Add a character to the end of the current packet, and if it is 254
+ * characters, flush the packet to disk.
+ */
+static void
+char_out(int c)
+{
+        accum[ a_count++ ] = c;
+        if( a_count >= 254 )
+                flush_char();
+}
+
+/*
+ * Flush the packet to disk, and reset the accumulator
+ */
+static void
+flush_char(void)
+{
+        if( a_count > 0 ) {
+                gdPutC( a_count, g_outfile );
+                gdPutBuf( accum, a_count, g_outfile );
+                a_count = 0;
+        }
+}
+
+static void init_statics(void) {
+	/* Some of these are properly initialized later. What I'm doing
+		here is making sure code that depends on C's initialization
+		of statics doesn't break when the code gets called more
+		than once. */
+	Width = 0;
+	Height = 0;
+	curx = 0;
+	cury = 0;
+	CountDown = 0;
+	Pass = 0;
+	Interlace = 0;
+	a_count = 0;
+	cur_accum = 0;
+	cur_bits = 0;
+	g_init_bits = 0;
+	g_outfile = 0;
+	ClearCode = 0;
+	EOFCode = 0;
+	free_ent = 0;
+	clear_flg = 0;
+	offset = 0;
+	in_count = 1;
+	out_count = 0;	
+	hsize = HSIZE;
+	n_bits = 0;
+	maxbits = GIFBITS;
+	maxcode = 0;
+	maxmaxcode = (code_int)1 << GIFBITS;
+}
+
+
+/* +-------------------------------------------------------------------+ */
+/* | Copyright 1990, 1991, 1993, David Koblas.  (koblas@netcom.com)    | */
+/* |   Permission to use, copy, modify, and distribute this software   | */
+/* |   and its documentation for any purpose and without fee is hereby | */
+/* |   granted, provided that the above copyright notice appear in all | */
+/* |   copies and that both that copyright notice and this permission  | */
+/* |   notice appear in supporting documentation.  This software is    | */
+/* |   provided "as is" without express or implied warranty.           | */
+/* +-------------------------------------------------------------------+ */

Property changes on: head/graphics/gd/files/gd_lzw_out.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/gdcmpgif.c
===================================================================
--- head/graphics/gd/files/gdcmpgif.c	(nonexistent)
+++ head/graphics/gd/files/gdcmpgif.c	(revision 87214)
@@ -0,0 +1,85 @@
+#include 
+#include  /* For unlink function */
+#include "gd.h"
+
+/* A short program which converts a .png file into a .gd file, for
+	your convenience in creating images on the fly from a
+	basis image that must be loaded quickly. The .gd format
+	is not intended to be a general-purpose format. */
+
+void CompareImages(char *msg, gdImagePtr im1, gdImagePtr im2);
+
+
+int main(int argc, char **argv)
+{
+	gdImagePtr im1, im2;
+	FILE *in;
+
+	if (argc != 3) {
+		fprintf(stderr, "Usage: gdcmpgif filename.gif filename.gif\n");
+		exit(1);
+	}
+	in = fopen(argv[1], "rb");
+	if (!in) {
+		fprintf(stderr, "Input file does not exist!\n");
+		exit(1);
+	}
+	im1 = gdImageCreateFromGif(in);
+	fclose(in);
+
+	if (!im1) {
+		fprintf(stderr, "Input is not in GIF format!\n");
+		exit(1);
+	}
+
+	in = fopen(argv[2], "rb");
+	if (!in) {
+		fprintf(stderr, "Input file 2 does not exist!\n");
+		exit(1);
+	}
+	im2 = gdImageCreateFromGif(in);
+	fclose(in);
+
+	if (!im2) {
+		fprintf(stderr, "Input 2 is not in GIF format!\n");
+		exit(1);
+	}
+
+	CompareImages("gdcmpgif", im1, im2);
+
+	gdImageDestroy(im1);
+        gdImageDestroy(im2);
+
+	return 0;
+}
+
+void CompareImages(char *msg, gdImagePtr im1, gdImagePtr im2)
+{
+	int cmpRes;
+
+	cmpRes = gdImageCompare(im1, im2);
+
+	if (cmpRes & GD_CMP_IMAGE) {
+		printf("%%%s: ERROR images differ: BAD\n",msg);
+	} else if (cmpRes != 0) {
+		printf("%%%s: WARNING images differ: WARNING - Probably OK\n",msg);
+	} else {
+		printf("%%%s: OK\n",msg);
+		return;
+	}
+
+	if (cmpRes & (GD_CMP_SIZE_X + GD_CMP_SIZE_Y)) {
+		printf("-%s: INFO image sizes differ\n",msg);
+	}
+
+	if (cmpRes & GD_CMP_NUM_COLORS) {
+		printf("-%s: INFO number of pallette entries differ %d Vs. %d\n",msg,
+			im1->colorsTotal, im2->colorsTotal);
+	}
+
+	if (cmpRes & GD_CMP_COLOR) {
+		printf("-%s: INFO actual colours of pixels differ\n",msg);
+	}
+}
+
+

Property changes on: head/graphics/gd/files/gdcmpgif.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/giftogd2.c
===================================================================
--- head/graphics/gd/files/giftogd2.c	(nonexistent)
+++ head/graphics/gd/files/giftogd2.c	(revision 87214)
@@ -0,0 +1,48 @@
+#include 
+#include 
+
+#include "gd.h"
+
+/* A short program which converts a .gif file into a .gd file, for
+	your convenience in creating images on the fly from a
+	basis image that must be loaded quickly. The .gd format
+	is not intended to be a general-purpose format. */
+
+int main(int argc, char **argv)
+{
+	gdImagePtr im;
+	FILE *in, *out;
+	int	cs, fmt;
+
+	if (argc != 5) {
+		fprintf(stderr, "Usage: giftogd2 filename.gif filename.gd2 cs fmt\n");
+                fprintf(stderr, "    where cs is the chunk size\n");
+		fprintf(stderr, "          fmt is 1 for raw, 2 for compressed\n");
+		exit(1);
+	}
+	in = fopen(argv[1], "rb");
+	if (!in) {
+		fprintf(stderr, "Input file does not exist!\n");
+		exit(1);
+	}
+	im = gdImageCreateFromGif(in);
+	fclose(in);
+	if (!im) {
+		fprintf(stderr, "Input is not in GIF format!\n");
+		exit(1);
+	}
+	out = fopen(argv[2], "wb");
+	if (!out) {
+		fprintf(stderr, "Output file cannot be written to!\n");
+		gdImageDestroy(im);
+		exit(1);	
+	}
+	cs = atoi(argv[3]);
+	fmt = atoi(argv[4]);
+	gdImageGd2(im, out, cs, fmt);
+	fclose(out);
+	gdImageDestroy(im);
+
+	return 0;
+}
+

Property changes on: head/graphics/gd/files/giftogd2.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/patch-gd.h
===================================================================
--- head/graphics/gd/files/patch-gd.h	(nonexistent)
+++ head/graphics/gd/files/patch-gd.h	(revision 87214)
@@ -0,0 +1,41 @@
+--- gd.h	Thu Jan 16 11:28:09 2003
++++ gd.h	Mon Mar 24 16:26:14 2003
+@@ -209,4 +209,8 @@
+   gdImagePtr gdImageCreateFromPngSource (gdSourcePtr in);
+ 
++  gdImagePtr gdImageCreateFromGif(FILE *fd);
++  gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
++  gdImagePtr gdImageCreateFromGifSource(gdSourcePtr in);
++
+   gdImagePtr gdImageCreateFromGd (FILE * in);
+   gdImagePtr gdImageCreateFromGdCtx (gdIOCtxPtr in);
+@@ -300,4 +304,5 @@
+ 
+   void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c);
++  void gdImageOpenPolygon(gdImagePtr im, gdPointPtr p, int n, int c);
+   void gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
+ 
+@@ -395,4 +400,13 @@
+   void *gdImageJpegPtr (gdImagePtr im, int *size, int quality);
+ 
++  void gdImageLzw(gdImagePtr im, FILE *out);
++  void* gdImageLzwPtr(gdImagePtr im, int *size);
++  void gdImageLzwCtx(gdImagePtr im, gdIOCtxPtr out);
++
++  void gdImageBigGif(gdImagePtr im, FILE *out);
++  void* gdImageBigGifPtr(gdImagePtr im, int *size);
++  void gdImageBigGifCtx(gdImagePtr im, gdIOCtxPtr out);
++
++
+ /* A custom data sink. For backwards compatibility. Use
+ 	gdIOCtx instead. */
+@@ -408,4 +422,9 @@
+ 
+   void gdImagePngToSink (gdImagePtr im, gdSinkPtr out);
++
++  void gdImageGif(gdImagePtr im, FILE *out);
++  void* gdImageGifPtr(gdImagePtr im, int *size);
++  void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
++  void gdImageGifToSink(gdImagePtr im, gdSinkPtr out);
+ 
+   void gdImageGd (gdImagePtr im, FILE * out);

Property changes on: head/graphics/gd/files/patch-gd.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/patch-gdft.c
===================================================================
--- head/graphics/gd/files/patch-gdft.c	(nonexistent)
+++ head/graphics/gd/files/patch-gdft.c	(revision 87214)
@@ -0,0 +1,92 @@
+--- gdft.c	Thu Jan 16 13:29:32 2003
++++ gdft.c	Mon Mar 24 17:09:54 2003
+@@ -546,8 +546,8 @@
+ 	  a->tweencolor = gdTrueColorAlpha (gdTrueColorGetRed (fg),
+ 					    gdTrueColorGetGreen (fg),
+ 					    gdTrueColorGetBlue (fg),
+-					    gdAlphaMax -
+-					    (gdTrueColorGetAlpha (fg) *
++					    gdAlphaMax - ((gdAlphaMax -
++					    gdTrueColorGetAlpha (fg)) *
+ 					     pixel / NUMCOLORS));
+ 	}
+       else
+@@ -680,10 +680,14 @@
+       if (y >= im->sy || y < 0)
+ 	continue;
+ 
+-      for (col = 0; col < bitmap.width; col++, pc++)
+-	{
+-	  if (bitmap.pixel_mode == ft_pixel_mode_grays)
+-	    {
++      for (col = 0; col < bitmap.width; col++, pc++) {
++	x = pen_x + col;
++	/* clip if out of bounds */
++	if (x >= im->sx || x < 0)
++	  continue;
++
++	switch(bitmap.pixel_mode) {
++	case ft_pixel_mode_grays:
+ 	      /*
+ 	       * Round to NUMCOLORS levels of antialiasing for
+ 	       * index color images since only 256 colors are
+@@ -692,44 +696,38 @@
+ 	      tc_key.pixel = ((bitmap.buffer[pc] * NUMCOLORS)
+ 			      + bitmap.num_grays / 2)
+ 		/ (bitmap.num_grays - 1);
+-	    }
+-	  else if (bitmap.pixel_mode == ft_pixel_mode_mono)
+-	    {
+-	      tc_key.pixel = ((bitmap.buffer[pc / 8]
+-			       << (pc % 8)) & 128) ? NUMCOLORS : 0;
++	      break;
++	case ft_pixel_mode_mono:
+ 	      /* 2.0.5: mode_mono fix from Giuliano Pochini */
+ 	      tc_key.pixel =
+ 		((bitmap.
+ 		  buffer[(col >> 3) +
+ 			 pcr]) & (1 << (~col & 0x07))) ? NUMCOLORS : 0;
+-	    }
+-	  else
+-	    {
++	      break;
++	default:
+ 	      return "Unsupported ft_pixel_mode";
+-	    }
++	}
++
+ 	  if (tc_key.pixel > 0)	/* if not background */
+ 	    {
+-	      x = pen_x + col;
+-
+-	      /* clip if out of bounds */
+-	      if (x >= im->sx || x < 0)
+-		continue;
+-	      /* get pixel location in gd buffer */
+-	      pixel = &im->pixels[y][x];
+-	      if (tc_key.pixel == NUMCOLORS)
+-		{
++	      if (im->trueColor) {
++		tc_elem = (tweencolor_t *)gdCacheGet(tc_cache, &tc_key);
++		gdImageSetPixel(im, x, y, tc_elem->tweencolor);
++	      } else {
++	        /* get pixel location in gd buffer */
++	        pixel = &im->pixels[y][x];
++	        if (tc_key.pixel == NUMCOLORS)
+ 		  /* use fg color directly. gd 2.0.2: watch out for
+ 		     negative indexes (thanks to David Marwood). */
+ 		  *pixel = (fg < 0) ? -fg : fg;
+-		}
+-	      else
+-		{
++	        else {
+ 		  /* find antialised color */
+ 
+ 		  tc_key.bgcolor = *pixel;
+ 		  tc_elem = (tweencolor_t *) gdCacheGet (tc_cache, &tc_key);
+ 		  *pixel = tc_elem->tweencolor;
+ 		}
++	      }
+ 	    }
+ 	}
+     }

Property changes on: head/graphics/gd/files/patch-gdft.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/patch-gdtest.c
===================================================================
--- head/graphics/gd/files/patch-gdtest.c	(nonexistent)
+++ head/graphics/gd/files/patch-gdtest.c	(revision 87214)
@@ -0,0 +1,81 @@
+--- gdtest.c.orig	Thu Apr 25 14:16:47 2002
++++ gdtest.c	Tue Nov  6 15:53:38 2001
+@@ -84,6 +84,35 @@
+   gdImageDestroy (im2);
+   ctx->gd_free (ctx);
+ 
++        /* */
++        /* Send to GIF File then Ptr */
++        /* */
++        sprintf(of, "%s.gif", argv[1]);
++        out = fopen(of, "wb");
++        gdImageGif(im, out);
++        fclose(out);
++
++        in = fopen(of, "rb");
++        if (!in) {
++                fprintf(stderr, "GIF Output file does not exist!\n");
++                exit(1);
++        }
++        im2 = gdImageCreateFromGif(in);
++        fclose(in);
++
++        CompareImages("GD->GIF File->GD", ref, im2);
++
++        unlink(of);
++        gdImageDestroy(im2);
++
++	iptr = gdImageGifPtr(im,&sz);
++	ctx = gdNewDynamicCtx(sz,iptr);
++	im2 = gdImageCreateFromGifCtx(ctx);
++
++        CompareImages("GD->GIF ptr->GD", ref, im2);
++
++	gdImageDestroy(im2);
++	ctx->gd_free(ctx);
+ 
+   /* */
+   /* Send to GD2 File then Ptr */
+@@ -200,7 +229,30 @@
+       gdImageDestroy (im2);
+     };
+ 
+-  unlink (of);
++	/*
++	** Test gdImageCreateFromGifSource
++	**/
++
++	in = fopen(of, "rb");
++
++	if (!in)
++	  {
++		fprintf (stderr, "GD Source: ERROR - GD Source input file does not exist - Sink may have failed!\n");
++	  };
++
++	imgsrc.source = freadWrapper;
++	imgsrc.context = in;
++	im2 = gdImageCreateFromGifSource(&imgsrc);
++	fclose(in);
++
++	if (im2 == NULL) {
++		printf("GD Source (GIF): ERROR Null returned by gdImageCreateFromGifSource\n");
++	} else {
++		CompareImages("GD Source (GIF)", ref, im2);
++		gdImageDestroy(im2);
++	};
++
++	unlink(of);
+ 
+   /* */
+   /*  Test Extraction */
+@@ -266,6 +318,10 @@
+ 
+   printf ("[Merged Image has %d colours]\n", im2->colorsTotal);
+   CompareImages ("Merged (gdtest.png, gdtest_merge.png)", im2, im3);
++
++  out = fopen ("test/gdtest_merge_out.png", "wb");
++  gdImagePng(im2, out);
++  close(out);
+ 
+   gdImageDestroy (im2);
+   gdImageDestroy (im3);

Property changes on: head/graphics/gd/files/patch-gdtest.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/files/patch-index.html
===================================================================
--- head/graphics/gd/files/patch-index.html	(nonexistent)
+++ head/graphics/gd/files/patch-index.html	(revision 87214)
@@ -0,0 +1,71 @@
+--- index.html	Mon Nov 25 11:39:31 2002
++++ index.html	Wed Nov 27 12:47:38 2002
+@@ -35,4 +35,9 @@
+ modern image formats such as PNG and JPEG as soon as possible.
+ 
++
    Note, that the FreeBSD port of gd2 includes support for GIF files
++ported from the earlier releases of gd. If the WITH_LZW was defined at
++build time, the software will also use LZW-compression when creating
++GIF files.
++
+ 
    
+ gd 2.0.8 requires that the following libraries 
+@@ -116,4 +121,18 @@
+ Portions relating to WBMP copyright 2000, 2001, 2002 Maurice Szmurlo and Johan Van 
+ den Brande.
++
++
    
++GIF decompression code copyright 1990, 1991, 1993, by David Koblas
++(koblas@netcom.com).
++
    
++Non-LZW-based GIF compression code copyright 1998, by Hutchison Avenue
++Software Corporation (http://www.hasc.com/,
++info@hasc.com).
++
    
++LZW-based GIF compression code David Rowley.
++Obtaining a license for the Unisys LZW compression patent is
++entirely between the user and Unisys. The authors of gd can provide
++NO assistance in this matter.
++
+ 
    
+ Permission has been granted to copy, distribute and modify gd in any
+@@ -192,5 +211,22 @@
+ 
  • fly, by Martin Gleeson
+ 
+-
    
++
++
    What does the FreeBSD port add?
    
++
++
    This version reinstates GIF support. Specifically, the following
++functions are added: gdImageGif, gdImageGifPtr, gdImageGifCtx,
++gdImageGifToSink, gdImageCreateFromGif, gdImageCreateFromGifCtx,
++gdImageCreateFromGifSource.
++The can be used just like the corresponding functions for the other
++image formats.
++
++
    Other functions added, but not documented, are: gdImageLzw,
++gdImageLzwPtr, gdImageLzwCtx, gdImageBigGif, gdImageBigGifPtr,
++gdImageBigGifCtx.
++
++
    The gdImageOpenPolygon is added.
++This is basically the same as gdImagePolygon,
++but it does not join the start and end points. It is required by GD.pm.
++
+ 
    What's new in version 2.0.8?
    
+ 
    
+@@ -1058,5 +1094,6 @@
+ 
    
+ Represents a point in the coordinate space of the image; used
+-by gdImagePolygon and
++by gdImagePolygon,
++gdImageOpenPolygon, and
+ gdImageFilledPolygon.
+ 
    +@@ -1068,5 +1105,6 @@
+ 
    
+ A pointer to a gdPoint structure; passed
+-as an argument to gdImagePolygon
++as an argument to gdImagePolygon,
++gdImageOpenPolygon,
+ and gdImageFilledPolygon.
+ 

Property changes on: head/graphics/gd/files/patch-index.html
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/gd/pkg-descr
===================================================================
--- head/graphics/gd/pkg-descr	(revision 87213)
+++ head/graphics/gd/pkg-descr	(revision 87214)
@@ -1,23 +1,16 @@
-DESCRIPTION
+gd is a graphics library. It allows your code to quickly draw images
+complete with lines, arcs, text, multiple colors, cut and paste from
+other images, and flood fills, and write out the result as a PNG, GIF
+or JPEG file. This is particularly useful in World Wide Web applications,
+where PNG, GIF and JPEG are three of the formats accepted for inline
+images by most browsers.
 
-	gd is a graphics library. It allows your code to quickly draw images
-	complete with lines, arcs, text, multiple colors, cut and paste from
-	other images, and flood fills, and write out the result as a .PNG file.
-	This is particularly useful in World Wide Web applications, where .PNG
-	is the format used for inline images. 
+gd does  not provide for every possible desirable graphics operation,
+but version 2.0 does include most frequently requested features,
+including both truecolor and palette images, resampling (smooth
+resizing of truecolor images) and so forth.
 
-	gd is not a paint program. If you are looking for a paint program, you
-	are looking in the wrong place. If you are not a programmer, you are
-	looking in the wrong place.
-
-	gd does not provide for every possible desirable graphics operation.
-	It is not necessary or desirable for gd to become a kitchen-sink
-	graphics package, but version 1.7.3 incorporates most of the commonly
-	requested features for an 8-bit 2D package. Support for truecolor
-	images, JPEG and truecolor PNG is planned for version 2.0.
-
-AUTHOR
-	gd was written by Thomas Boutell and is currently distributed by 
-	boutell.com, Inc. 
-
 WWW: http://www.boutell.com/gd/
+
+- Alex Dupre
+sysadmin@alexdupre.com

Property changes on: head/graphics/gd/pkg-descr
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/graphics/gd/pkg-plist
===================================================================
--- head/graphics/gd/pkg-plist	(revision 87213)
+++ head/graphics/gd/pkg-plist	(revision 87214)
@@ -1,12 +1,25 @@
-include/gd/gd.h
-include/gd/gd_io.h
-include/gd/gdcache.h
-include/gd/gdfontg.h
-include/gd/gdfontl.h
-include/gd/gdfontmb.h
-include/gd/gdfonts.h
-include/gd/gdfontt.h
-lib/libgd1.a
-lib/libgd1.so
-lib/libgd1.so.2
-@dirrm include/gd
+bin/annotate
+bin/bdftogd
+bin/gd2copypal
+bin/gd2togif
+bin/gd2topng
+bin/gdcmpgif
+bin/gdparttopng
+bin/gdtopng
+bin/giftogd2
+bin/pngtogd
+bin/pngtogd2
+bin/webpng
+include/gd.h
+include/gd_io.h
+include/gdcache.h
+include/gdfontg.h
+include/gdfontl.h
+include/gdfontmb.h
+include/gdfonts.h
+include/gdfontt.h
+lib/libgd.a
+lib/libgd.so
+lib/libgd.so.4
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Property changes on: head/graphics/gd/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/graphics/gd1/Makefile
===================================================================
--- head/graphics/gd1/Makefile	(revision 87213)
+++ head/graphics/gd1/Makefile	(revision 87214)
@@ -1,43 +1,53 @@
-# New ports collection makefile for:	gd
-# Date created:         27 Mar 1998
-# Whom:                 jeff@cetlink.net
+# New ports collection makefile for:	gd1
+# Date created:				27 Mar 1998
+# Whom:					jeff@cetlink.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gd
 PORTVERSION=	1.8.4
-PORTREVISION=	7
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
 		${MASTER_SITE_RINGSERVER}
 MASTER_SITE_SUBDIR=	graphics/gd
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	A graphics library for fast creation of images
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
+.if defined(WITH_XPM)
+.if defined(WITHOUT_X11)
+LIB_DEPENDS+=   Xpm:${PORTSDIR}/graphics/xpm
+CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
+LDFLAGS+=	-L${X11BASE}/lib -lXpm
+.else
+USE_XPM=	yes
+CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
+LDFLAGS+=	-L${X11BASE}/lib -lXpm -lX11
+.endif
+.endif
 
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+LATEST_LINK=	gd1
+
 MAKEFILE=	${FILESDIR}/Makefile.lib
 INSTALLS_SHLIB=	yes
 
-.if defined(WITH_X11)
-USE_XPM=	yes
-.endif
-
 pre-everything::
-.if !defined(WITH_X11)
+.if !defined(WITH_XPM)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you want to compile with Xpm support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_X11=yes\""
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XPM=yes\""
 	@${ECHO_MSG}
 .endif
 
 post-extract:
 	@${CP} ${FILESDIR}/gd_gif_in.c ${WRKSRC}
 
 .include 

Property changes on: head/graphics/gd1/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.59
\ No newline at end of property
+1.60
\ No newline at end of property
Index: head/graphics/gd1/files/Makefile.lib
===================================================================
--- head/graphics/gd1/files/Makefile.lib	(revision 87213)
+++ head/graphics/gd1/files/Makefile.lib	(revision 87214)
@@ -1,36 +1,32 @@
 # $FreeBSD$
 
 PREFIX?=	/usr/local
 SHLIB_VER?=	2
 
 LIB=		gd1
 LIBDIR=		${PREFIX}/lib
 SHLIB_MAJOR=	${SHLIB_VER}
 SHLIB_MINOR=	0
 NOPROFILE=	yes
 NOOBJ=		yes
 
 INCS=		gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
 		gdfonts.h gdfontt.h
 INCSDIR=	${PREFIX}/include/gd
 INCDIR=		${INSCDIR}	# for pre-bsd.incs.mk API
 
 SRCS=		gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_ss.c \
 		gd_io_ss.c gd_png.c gd_jpeg.c gdxpm.c gdfontt.c gdfonts.c \
 		gdfontmb.c gdfontl.c gdfontg.c gdtables.c gdft.c gdttf.c \
 		gdcache.c gdkanji.c wbmp.c gd_wbmp.c gdhelpers.c gd_gif_in.c
 
 CFLAGS+=	-I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \
 		-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \
-		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ
-LDADD=		-L${LOCALBASE}/lib -lfreetype -ljpeg -lpng -lz
-
-.ifdef WITH_X11
-CFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
-LDADD+=		-L${X11BASE}/lib -lXpm -lX11
-.endif
+		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ \
+		${CPPFLAGS}
+LDADD=		-L${LOCALBASE}/lib -lfreetype -ljpeg -lpng -lz ${LDFLAGS}
 
 beforeinstall:
 	mkdir -p ${INCSDIR}
 
 .include 

Property changes on: head/graphics/gd1/files/Makefile.lib
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/graphics/gdchart/Makefile
===================================================================
--- head/graphics/gdchart/Makefile	(revision 87213)
+++ head/graphics/gdchart/Makefile	(revision 87214)
@@ -1,62 +1,63 @@
 # New ports collection makefile for:	gdchart
 # Date created:         4 June 2001
 # Whom:                 Anders Nordby 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gdchart
 PORTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.fred.net/brv/chart/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION}dev
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Easy to use, fast C API for creating charts and graphs
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		freetype:${PORTSDIR}/print/freetype2
 
 USE_REINPLACE=	yes
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ARGS=	PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}"
 
 DOCS=		README
 EXAMPLES=	ft_samp.c gdc_pie_samp.c gdc_samp1.c gdc_samp2.c
 
 .if defined(NOPROFILE)
 PLIST_SUB+=	PROFILE="@comment "
 .else
 PLIST_SUB+=	PROFILE=
 .endif
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' \
 		-e 's/^#ifdef HAVE_LIBFREETYPE/#ifndef NO_LIBFREETYPE/' \
 			${WRKSRC}/*.[ch]
 # ft_samp.c and gdc_samp?.c miss #include "gdcpie.h"
 	${REINPLACE_CMD} \
 		-e 's/^#include "gdc\.h"/#include "gdcpie.h"/' \
 			${WRKSRC}/ft_samp.c \
 			${WRKSRC}/gdc_samp?.c
 # gdc_pie_samp.c misses #include "gdchart.h"
 	${REINPLACE_CMD} \
 		-e 's/^#include "gdc\.h"/#include "gdchart.h"/' \
 			${WRKSRC}/gdc_pie_samp.c
 
 .if !defined(NOPORTDOCS)
 post-install:
 .for f in ${DOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
 .endfor
 .for f in ${EXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}/
 .endfor
 .endif
 
 .include 

Property changes on: head/graphics/gdchart/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/graphics/p5-GD/Makefile
===================================================================
--- head/graphics/p5-GD/Makefile	(revision 87213)
+++ head/graphics/p5-GD/Makefile	(revision 87214)
@@ -1,33 +1,26 @@
-# New ports collection makefile for:    p5-GD
-# Date created:				June 26th 1997
-# Whom:	      				James FitzGibbon 
+# New ports collection makefile for:	p5-GD
+# Date created:				March 11, 2003
+# Whom:					Philip M. Gollucci 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	GD
-PORTVERSION=	1.41
-PORTREVISION=	1
+PORTVERSION=	2.07
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
 PKGNAMEPREFIX=	p5-
+DISTNAME=	GD-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A perl5 interface to Gd Graphics Library
+MAINTAINER=	philip@p6m7g8.com
+COMMENT=	A perl5 interface to Gd Graphics Library version2
 
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 
 PERL_CONFIGURE=	yes
-USE_REINPLACE=	yes
+CONFIGURE_ARGS=	-options "JPEG,FT,XPM" -lib_gd_path ${LOCALBASE} -lib_ft_path ${X11BASE} -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE}
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		GD.3
-
-post-patch:
-	${REINPLACE_CMD} \
-		-e 's,@@LOCALBASE@@,${LOCALBASE},g' \
-		-e 's,@@X11BASE@@,${X11BASE},g' \
-		${WRKSRC}/Makefile.PL
+MAN3=		GD.3 GD::Polyline.3
 
 .include 

Property changes on: head/graphics/p5-GD/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.32
\ No newline at end of property
+1.33
\ No newline at end of property
Index: head/graphics/p5-GD/distinfo
===================================================================
--- head/graphics/p5-GD/distinfo	(revision 87213)
+++ head/graphics/p5-GD/distinfo	(revision 87214)
@@ -1 +1 @@
-MD5 (GD-1.41.tar.gz) = 9f11b3f6bb73f04d2bc3f02df0662bdd
+MD5 (GD-2.07.tar.gz) = 7a44d308e082471e824fcbff044d8300

Property changes on: head/graphics/p5-GD/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/graphics/p5-GD/files/patch-aa
===================================================================
--- head/graphics/p5-GD/files/patch-aa	(revision 87213)
+++ head/graphics/p5-GD/files/patch-aa	(nonexistent)
@@ -1,49 +0,0 @@
---- Makefile.PL.orig	Wed Jun 19 14:02:59 2002
-+++ Makefile.PL	Sat Jun 22 21:25:18 2002
-@@ -3,40 +3,17 @@
- warn "NOTICE: This module requires libgd 1.8.4 or higher (shared library version 4.X).\n";
- 
- # =====> PATHS: CHECK AND ADJUST <=====
--my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd); 
--my @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
--my @LIBS    = qw(-lgd -lpng -lz);
--
--# FEATURE FLAGS
--warn "\nPlease choose the features that match how libgd was built:\n";
--
--my $JPEG    = lc prompt('Build JPEG support?','y') eq 'y';
--my $TTF     = lc prompt('Build FreeType support?','y') eq 'y';
--my $XPM     = $^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
--my $GIF		= lc prompt('Build GIF support (for patched versions of gd)?','n') eq 'y';
-+my @INC     = qw(-I@@LOCALBASE@@/include/gd -I@@LOCALBASE@@/include/freetype -I@@LOCALBASE@@/include -I@@X11BASE@@/include/X11 -I@@X11BASE@@/include); 
-+my @LIBPATH = qw(-L@@LOCALBASE@@/lib -L@@X11BASE@@/lib);
-+my @LIBS    = qw(-lfreetype -ljpeg -lgd1 -lpng -lz);
- 
- my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
- 
--warn "\nIf you experience compile problems, please check the \@INC, \@LIBPATH and \@LIBS\n",
--     "arrays defined in Makefile.PL and manually adjust, if necessary.\n\n";
--
--#### no user-serviceable parts below #####
--
--push @LIBS,'-lfreetype' if $TTF;
--push @LIBS,'-ljpeg' if $JPEG;
--push @LIBS, '-lm' unless $^O eq 'MSWin32';
--
--# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified 
--if ($^O ne 'freebsd' && $^O ne 'MSWin32') { 
--  push @LIBS,'-lX11','-lXpm' if $XPM; 
--} 
-+push @LIBS,'-lX11','-lXpm' unless $^O eq 'MSWin32';
- 
- my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
--my $DEFINES = '';
--$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
--$DEFINES    .= ' -DHAVE_TTF'  if $TTF;
--$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
--$DEFINES    .= ' -DHAVE_GIF'  if $GIF;
-+my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
-+$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
- $DEFINES    .= ' -DFCGI'      if $FCGI;
- 
- WriteMakefile(

Property changes on: head/graphics/p5-GD/files/patch-aa
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.9
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/p5-GD/files/patch-GD.xs
===================================================================
--- head/graphics/p5-GD/files/patch-GD.xs	(nonexistent)
+++ head/graphics/p5-GD/files/patch-GD.xs	(revision 87214)
@@ -0,0 +1,33 @@
+--- GD.xs.orig	Thu Apr 24 07:00:11 2003
++++ GD.xs	Wed May 14 17:33:13 2003
+@@ -18,6 +18,30 @@
+ /* Copyright 1995 - 1998, Lincoln D. Stein.  See accompanying README file for
+ 	usage restrictions */
+ 
++#ifndef PERL_REVISION
++#   ifndef __PATCHLEVEL_H_INCLUDED__
++#       include "patchlevel.h"
++#   endif
++#   ifndef PERL_REVISION
++#       define PERL_REVISION    (5)
++        /* Replace: 1 */
++#       define PERL_VERSION     PATCHLEVEL
++#       define PERL_SUBVERSION  SUBVERSION
++        /* Replace PERL_PATCHLEVEL with PERL_VERSION */
++        /* Replace: 0 */
++#   endif
++#endif
++
++#if (PERL_VERSION == 5) && (PERL_SUBVERSION==3)
++#ifndef PL_na
++# define PL_na na
++#endif
++
++#ifndef SvPV_nolen
++# define SvPV_nolen(sv) SvPV(sv, PL_na)
++#endif
++#endif /* 5.00503 */
++
+ static int
+ not_here(char *s)
+ {

Property changes on: head/graphics/p5-GD/files/patch-GD.xs
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/p5-GD/pkg-descr
===================================================================
--- head/graphics/p5-GD/pkg-descr	(revision 87213)
+++ head/graphics/p5-GD/pkg-descr	(revision 87214)
@@ -1,4 +1,6 @@
-       GD.pm is a port of Thomas Boutell's gd graphics library
-       (see below).  GD allows you to create color drawings using
-       a large number of graphics primitives, and emit the
-       drawings as GIF files.
+GD.pm is a Perl interface to Thomas Boutell's gd graphics library
+(version 2.01 or higher). GD allows you to create color drawings
+using a large number of graphics primitives, and emit the drawings
+as PNG files.
+
+WWW: http://stein.cshl.org/WWW/software/GD/

Property changes on: head/graphics/p5-GD/pkg-descr
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/graphics/p5-GD/pkg-plist
===================================================================
--- head/graphics/p5-GD/pkg-plist	(revision 87213)
+++ head/graphics/p5-GD/pkg-plist	(revision 87214)
@@ -1,8 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/patch_gd.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/qd.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD
+%%SITE_PERL%%/%%PERL_ARCH%%/GD.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/GD/Polyline.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/qd.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GD

Property changes on: head/graphics/p5-GD/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/graphics/p5-GD1/Makefile
===================================================================
--- head/graphics/p5-GD1/Makefile	(revision 87213)
+++ head/graphics/p5-GD1/Makefile	(revision 87214)
@@ -1,33 +1,33 @@
-# New ports collection makefile for:    p5-GD
+# New ports collection makefile for:	p5-GD1
 # Date created:				June 26th 1997
-# Whom:	      				James FitzGibbon 
+# Whom:					James FitzGibbon 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	GD
 PORTVERSION=	1.41
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A perl5 interface to Gd Graphics Library
 
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 
 PERL_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		GD.3
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,@@LOCALBASE@@,${LOCALBASE},g' \
 		-e 's,@@X11BASE@@,${X11BASE},g' \
 		${WRKSRC}/Makefile.PL
 
 .include 

Property changes on: head/graphics/p5-GD1/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.32
\ No newline at end of property
+1.33
\ No newline at end of property
Index: head/graphics/phplot/Makefile
===================================================================
--- head/graphics/phplot/Makefile	(revision 87213)
+++ head/graphics/phplot/Makefile	(revision 87214)
@@ -1,63 +1,63 @@
 # New ports collection makefile for:	phplot
 # Date created:         21 Oct 2001
 # Whom:                 yukinopo@livedoor.com
 #
 # $FreeBSD$
 
 PORTNAME=	phplot
 PORTVERSION=	4.4.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phplot
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	yukinopo@livedoor.com
 COMMENT=	A PHP class for creating scientific and business charts
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 NO_BUILD=	YES
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 PHPLOT_DIR=	lib/php/phplot
 
 PHPLOT_EXAMPLE=	share/phplot
 
 LIBS=		phplot.php phplot_data.php rgb.inc.php benjamingothic.ttf
 
 DOCS=		internal_functions.html function_reference.html \
 		index.html examples.html quick_start.php \
 		user_functions.html user_internal_functions.html
 
 EXAMPLES=	0cars.jpg benjamingothic.ttf create_chart.php \
 		data.php data_date.php data_date2.php data_sample1.php data_sample2.php \
 		data_sample3.php data_sample4.php example1.php example10.php \
 		example11.php example12.php example13.php example2.php \
 		example3.php example4.php example5.php example6.php \
 		example7.php example8.php example9.php format_chart.php \
 		inline_image.php rgb.inc.php test1.php test_setup.php
 
 do-install:
 	@${MKDIR} ${PREFIX}/${PHPLOT_DIR} 2>/dev/null||true
 .for FILE in ${SAMPLES}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} \
        	@${PREFIX}/${PHPLOT_DIR}/${FILE}
 .endfor
 
 .for FILE in ${LIBS}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${PHPLOT_DIR}
 .endfor
 	@${MKDIR} ${PREFIX}/${PHPLOT_EXAMPLE}
 	@${MKDIR} ${PREFIX}/${PHPLOT_EXAMPLE}/doc
 	@${MKDIR} ${PREFIX}/${PHPLOT_EXAMPLE}/examples
 .for FILE in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${PREFIX}/${PHPLOT_EXAMPLE}/doc
 .endfor
 
 .for FILE in ${EXAMPLES}
 	@${INSTALL_DATA} ${WRKSRC}/examples/${FILE} ${PREFIX}/${PHPLOT_EXAMPLE}/examples
 .endfor
 
 .include 

Property changes on: head/graphics/phplot/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/graphics/png2html/Makefile
===================================================================
--- head/graphics/png2html/Makefile	(revision 87213)
+++ head/graphics/png2html/Makefile	(revision 87214)
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	png2html
 # Date created:				11 November 1999
 # Whom:					Chris D. Faulhaber 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	png2html
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.engr.mun.ca/~holden/
 
 MAINTAINER=	jedgar@fxp.org
 COMMENT=	Takes a PNG image and transforms it into HTML
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		gd.4:${PORTSDIR}/graphics/gd2
+		gd.4:${PORTSDIR}/graphics/gd
 
 do-configure:
 		@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig
 		@${SED} -e 's|CHANGE_ME|${PREFIX}|' \
 			< ${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/png2html ${PREFIX}/bin
 
 .include 

Property changes on: head/graphics/png2html/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/graphics/py-gd/Makefile
===================================================================
--- head/graphics/py-gd/Makefile	(revision 87213)
+++ head/graphics/py-gd/Makefile	(revision 87214)
@@ -1,39 +1,40 @@
 # New ports collection makefile for:	py-gd
 # Date created:		23 December 2001
 # Whom:			Hye-Shik Chang 
 #
 # $FreeBSD$
 
 PORTNAME=	gd
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://newcenturycomputers.net/projects/download.cgi/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	gdmodule-${PORTVERSION}
 
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Python interface to the GD library
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 USE_XPM=	yes
 USE_REINPLACE=  yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 PYSETUP=	Setup.py
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 		-e 's,/usr/X11R6,${X11BASE},g' \
 		-e 's,/usr/include/X11,${LOCALBASE}/include,g' \
 		${WRKSRC}/${PYSETUP}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/gddemo.py ${EXAMPLESDIR}
 .endif
 
 .include 

Property changes on: head/graphics/py-gd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/graphics/ruby-gd/Makefile
===================================================================
--- head/graphics/ruby-gd/Makefile	(revision 87213)
+++ head/graphics/ruby-gd/Makefile	(revision 87214)
@@ -1,94 +1,94 @@
 # New ports collection makefile for:	Ruby/gd
 # Date created:		27 Sep 2000
 # Whom:			Akinori MUSHA aka knu 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	GD
 PORTVERSION=	0.7.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www.acc.ne.jp/~tam/GD/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	${PKGNAMESUFFIX_XPM}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Ruby extension library to use Thomas Boutell's gd library
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
 RUBY_MODNAME=	${PORTNAME:L}
 
 CONFIGURE_ARGS=	--with-gd-lib="${LOCALBASE}/lib" \
 		--with-jpeg \
 		--with-freetype
 INSTALL_TARGET=	site-install
 
-.if defined(WITH_GD2)
+.if defined(WITH_GD1)
+CONFIGURE_ARGS+=	--with-gd-include="${LOCALBASE}/include/gd"
+LIB_DEPENDS+=	gd1.2:${PORTSDIR}/graphics/gd1
+.else
 CONFIGURE_ARGS+=	----enable-gd2_0 \
-			--with-gd-include="${LOCALBASE}/include"
+		--with-gd-include="${LOCALBASE}/include"
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
-.else
-CONFIGURE_ARGS+=	--with-gd-include="${LOCALBASE}/include/gd"
-LIB_DEPENDS+=	gd1.2:${PORTSDIR}/graphics/gd
 .endif
 
 .include 
 
 # Hmm, GREP and TRUE seem to be defined in the bsd.port.post.mk stage.
 .if exists(${LOCALBASE}/bin/gd2topng)
 WITH_X11_CHECK!=	ldd ${LOCALBASE}/bin/gd2topng | grep -w 'libX11\.so' || true
 .else
 WITH_X11_CHECK=		# empty
 .endif
 
 .if !empty(WITH_X11_CHECK)
 USE_XLIB=	yes
 USE_XPM=	yes
 PKGNAMESUFFIX_XPM=	+xpm
 CONFIGURE_ARGS+=	--with-X11-dir="${X11BASE}" --with-xpm
 .endif
 
 EXAMPLES_EN=	example.rb	\
 		gdtestttf.rb	\
 		webpng.rb
 DOCS_EN=	Changes		\
 		TODO		\
 		readme.en	\
 		doc/INSTALL.en	\
 		doc/manual.html	\
 		doc/manual.rd	\
 		doc/manual_index.html
 DOCS_JA=	readme.ja	\
 		doc/INSTALL.ja
 
 post-patch:
 	${RUBY} -i -pe 'sub %r:/win98/windows/FONTS:, "${X11BASE}/lib/X11/fonts/TrueType"' ${WRKSRC}/sample/gdtestttf.rb
-.if defined(WITH_GD2)
-	${RUBY} -i -pe 'sub %r:%%GD%%:, "gd"' ${WRKSRC}/extconf.rb
-.else
+.if defined(WITH_GD1)
 	${RUBY} -i -pe 'sub %r:%%GD%%:, "gd1"' ${WRKSRC}/extconf.rb
+.else
+	${RUBY} -i -pe 'sub %r:%%GD%%:, "gd"' ${WRKSRC}/extconf.rb
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES_EN}
 	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
 .include 

Property changes on: head/graphics/ruby-gd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/graphics/scr2png/Makefile
===================================================================
--- head/graphics/scr2png/Makefile	(revision 87213)
+++ head/graphics/scr2png/Makefile	(revision 87214)
@@ -1,40 +1,34 @@
 # New ports collection makefile for:	scr2png
 # Date created:				18 May 2001
 # Whom:					nik
 #
 # $FreeBSD$
 #
 
 PORTNAME=	scr2png
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR= nik
 NO_WRKSUBDIR=	yes
 
 MAINTAINER=	nik@freebsd.org
 COMMENT=	Converts the output of "vidcontrol -p" to PNG
 
-.include 
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
-.else
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd-nox11
-.else
-.endif
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 USE_REINPLACE=	yes
 
 MAN1=		scr2png.1
 MANCOMPRESSED=	yes
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|||' ${WRKSRC}/scr2png.c
 
 do-install:	
 	@cd ${WRKSRC}; ${MAKE} BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX} install
 
-.include 
+.include 

Property changes on: head/graphics/scr2png/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/graphics/zimg/Makefile
===================================================================
--- head/graphics/zimg/Makefile	(revision 87213)
+++ head/graphics/zimg/Makefile	(revision 87214)
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	zimg
 # Date created:		20 Feb 2000
 # Whom:			Will Andrews 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zimg
 PORTVERSION=	4.19.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image-generator that uses ASCII input files to create PNGs/EDFs
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-dynaload-cc="${CC}" \
 		--with-dynaload-cflags="${CFLAGS} -shared"
 
 MAN1=		zimg.1
 
 .include 

Property changes on: head/graphics/zimg/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/japanese/Makefile
===================================================================
--- head/japanese/Makefile	(revision 87213)
+++ head/japanese/Makefile	(revision 87214)
@@ -1,430 +1,431 @@
 # $FreeBSD$
 #
 
     SUBDIR += ASCIIdates98-fpw
     SUBDIR += CGdic-fpw
     SUBDIR += Canna
     SUBDIR += FreeWnn-lib
     SUBDIR += FreeWnn-server
     SUBDIR += VTPSfont
     SUBDIR += Wnn6
     SUBDIR += Wnn6-lib
     SUBDIR += Wnn7-lib
     SUBDIR += a2ps
     SUBDIR += ack
     SUBDIR += acroread5-jpnfont
     SUBDIR += addttfont
     SUBDIR += alias-fonts
     SUBDIR += another-htmllint
     SUBDIR += anthy
     SUBDIR += aterm
     SUBDIR += balsa
     SUBDIR += bible_names-fpw
     SUBDIR += binder
     SUBDIR += bookview
     SUBDIR += cal.rb
     SUBDIR += cannadic
     SUBDIR += cdrom2
     SUBDIR += celrw
     SUBDIR += chasen
     SUBDIR += chasen-base
     SUBDIR += chimera
     SUBDIR += csrd
     SUBDIR += dbskkd-cdb
     SUBDIR += ddskk
     SUBDIR += ddskk-emacs20
     SUBDIR += deepforest
     SUBDIR += devil-fpw
     SUBDIR += diclookup-emacs20
     SUBDIR += diclookup-mule
     SUBDIR += drpl
     SUBDIR += dserver
     SUBDIR += dvi2dvi
     SUBDIR += dvi2ps
     SUBDIR += dvi2tty
     SUBDIR += dvipdfm
     SUBDIR += dvipsk
     SUBDIR += dvipsk-vflib
     SUBDIR += e2ps
     SUBDIR += easypr
     SUBDIR += eb
     SUBDIR += ebd-fpw
     SUBDIR += eblook
     SUBDIR += ebview
     SUBDIR += ebw3
     SUBDIR += edict
     SUBDIR += edict-fpw
     SUBDIR += edict-sdic
     SUBDIR += eijiro-fpw
     SUBDIR += elisa10x8
     SUBDIR += elisa8x8
     SUBDIR += elisp-manual
     SUBDIR += elvis
     SUBDIR += emacs-manual
     SUBDIR += emacs20-dl-canna
     SUBDIR += emacs20-dl-wnn6
     SUBDIR += emacs20-emcws
     SUBDIR += emacs21-emcws
     SUBDIR += epic4
     SUBDIR += epwutil
     SUBDIR += escpf
     SUBDIR += esecanna
     SUBDIR += esecanna-module-vje25
     SUBDIR += esecanna-module-vje30
     SUBDIR += esecanna-module-wnn6
     SUBDIR += eterm
     SUBDIR += ewipe
     SUBDIR += exmh2
     SUBDIR += expect
     SUBDIR += flower-fpw
     SUBDIR += foldoc-fpw
     SUBDIR += freepwing
     SUBDIR += fumeikai-fpw
     SUBDIR += gal
     SUBDIR += gauche-kakasi
     SUBDIR += gawk
     SUBDIR += gd
+    SUBDIR += gd1
     SUBDIR += ghostscript-gnu-jpnfont
     SUBDIR += gicq
     SUBDIR += gn-gnspool
     SUBDIR += gnome
     SUBDIR += gnomelibs
     SUBDIR += gnumeric
     SUBDIR += gorua
     SUBDIR += gqmpeg
     SUBDIR += grep
     SUBDIR += groff
     SUBDIR += gtkicq
     SUBDIR += gxditview
     SUBDIR += hex
     SUBDIR += hns
     SUBDIR += ical
     SUBDIR += ipadic
     SUBDIR += ircII
     SUBDIR += iv
     SUBDIR += jadetex-ptex
     SUBDIR += japaneseAFM
     SUBDIR += jargon-fpw
     SUBDIR += jcode.pl
     SUBDIR += jed
     SUBDIR += jgv
     SUBDIR += jhd
     SUBDIR += jisx0213-fonts
     SUBDIR += jls
     SUBDIR += jmode
     SUBDIR += jpilot
     SUBDIR += jvim
     SUBDIR += jvim-canna
     SUBDIR += jvim-canna+freewnn
     SUBDIR += jvim-canna+wnn6
     SUBDIR += jvim-canna+wnn7
     SUBDIR += jvim-freewnn
     SUBDIR += jvim-wnn6
     SUBDIR += jvim-wnn7
     SUBDIR += jvim3
     SUBDIR += jvim3-canna
     SUBDIR += jvim3-canna+freewnn
     SUBDIR += jvim3-canna+wnn6
     SUBDIR += jvim3-canna+wnn7
     SUBDIR += jvim3-direct_canna
     SUBDIR += jvim3-freewnn
     SUBDIR += jvim3-wnn6
     SUBDIR += jvim3-wnn7
     SUBDIR += jyuroku
     SUBDIR += k10
     SUBDIR += k12
     SUBDIR += kakasi
     SUBDIR += kanji18
     SUBDIR += kanji26
     SUBDIR += kanjipad
     SUBDIR += kappa20
     SUBDIR += kbanner
     SUBDIR += kcc
     SUBDIR += kde3-i18n
     SUBDIR += koffice-i18n
     SUBDIR += kdrill
     SUBDIR += kinput2-canna
     SUBDIR += kinput2-canna+freewnn
     SUBDIR += kinput2-canna+freewnn+sj3
     SUBDIR += kinput2-canna+sj3
     SUBDIR += kinput2-canna+sj3+wnn6
     SUBDIR += kinput2-canna+sj3+wnn7
     SUBDIR += kinput2-canna+wnn6
     SUBDIR += kinput2-canna+wnn7
     SUBDIR += kinput2-freewnn
     SUBDIR += kinput2-freewnn+sj3
     SUBDIR += kinput2-sj3
     SUBDIR += kinput2-sj3+wnn6
     SUBDIR += kinput2-sj3+wnn7
     SUBDIR += kinput2-wnn6
     SUBDIR += kinput2-wnn7
     SUBDIR += kochi-cidfonts
     SUBDIR += kochi-ttfonts
     SUBDIR += kon2-14dot
     SUBDIR += kon2-16dot
     SUBDIR += kpcal
     SUBDIR += kterm
     SUBDIR += kterm16c
     SUBDIR += lambdamoo
     SUBDIR += latex2html
     SUBDIR += leafrogue
     SUBDIR += less
     SUBDIR += libicq
     SUBDIR += libimg
     SUBDIR += libjcode
     SUBDIR += libjconv
     SUBDIR += libslang
     SUBDIR += linux-JM
     SUBDIR += linux_locale
     SUBDIR += lipsf
     SUBDIR += lookup
     SUBDIR += lookup-emacs20
     SUBDIR += lookup-mule
     SUBDIR += lookup-xemacs
     SUBDIR += lsd-fpw
     SUBDIR += lynx
     SUBDIR += lynx-current
     SUBDIR += lyx
     SUBDIR += lyx-doc
     SUBDIR += magicpoint
     SUBDIR += makejvf
     SUBDIR += man
     SUBDIR += man-doc
     SUBDIR += marumoji-fonts
     SUBDIR += mecab
     SUBDIR += mendexk-euc
     SUBDIR += mendexk-sjis
     SUBDIR += mh
     SUBDIR += migemo
     SUBDIR += migemo-emacs20
     SUBDIR += migemo-emacs21
     SUBDIR += migemo-xemacs-devel-mule
     SUBDIR += migemo-xemacs21-mule
     SUBDIR += mikachan-ttfonts
     SUBDIR += mimekit
     SUBDIR += ming
     SUBDIR += monafonts
     SUBDIR += mozilla-jlp
     SUBDIR += mozilla-jlp-devel
     SUBDIR += mplusfonts
     SUBDIR += msdosfs
     SUBDIR += mtools
     SUBDIR += muggy
     SUBDIR += mule-canna
     SUBDIR += mule-canna+freewnn
     SUBDIR += mule-canna+freewnn+sj3
     SUBDIR += mule-canna+sj3
     SUBDIR += mule-canna+sj3+wnn6
     SUBDIR += mule-canna+sj3+wnn7
     SUBDIR += mule-canna+wnn6
     SUBDIR += mule-canna+wnn7
     SUBDIR += mule-freewnn
     SUBDIR += mule-freewnn+sj3
     SUBDIR += mule-sj3
     SUBDIR += mule-sj3+wnn6
     SUBDIR += mule-sj3+wnn7
     SUBDIR += mule-wnn6
     SUBDIR += mule-wnn7
     SUBDIR += mutt
     SUBDIR += mutt-devel
     SUBDIR += mypaedia-fpw
     SUBDIR += mypaedia-fpw-package
     SUBDIR += namazu
     SUBDIR += namazu2
     SUBDIR += navi2ch-emacs20
     SUBDIR += navi2ch-emacs21
     SUBDIR += navi2ch-xemacs21-mule
     SUBDIR += ndtpd
     SUBDIR += ne
     SUBDIR += nethack32
     SUBDIR += nethack34
     SUBDIR += netscape48-communicator
     SUBDIR += netscape48-navigator
     SUBDIR += netscape7
     SUBDIR += netype
     SUBDIR += netypesv
     SUBDIR += newosaka
     SUBDIR += ng
     SUBDIR += ng-canna
     SUBDIR += ng-devel
     SUBDIR += ngraph-fonts
     SUBDIR += nkf
     SUBDIR += nvi-euc-jp
     SUBDIR += nvi-iso-2022-jp
     SUBDIR += nvi-sjis
     SUBDIR += okphone
     SUBDIR += oleo
     SUBDIR += onew-canna
     SUBDIR += onew-canna+freewnn
     SUBDIR += onew-canna+wnn6
     SUBDIR += onew-canna+wnn7
     SUBDIR += onew-freewnn
     SUBDIR += onew-wnn6
     SUBDIR += onew-wnn7
     SUBDIR += openoffice
     SUBDIR += openoffice-devel
     SUBDIR += otojiro-fpw
     SUBDIR += p5-Date-Japanese-Era
     SUBDIR += p5-Jcode
     SUBDIR += p5-MeCab
     SUBDIR += p5-PDFJ
     SUBDIR += p5-Text-ChaSen
     SUBDIR += p5-Text-Kakasi
     SUBDIR += p5-jcode.pl
     SUBDIR += p5-manual
     SUBDIR += p5-mkres
     SUBDIR += p5-nkf
     SUBDIR += paledit
     SUBDIR += pejv-fpw
     SUBDIR += perl5
     SUBDIR += pgp.language
     SUBDIR += php_doc
     SUBDIR += phpgroupware
     SUBDIR += plain2
     SUBDIR += plan
     SUBDIR += platex209-euc
     SUBDIR += platex209-jis
     SUBDIR += platex209-sjis
     SUBDIR += postgresql
     SUBDIR += postgresql-man
     SUBDIR += postgresql-tcltk
     SUBDIR += ppxp
     SUBDIR += prn
     SUBDIR += ptex
     SUBDIR += ptex-base
     SUBDIR += ptex-pkfonts118
     SUBDIR += ptex-pkfonts240
     SUBDIR += ptex-pkfonts300
     SUBDIR += ptex-pkfonts360
     SUBDIR += ptex-pkfonts400
     SUBDIR += ptex-pkfonts600
     SUBDIR += py-kanjilib
     SUBDIR += pycodec
     SUBDIR += qkc
     SUBDIR += qt23
     SUBDIR += rbnamazu
     SUBDIR += recjis
     SUBDIR += roget-fpw
     SUBDIR += rogue_s
     SUBDIR += rskkserv
     SUBDIR += ruby-chasen
     SUBDIR += ruby-eb
     SUBDIR += ruby-gyokuro
     SUBDIR += ruby-kakasi
     SUBDIR += ruby-man
     SUBDIR += ruby-mecab
     SUBDIR += ruby-refe
     SUBDIR += ruby-romkan
     SUBDIR += ruby-slang
     SUBDIR += ruby-tcltklib
     SUBDIR += ruby-tk
     SUBDIR += ruby-uconv
     SUBDIR += ruby-usersguide
     SUBDIR += rxvt
     SUBDIR += ryaku-fpw
     SUBDIR += samba
     SUBDIR += sdic
     SUBDIR += sed
     SUBDIR += seizedesktop
     SUBDIR += shinonome
     SUBDIR += sj3
     SUBDIR += skk
     SUBDIR += skk-jisyo
     SUBDIR += skk-jisyo-cdb
     SUBDIR += skk-tools
     SUBDIR += skk10-elisp-emacs20
     SUBDIR += skkfep
     SUBDIR += skkinput
     SUBDIR += skkinput3
     SUBDIR += skkserv
     SUBDIR += slirc
     SUBDIR += slrn
     SUBDIR += srd-fpw
     SUBDIR += srd-fpw-package
     SUBDIR += t2ps
     SUBDIR += tcl76
     SUBDIR += tcl80
     SUBDIR += tcsh-nls-asuka
     SUBDIR += tcsh-nls-ayanami
     SUBDIR += tcsh-nls-generic
     SUBDIR += tcsh-nls-koshiki
     SUBDIR += tcsh-nls-merril
     SUBDIR += tcsh-nls-miyakonjo
     SUBDIR += tcsh-nls-multi
     SUBDIR += tcsh-nls-rishu
     SUBDIR += tcsh-nls-roomi
     SUBDIR += tcsh-nls-ruri2
     SUBDIR += tdiary
     SUBDIR += texinfo
     SUBDIR += tgif
     SUBDIR += tgif2tex
     SUBDIR += timidity++-slang
     SUBDIR += timidity++-tcltk
     SUBDIR += tk42
     SUBDIR += tk80
     SUBDIR += tkdesk
     SUBDIR += tkhonyaku
     SUBDIR += tkstep80
     SUBDIR += today
     SUBDIR += truetypefonts
     SUBDIR += typist
     SUBDIR += vera-fpw
     SUBDIR += vflib
     SUBDIR += vftool
     SUBDIR += vfxdvi118
     SUBDIR += vfxdvi240
     SUBDIR += vfxdvi300
     SUBDIR += vfxdvi360
     SUBDIR += vfxdvi400
     SUBDIR += vfxdvi600
     SUBDIR += vje30
     SUBDIR += vje30-trial
     SUBDIR += w3
     SUBDIR += w3m
     SUBDIR += w3m-img
     SUBDIR += waeijiro-fpw
     SUBDIR += wdic-fpw
     SUBDIR += weather-emacs20
     SUBDIR += web1913-fpw
     SUBDIR += webalizer
     SUBDIR += weblint97
     SUBDIR += wnn7egg
     SUBDIR += wordnet-fpw
     SUBDIR += wwasw-fpw
     SUBDIR += xchat
     SUBDIR += xdvik-vflib
     SUBDIR += xdvik-vflib-pk118
     SUBDIR += xdvik-vflib-pk240
     SUBDIR += xdvik-vflib-pk300
     SUBDIR += xdvik-vflib-pk360
     SUBDIR += xdvik-vflib-pk400
     SUBDIR += xdvik-vflib-pk600
     SUBDIR += xdvik-vflib-pkall
     SUBDIR += xemacs-devel-canna
     SUBDIR += xemacs-devel-canna+freewnn
     SUBDIR += xemacs-devel-canna+wnn6
     SUBDIR += xemacs-devel-freewnn
     SUBDIR += xemacs-devel-wnn6
     SUBDIR += xemacs21-canna
     SUBDIR += xemacs21-canna+freewnn
     SUBDIR += xemacs21-canna+wnn6
     SUBDIR += xemacs21-freewnn
     SUBDIR += xemacs21-wnn6
     SUBDIR += xjman
     SUBDIR += xjman-3
     SUBDIR += xjtext
     SUBDIR += xmsgsaver
     SUBDIR += xpdf
     SUBDIR += xshodo
     SUBDIR += xshodou
     SUBDIR += xtr
     SUBDIR += xv
     SUBDIR += xvi-euc
     SUBDIR += xvi-sjis
     SUBDIR += xyagamo
     SUBDIR += xyaku
     SUBDIR += yc.el
     SUBDIR += zangband
     SUBDIR += zipcodes
 
 .include 

Property changes on: head/japanese/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.496
\ No newline at end of property
+1.497
\ No newline at end of property
Index: head/japanese/gd/Makefile
===================================================================
--- head/japanese/gd/Makefile	(revision 87213)
+++ head/japanese/gd/Makefile	(revision 87214)
@@ -1,17 +1,17 @@
-# New ports collection makefile for: gd
+# New ports collection makefile for:	gd2
 # Date created:				19 Aug 1998
 # Whom:					ichiro@ichiro.org
 #
 # $FreeBSD$
 #
 
 CATEGORIES=	japanese
 
 MAINTAINER=	ichiro@ichiro.org
 COMMENT=	A graphics library for fast image creation with Japanese support
 
 MASTERDIR=	${.CURDIR}/../../graphics/gd
 
-MAKE_ARGS=	-DJISX0208
+CPPFLAGS+=	-DJISX0208
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/japanese/gd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/japanese/gd1/Makefile
===================================================================
--- head/japanese/gd1/Makefile	(revision 87213)
+++ head/japanese/gd1/Makefile	(revision 87214)
@@ -1,17 +1,17 @@
-# New ports collection makefile for: gd
+# New ports collection makefile for:	gd1
 # Date created:				19 Aug 1998
 # Whom:					ichiro@ichiro.org
 #
 # $FreeBSD$
 #
 
 CATEGORIES=	japanese
 
 MAINTAINER=	ichiro@ichiro.org
 COMMENT=	A graphics library for fast image creation with Japanese support
 
-MASTERDIR=	${.CURDIR}/../../graphics/gd
+MASTERDIR=	${.CURDIR}/../../graphics/gd1
 
-MAKE_ARGS=	-DJISX0208
+CPPFLAGS+=	-DJISX0208
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/japanese/gd1/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/math/ploticus/Makefile
===================================================================
--- head/math/ploticus/Makefile	(revision 87213)
+++ head/math/ploticus/Makefile	(revision 87214)
@@ -1,54 +1,54 @@
 # ex:ts=8
 # Ports collection makefile for:	ploticus
 # Date created:			Jan 23, 2002
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ploticus
 PORTVERSION=	2.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://ploticus.sourceforge.net/download/
 DISTNAME=	plsrc${PORTVERSION:S/.//}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates plots and graphs from data
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ming.3:${PORTSDIR}/graphics/ming \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CONFLICTS=	slffea-* swi-pl-*
 
 FREETYPE_CONFIG?=	${LOCALBASE}/bin/freetype-config
 
 USE_XPM=	yes
 MAKE_ARGS=	CC="${CC}" FLAGS="${CFLAGS}" \
 		LOCALEOBJ="localef.o" LOCALE_FLAG="-DLOCALE" \
 		MING="-L${LOCALBASE}/lib -lming" \
 		MINGH="-I${LOCALBASE}/include/ming" NOSWFFLAG="" \
 		GD18LIBS="`${FREETYPE_CONFIG} --libs` \
 			-L${LOCALBASE}/lib -lgd -lpng -lz -ljpeg" \
 		GD18H="`${FREETYPE_CONFIG} --cflags` \
 			-L${LOCALBASE}/include" \
 		GDFREETYPE="-DGDFREETYPE" PREFABS_DIR="${DATADIR}"
 ALL_TARGET=	plgd18
 
 MAN1=	pl.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pl ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../prefabs/* ${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/../man/man1/${MAN1} ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
 .endif
 
 .include 

Property changes on: head/math/ploticus/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/math/plplot/Makefile
===================================================================
--- head/math/plplot/Makefile	(revision 87213)
+++ head/math/plplot/Makefile	(revision 87214)
@@ -1,76 +1,74 @@
 # New ports collection makefile for:    plplot
 # Date created:         03 Oct 1997
 # Whom:                 Thomas Gellekum 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	plplot
 PORTVERSION=	5.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific plotting package
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
-RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack pkgconfig
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GDINCDIR="${LOCALBASE}/include" \
 		GDLIBDIR="${LOCALBASE}/lib" \
 		M4="${LOCALBASE}/bin/gm4"
 CONFIGURE_ARGS=	--disable-python --disable-octave --without-qhull
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 MAN1=		plm2gif.1 plplot_libtool.1 plpr.1 pltek.1 pstex2eps.1
 
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=	X11="@comment "
 .else
 USE_XLIB=	yes
 PLIST_SUB+=	X11=""
 .endif
 
 .if defined(WITH_TCLTK)
 .undef WITHOUT_X11
 PKGNAMESUFFIX=	-tcltk
 LIB_DEPENDS+=	itk32.1:${PORTSDIR}/x11-toolkits/itk
 CONFIGURE_ENV+=	ITKINCDIR="${LOCALBASE}/include/itk3.2" \
 		ITKLIBDIR="${LOCALBASE}/lib" \
 		TKINCDIR="${LOCALBASE}/include/tk8.3" \
 		TKPRIVATEINCDIR="${LOCALBASE}/include/tk8.3/generic" \
 		TKLIBDIR="${LOCALBASE}/lib" \
 		ITCLINCDIR="${LOCALBASE}/include/itcl3.2" \
 		ITCLLIBDIR="${LOCALBASE}/lib" \
 		TCLINCDIR="${LOCALBASE}/include/tcl8.3" \
 		TCLPRIVATEINCDIR="${LOCALBASE}/include/tcl8.3/generic" \
 		TCLLIBDIR="${LOCALBASE}/lib"
 MAN1+=		plrender.1 plserver.1 pltcl.1
 PLIST_SUB+=	TCLTK=""
 .else
 CONFIGURE_ARGS+=	--disable-itcl --disable-tcl --disable-tk
 PLIST_SUB+=	TCLTK="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-litk$$|-litk32|g ; \
 		 s|-ltk$$|-ltk83|g ; \
 		 s|-litcl$$|-litcl32|g ; \
 		 s|-ltcl$$|-ltcl83|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|tclsh|${LOCALBASE}/bin/tclsh8.3|g' \
 		${WRKSRC}/scripts/mktclIndex
 
 .include 

Property changes on: head/math/plplot/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.27
\ No newline at end of property
+1.28
\ No newline at end of property
Index: head/net/mrtg/Makefile
===================================================================
--- head/net/mrtg/Makefile	(revision 87213)
+++ head/net/mrtg/Makefile	(revision 87214)
@@ -1,84 +1,84 @@
 # New ports collection makefile for:	MRTG
 # Date created:				April 18th 1997
 # Whom:	      				James FitzGibbon 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mrtg
 PORTVERSION=	2.9.29
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/ \
 		${MASTER_SITE_RINGSERVER}
 MASTER_SITE_SUBDIR=	net/mrtg
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	The multi-router traffic grapher
 
 RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include
+		--with-gd-inc=${LOCALBASE}/include/gd
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include/gd
+		--with-gd-inc=${LOCALBASE}/include
 .endif
 
 USE_PERL5=	YES
 MAKE_ENV+=	PERL=${PERL}
 
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ENV=	PERL=${PERL}
 
 MAN1=		cfgmaker.1 contrib.1 faq.1 forum.1 indexmaker.1 logfile.1 \
 		mibhelp.1 mrtg.1 mrtg-rrd.1 mrtglib.1 nt-guide.1 reference.1 \
 		squid.1 unix-guide.1 webserver.1
 
 post-patch:
 	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
-.if defined(WITH_GD2)
-	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
-.else
+.if defined(WITH_GD1)
 	${PERL} -pi -e 's:%%GD%%:-lgd1:g' ${WRKSRC}/configure
+.else
+	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
 .endif
 
 do-install:
 		${MKDIR} -m 755 ${PREFIX}/etc/mrtg
 		${MKDIR} -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 		${MKDIR} -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Pod
 		${MKDIR} -m 755 ${DATADIR}
 .if !defined(NOPORTDOCS)
 		${MKDIR} -m 755 ${DOCSDIR}
 		for file in ANNOUNCE CHANGES COPYRIGHT MANIFEST README \
 			doc/*.html doc/*.pod doc/*.txt doc/*wml doc/*.png ; do \
 			${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \
 		done
 .endif
 		${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${PREFIX}/etc/mrtg/mrtg.cfg.sample
 		${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR}
 		${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
 		${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/*.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 		${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/Pod/*.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Pod
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin/
 		for file in mrtg cfgmaker indexmaker; do \
 			${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file ${PREFIX}/bin/; \
 		done
 
 post-install:
 .if !defined(BATCH)
 	@${ECHO} ""
 	@${ECHO} "############################################################################"
 	@${ECHO} "# Please create a MRTG config file in ${PREFIX}/etc/mrtg                   #"
 	@${ECHO} "# A configuration file can be automatically generated with cfgmaker        #"
 	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample              #"
 	@${ECHO} "############################################################################"
 .endif
 
 .include 

Property changes on: head/net/mrtg/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.65
\ No newline at end of property
+1.66
\ No newline at end of property
Index: head/net/nagios/Makefile
===================================================================
--- head/net/nagios/Makefile	(revision 87213)
+++ head/net/nagios/Makefile	(revision 87214)
@@ -1,78 +1,78 @@
 # New ports collection makefile for:	nagios
 # Date created:				19 May 2002
 # Whom:					Blaz Zupan 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
 
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 
 CPPFLAGS=	${INCGD} -I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CFLAGS="${CPPFLAGS} ${CFLAGS} ${INCGD}" \
 		LIBS="-L${LOCALBASE}/lib ${LIBGD}"
 CONFIGURE_ARGS=	--with-command-user=nagios \
 		--with-command-grp=www \
 		--with-nagios-user=nagios \
 		--with-nagios-grp=nagios \
 		--with-template-objects \
 		--with-template-extinfo \
 		--with-init-dir=${PREFIX}/etc/rc.d \
 		--sbindir=${PREFIX}/share/nagios/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share/nagios \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
 .endif
 
 .if defined(NAGIOS_FILE_PERFDATA)
 CONFIGURE_ARGS+=--with-file-perfdata
 .endif
 
 .if defined(WITH_POSTGRES)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
 INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 .include 

Property changes on: head/net/nagios/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.32
\ No newline at end of property
+1.33
\ No newline at end of property
Index: head/net/netsaint/Makefile
===================================================================
--- head/net/netsaint/Makefile	(revision 87213)
+++ head/net/netsaint/Makefile	(revision 87214)
@@ -1,71 +1,66 @@
 # New ports collection makefile for:	netsaint
 # Date created:				Wed 12 Jul 2000
 # Whom:					will
 #
 # $FreeBSD$
 #
 
 PORTNAME=	netsaint
 PORTVERSION=	0.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dwcjr
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins
 
-USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgd"
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-command-user=netsaint \
 		--with-command-grp=www \
+		--with-gd-lib=${LOCALBASE}/lib \
+		--with-gd-inc=${LOCALBASE}/include \
 		--with-netsaint-user=netsaint \
 		--with-netsaint-grp=netsaint \
 		--sbindir=${PREFIX}/share/netsaint/sbin \
 		--libexecdir=${PREFIX}/libexec/netsaint \
 		--datadir=${PREFIX}/share/netsaint \
 		--sysconfdir=${PREFIX}/etc/netsaint \
 		--localstatedir=${PREFIX}/var/netsaint
+INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
 .endif
 
 .if defined(WITH_POSTGRES)
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
-INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
-
 pre-fetch:
 	@${SH} ${SCRIPTDIR}/checkps
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
-
 post-install:
-.for i in ${BSDIMAGES}
+.for i in bsd_logofullsize.gif bsd_sblogo.gif
 	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
 .include 

Property changes on: head/net/netsaint/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.24
\ No newline at end of property
+1.25
\ No newline at end of property
Index: head/net/netsaint/files/patch-ad
===================================================================
--- head/net/netsaint/files/patch-ad	(revision 87213)
+++ head/net/netsaint/files/patch-ad	(revision 87214)
@@ -1,42 +1,23 @@
 --- configure.orig	Thu Mar  1 04:54:12 2001
 +++ configure	Thu Mar  1 21:58:09 2001
 @@ -11,7 +11,7 @@
  ac_help=
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
 -ac_default_prefix=/usr/local/netsaint
 +#ac_default_prefix=/usr/local/netsaint
  ac_help="$ac_help
  --with-netsaint-user= sets user name to run netsaint"
  ac_help="$ac_help
 @@ -562,9 +562,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
 -    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
 +    CONFIG_SITE="$prefix/share/netsaint/config.site $prefix/etc/netsaint/config.site"
    else
 -    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 +    CONFIG_SITE="$ac_default_prefix/share/netsaint/config.site $ac_default_prefix/etc/netsaint/config.site"
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
-@@ -1298,6 +1298,9 @@
- 	LDFLAGS="${LDFLAGS} -L${withval}"
- 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- 	
-+else
-+	LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-+	LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- fi
- 
- # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -1305,6 +1308,8 @@
-   withval="$with_gd_inc"
-   
- 	CFLAGS="${CFLAGS} -I${withval}"
-+else
-+	CFLAGS="${CFLAGS} -I/usr/local/include/gd"
- 	
- fi
- 

Property changes on: head/net/netsaint/files/patch-ad
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/net-mgmt/mrtg/Makefile
===================================================================
--- head/net-mgmt/mrtg/Makefile	(revision 87213)
+++ head/net-mgmt/mrtg/Makefile	(revision 87214)
@@ -1,84 +1,84 @@
 # New ports collection makefile for:	MRTG
 # Date created:				April 18th 1997
 # Whom:	      				James FitzGibbon 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mrtg
 PORTVERSION=	2.9.29
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/ \
 		${MASTER_SITE_RINGSERVER}
 MASTER_SITE_SUBDIR=	net/mrtg
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	The multi-router traffic grapher
 
 RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include
+		--with-gd-inc=${LOCALBASE}/include/gd
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include/gd
+		--with-gd-inc=${LOCALBASE}/include
 .endif
 
 USE_PERL5=	YES
 MAKE_ENV+=	PERL=${PERL}
 
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ENV=	PERL=${PERL}
 
 MAN1=		cfgmaker.1 contrib.1 faq.1 forum.1 indexmaker.1 logfile.1 \
 		mibhelp.1 mrtg.1 mrtg-rrd.1 mrtglib.1 nt-guide.1 reference.1 \
 		squid.1 unix-guide.1 webserver.1
 
 post-patch:
 	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
-.if defined(WITH_GD2)
-	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
-.else
+.if defined(WITH_GD1)
 	${PERL} -pi -e 's:%%GD%%:-lgd1:g' ${WRKSRC}/configure
+.else
+	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
 .endif
 
 do-install:
 		${MKDIR} -m 755 ${PREFIX}/etc/mrtg
 		${MKDIR} -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 		${MKDIR} -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Pod
 		${MKDIR} -m 755 ${DATADIR}
 .if !defined(NOPORTDOCS)
 		${MKDIR} -m 755 ${DOCSDIR}
 		for file in ANNOUNCE CHANGES COPYRIGHT MANIFEST README \
 			doc/*.html doc/*.pod doc/*.txt doc/*wml doc/*.png ; do \
 			${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \
 		done
 .endif
 		${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${PREFIX}/etc/mrtg/mrtg.cfg.sample
 		${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR}
 		${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
 		${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/*.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 		${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/Pod/*.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Pod
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin/
 		for file in mrtg cfgmaker indexmaker; do \
 			${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file ${PREFIX}/bin/; \
 		done
 
 post-install:
 .if !defined(BATCH)
 	@${ECHO} ""
 	@${ECHO} "############################################################################"
 	@${ECHO} "# Please create a MRTG config file in ${PREFIX}/etc/mrtg                   #"
 	@${ECHO} "# A configuration file can be automatically generated with cfgmaker        #"
 	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample              #"
 	@${ECHO} "############################################################################"
 .endif
 
 .include 

Property changes on: head/net-mgmt/mrtg/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.65
\ No newline at end of property
+1.66
\ No newline at end of property
Index: head/net-mgmt/nagios/Makefile
===================================================================
--- head/net-mgmt/nagios/Makefile	(revision 87213)
+++ head/net-mgmt/nagios/Makefile	(revision 87214)
@@ -1,78 +1,78 @@
 # New ports collection makefile for:	nagios
 # Date created:				19 May 2002
 # Whom:					Blaz Zupan 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
 
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 
 CPPFLAGS=	${INCGD} -I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CFLAGS="${CPPFLAGS} ${CFLAGS} ${INCGD}" \
 		LIBS="-L${LOCALBASE}/lib ${LIBGD}"
 CONFIGURE_ARGS=	--with-command-user=nagios \
 		--with-command-grp=www \
 		--with-nagios-user=nagios \
 		--with-nagios-grp=nagios \
 		--with-template-objects \
 		--with-template-extinfo \
 		--with-init-dir=${PREFIX}/etc/rc.d \
 		--sbindir=${PREFIX}/share/nagios/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share/nagios \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
 .endif
 
 .if defined(NAGIOS_FILE_PERFDATA)
 CONFIGURE_ARGS+=--with-file-perfdata
 .endif
 
 .if defined(WITH_POSTGRES)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
 INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 .include 

Property changes on: head/net-mgmt/nagios/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.32
\ No newline at end of property
+1.33
\ No newline at end of property
Index: head/net-mgmt/nagios12/Makefile
===================================================================
--- head/net-mgmt/nagios12/Makefile	(revision 87213)
+++ head/net-mgmt/nagios12/Makefile	(revision 87214)
@@ -1,78 +1,78 @@
 # New ports collection makefile for:	nagios
 # Date created:				19 May 2002
 # Whom:					Blaz Zupan 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
 
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 
 CPPFLAGS=	${INCGD} -I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CFLAGS="${CPPFLAGS} ${CFLAGS} ${INCGD}" \
 		LIBS="-L${LOCALBASE}/lib ${LIBGD}"
 CONFIGURE_ARGS=	--with-command-user=nagios \
 		--with-command-grp=www \
 		--with-nagios-user=nagios \
 		--with-nagios-grp=nagios \
 		--with-template-objects \
 		--with-template-extinfo \
 		--with-init-dir=${PREFIX}/etc/rc.d \
 		--sbindir=${PREFIX}/share/nagios/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share/nagios \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
 .endif
 
 .if defined(NAGIOS_FILE_PERFDATA)
 CONFIGURE_ARGS+=--with-file-perfdata
 .endif
 
 .if defined(WITH_POSTGRES)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
 INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 .include 

Property changes on: head/net-mgmt/nagios12/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.32
\ No newline at end of property
+1.33
\ No newline at end of property
Index: head/net-mgmt/nagios2/Makefile
===================================================================
--- head/net-mgmt/nagios2/Makefile	(revision 87213)
+++ head/net-mgmt/nagios2/Makefile	(revision 87214)
@@ -1,78 +1,78 @@
 # New ports collection makefile for:	nagios
 # Date created:				19 May 2002
 # Whom:					Blaz Zupan 
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
 
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 
 CPPFLAGS=	${INCGD} -I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CFLAGS="${CPPFLAGS} ${CFLAGS} ${INCGD}" \
 		LIBS="-L${LOCALBASE}/lib ${LIBGD}"
 CONFIGURE_ARGS=	--with-command-user=nagios \
 		--with-command-grp=www \
 		--with-nagios-user=nagios \
 		--with-nagios-grp=nagios \
 		--with-template-objects \
 		--with-template-extinfo \
 		--with-init-dir=${PREFIX}/etc/rc.d \
 		--sbindir=${PREFIX}/share/nagios/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share/nagios \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
 .endif
 
 .if defined(NAGIOS_FILE_PERFDATA)
 CONFIGURE_ARGS+=--with-file-perfdata
 .endif
 
 .if defined(WITH_POSTGRES)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
 INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 .include 

Property changes on: head/net-mgmt/nagios2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.32
\ No newline at end of property
+1.33
\ No newline at end of property
Index: head/net-mgmt/netsaint/Makefile
===================================================================
--- head/net-mgmt/netsaint/Makefile	(revision 87213)
+++ head/net-mgmt/netsaint/Makefile	(revision 87214)
@@ -1,71 +1,66 @@
 # New ports collection makefile for:	netsaint
 # Date created:				Wed 12 Jul 2000
 # Whom:					will
 #
 # $FreeBSD$
 #
 
 PORTNAME=	netsaint
 PORTVERSION=	0.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dwcjr
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins
 
-USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgd"
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-command-user=netsaint \
 		--with-command-grp=www \
+		--with-gd-lib=${LOCALBASE}/lib \
+		--with-gd-inc=${LOCALBASE}/include \
 		--with-netsaint-user=netsaint \
 		--with-netsaint-grp=netsaint \
 		--sbindir=${PREFIX}/share/netsaint/sbin \
 		--libexecdir=${PREFIX}/libexec/netsaint \
 		--datadir=${PREFIX}/share/netsaint \
 		--sysconfdir=${PREFIX}/etc/netsaint \
 		--localstatedir=${PREFIX}/var/netsaint
+INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-inc=${LOCALBASE}/include/mysql \
 		--with-mysql-xdata
 .endif
 
 .if defined(WITH_POSTGRES)
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
-INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
-
 pre-fetch:
 	@${SH} ${SCRIPTDIR}/checkps
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
-
 post-install:
-.for i in ${BSDIMAGES}
+.for i in bsd_logofullsize.gif bsd_sblogo.gif
 	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
 .include 

Property changes on: head/net-mgmt/netsaint/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.24
\ No newline at end of property
+1.25
\ No newline at end of property
Index: head/net-mgmt/netsaint/files/patch-ad
===================================================================
--- head/net-mgmt/netsaint/files/patch-ad	(revision 87213)
+++ head/net-mgmt/netsaint/files/patch-ad	(revision 87214)
@@ -1,42 +1,23 @@
 --- configure.orig	Thu Mar  1 04:54:12 2001
 +++ configure	Thu Mar  1 21:58:09 2001
 @@ -11,7 +11,7 @@
  ac_help=
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
 -ac_default_prefix=/usr/local/netsaint
 +#ac_default_prefix=/usr/local/netsaint
  ac_help="$ac_help
  --with-netsaint-user= sets user name to run netsaint"
  ac_help="$ac_help
 @@ -562,9 +562,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
 -    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
 +    CONFIG_SITE="$prefix/share/netsaint/config.site $prefix/etc/netsaint/config.site"
    else
 -    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 +    CONFIG_SITE="$ac_default_prefix/share/netsaint/config.site $ac_default_prefix/etc/netsaint/config.site"
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
-@@ -1298,6 +1298,9 @@
- 	LDFLAGS="${LDFLAGS} -L${withval}"
- 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- 	
-+else
-+	LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-+	LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- fi
- 
- # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -1305,6 +1308,8 @@
-   withval="$with_gd_inc"
-   
- 	CFLAGS="${CFLAGS} -I${withval}"
-+else
-+	CFLAGS="${CFLAGS} -I/usr/local/include/gd"
- 	
- fi
- 

Property changes on: head/net-mgmt/netsaint/files/patch-ad
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/textproc/modlogan/Makefile
===================================================================
--- head/textproc/modlogan/Makefile	(revision 87213)
+++ head/textproc/modlogan/Makefile	(revision 87214)
@@ -1,74 +1,74 @@
 # New ports collection makefile for:	modlogan
 # Date created:         06.Sep.2000
 # Whom:                 Alexander@Leidinger.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	modlogan
 PORTVERSION=	0.8.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc www
 MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/ \
 		${MASTER_SITE_SOURCEFORGE}
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A modular log file analysis program
 
 LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns \
-		gd.4:${PORTSDIR}/graphics/gd2 \
+		gd.4:${PORTSDIR}/graphics/gd \
 		intl.4:${PORTSDIR}/devel/gettext \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		expat.4:${PORTSDIR}/textproc/expat2
 
 .if defined(WITH_MYSQL)
 # To quote the author:
 #  It is used by src/processor/telecom/... for a commercial project. The
 #  project itself is opensource but not documented.
 # Therefore no testing if it works is made in the FreeBSD port.
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .endif
 
 # Please don't remove the comments, as soon as autoconf/libtool get's
 # updated in the ports collection the comments may be removed.
 # They serve as a reminder.
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 #LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-ltdl-install=no --with-gd=${LOCALBASE}/include \
 		--program-transform-name=\'\'
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=--with-mysql
 .endif
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 
 MAN1=		modlogan.1
 DOC1=		faq.txt glosar manual.txt translations.txt \
 		using-plugins.txt writing-plugins.txt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:\@config_path\@:${PREFIX}/etc/modlogan:g' ${WRKSRC}/doc/modlogan.conf-dist.in
 
 #post-configure:
 #	${TOUCH} ${WRKSRC}/libltdl/config.status
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/modlogan
 .for i in ${DOC1}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/modlogan/${i}
 .endfor
 .endif
 	${MKDIR} ${PREFIX}/share/examples/modlogan
 .for i in footer.ihtml header.ihtml output.tmpl convert_history_to_07x.pl convert_to_055.pl convert_to_060.pl
 	@${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/examples/modlogan/${i}
 .endfor
 	@# remove .la
 	-${RM} ${PREFIX}/lib/libmla_*.la
 .for i in css conf def.conf
 	[ -f ${PREFIX}/etc/modlogan/modlogan.${i} ] || ${INSTALL_DATA} ${PREFIX}/etc/modlogan/modlogan.${i}-dist ${PREFIX}/etc/modlogan/modlogan.${i}
 .endfor
 
 .include 

Property changes on: head/textproc/modlogan/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.22
\ No newline at end of property
+1.23
\ No newline at end of property
Index: head/ukrainian/gd/Makefile
===================================================================
--- head/ukrainian/gd/Makefile	(revision 87213)
+++ head/ukrainian/gd/Makefile	(revision 87214)
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	uk-webalizer
 # Date created:		22 May 2001
 # Whom:			mike@LITech.lviv.ua
 #
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../../graphics/gd2
+MASTERDIR=	${.CURDIR}/../../graphics/gd
 CATEGORIES=	ukrainian
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	A graphics library for fast image creation with KOI8-U support
 
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/x11-fonts/geminifonts:fetch
 GD_FONTS=	${DISTDIR}/x-koi8u.tgz koi6x10.bdf koi6x13.bdf \
 		koi10x16b.bdf koi9x15.bdf koi10x20.bdf
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/ukrainian/gd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/www/analog/Makefile
===================================================================
--- head/www/analog/Makefile	(revision 87213)
+++ head/www/analog/Makefile	(revision 87214)
@@ -1,56 +1,57 @@
 # New ports collection makefile for: analog
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
 # $FreeBSD$
 #
 
 PORTNAME=	analog
 PORTVERSION=	5.32
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.analog.cx/ \
 		http://analog.planetmirror.com/ \
 		http://analog.gsp.com/ \
 		http://isr.ath.cx/analog/ \
 		http://analog.mirrors.ecodigit.com.br/ \
 		http://analog.org/loganalysis/ \
 		http://analog.techsell.ru/ \
 		http://sunsite.sut.ac.jp/pub/archives/WWW/analog/ \
 		ftp://ftp.polytechnic.edu.na/pub/analog/ \
 		http://analog.netsoc.ucd.ie/ \
 		http://analog.tzone.it/
 
 MAINTAINER=	mharo@FreeBSD.org
 COMMENT=	An extremely fast program for analysing WWW logfiles
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
 LIMGDIR?=	www/data/images
 IMGDIR=		${PREFIX}/${LIMGDIR}
 PLIST_SUB=	IMGDIR=${LIMGDIR}
 
 MAN1=		analog.1
 ALL_TARGET=	analog
 
 .include 
 
 do-install:
 	${MKDIR} ${PREFIX}/share/analog/lang
 	${MKDIR} ${IMGDIR}
 	${INSTALL_DATA} ${WRKSRC}/images/* ${IMGDIR}
 	${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/share/analog/lang
 	${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin
 .if !exists(${PREFIX}/etc/analog.cfg)
 	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${PREFIX}/etc
 .endif
 	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${PREFIX}/etc/analog.cfg-dist
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/analog
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/analog
 .endif
 	${INSTALL_MAN} ${WRKSRC}/analog.man ${PREFIX}/man/man1/analog.1
 
 .include 

Property changes on: head/www/analog/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.51
\ No newline at end of property
+1.52
\ No newline at end of property
Index: head/www/http-analyze/Makefile
===================================================================
--- head/www/http-analyze/Makefile	(revision 87213)
+++ head/www/http-analyze/Makefile	(revision 87214)
@@ -1,23 +1,23 @@
 # New ports collection makefile for: http-analyze
 # Date created:		Fri Jul 11 06:11:41 CEST 1997
 # Whom:			Andreas Klemm 
 #
 # $FreeBSD$
 
 PORTNAME=	http-analyze
 PORTVERSION=	2.01
 PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.rent-a-guru.de/pub/http-analyze2.01/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	todd@thisisa.com
 COMMENT=	A fast Log-Analyzer for web servers
 
 BUILD_DEPENDS=	gif2png:${PORTSDIR}/graphics/gif2png
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 MAN1=		http-analyze.1
 
 .include 

Property changes on: head/www/http-analyze/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.21
\ No newline at end of property
+1.22
\ No newline at end of property
Index: head/www/mgstat/Makefile
===================================================================
--- head/www/mgstat/Makefile	(revision 87213)
+++ head/www/mgstat/Makefile	(revision 87214)
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	mgstat
 # Date created:		11 May 2001
 # Whom:			jeh@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mgstat
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://wizard.ae.krakow.pl/~mike/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce graphs from mod_gzip log files
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 GNU_CONFIGURE=	yes
 
 MGDOCDIR=	${PREFIX}/share/doc/mgstat
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@if ! [ -d ${MGDOCDIR} ]; then ${MKDIR} ${MGDOCDIR}; fi
 	${INSTALL_DATA} ${WRKSRC}/Copyright ${MGDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${MGDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/USAGE ${MGDOCDIR}
 .endif
 
 .include 

Property changes on: head/www/mgstat/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/www/webalizer/Makefile
===================================================================
--- head/www/webalizer/Makefile	(revision 87213)
+++ head/www/webalizer/Makefile	(revision 87214)
@@ -1,100 +1,96 @@
 # New ports collection makefile for:	webalizer
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	webalizer
 PORTVERSION=	2.1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
 DISTNAME=	${PORTNAME}-2.01-10-src
 
 MAINTAINER?=	dinoex@FreeBSD.org
 COMMENT=	A web server log file analysis program
 
 .if !defined(LIB_DEPENDS)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/${GD_PORT}
-.if defined(WEBALIZER_WITH_GD2) 
-GD_PORT?=	graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
-.endif
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-GD_PORT?=	graphics/gd-nox11
 
 .if defined(BATCH)
 # no cosmetique spaces allowed
 WEBALIZER_LANG?=english
 .endif
 
 .include 
 
 CONFIGURE_ARGS+=	--enable-dns \
 			--with-etcdir=${PREFIX}/etc \
 			--with-gdlib=${PREFIX}/lib \
-			--with-gd=${PREFIX}/include/gd
+			--with-gd=${PREFIX}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
 CFLAGS+=	-DLINKLIST_MAX_STRING=256
 MAKE_ARGS+=	CFLAGS="${CFLAGS}"
 MAN1=		${PKGNAMEPREFIX}webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
 		README README.FIRST DNS.README country-codes.txt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src$//}
 PLIST_SUB+=	PKGNAMEPREFIX=${PKGNAMEPREFIX}
 SUPP_LANG=	catalan chinese croatian czech danish dutch english \
 		estonian finnish french galician german greek hungarian \
 		icelandic indonesian italian japanese korean latvian \
 		malay norwegian polish portuguese portuguese_brazil \
 		romanian romanian-iso-8859-2 russain serbian \
 		simplified_chinese slowak slovene spanish swedish \
 		turkish ukrainian
 
 .if defined(WEBALIZER_LANG)
 CONFIGURE_ARGS+=	--with-language=${WEBALIZER_LANG}
 .endif
 
 pre-configure:
 	@${MV} ${WRKSRC}/webalizer.1 ${WRKSRC}/webalizer.1.sed
 	${SED} -e "s=/etc=${PREFIX}/etc=" \
 		${WRKSRC}/webalizer.1.sed > ${WRKSRC}/webalizer.1
 	@${MV} ${WRKSRC}/webalizer.c ${WRKSRC}/webalizer.c.sed
 	${SED} -e "s=webalizer.conf=${PKGNAMEPREFIX}webalizer.conf=" \
 		${WRKSRC}/webalizer.c.sed > ${WRKSRC}/webalizer.c
 .if !defined(WEBALIZER_LANG)
 	@${ECHO_MSG} "You can customize the language by typing"
 	@${ECHO_MSG} "       make WEBALIZER_LANG="
 	@${ECHO_MSG} "where  is one of:"
 	@${ECHO_MSG} ${SUPP_LANG}
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/webalizer \
 		${PREFIX}/bin/${PKGNAMEPREFIX}webalizer
 	${LN} -sf ${PKGNAMEPREFIX}webalizer \
 		${PREFIX}/bin/${PKGNAMEPREFIX}webazolver
 	${INSTALL_DATA} ${WRKSRC}/sample.conf \
 		${PREFIX}/etc/${PKGNAMEPREFIX}webalizer.conf-dist ;
 
 post-install:
 .for i in ${MAN1}
 	${INSTALL_MAN} ${WRKSRC}/webalizer.1 ${PREFIX}/man/man1/${i}
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in ${DOC1}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .endfor
 	${MKDIR} ${EXAMPLESDIR}
 .for i in msfree.png sample.conf webalizer.png
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}/${i}
 .endfor
 .endif
 
 .include 

Property changes on: head/www/webalizer/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.42
\ No newline at end of property
+1.43
\ No newline at end of property