(1) Bump xlog version 1.5 to 2.0.4

(2) Add dependency on xdg-utils to browse manual (Help->Manual)
      DEPENDS+=       xdg-utils:../../misc/xdg-utils
(3) Add one include as pkglint wanted,
     .include "../../sysutils/desktop-file-utils/desktopdb.mk"
(4) remove patch-ab (doesn't seem to be necessary)
     patch-ab deletes following line
     -       -DGTK_DISABLE_DEPRECATED \

(ChangeLog extends 280 lines..)

- Changes for xlog version 2.0.4 - 2010/10/25
  * Upgrade to gettext-0.18.1.
  * 2 patches by Tom, DL1JBE for buffer overruns in logfile import and
    reading much bigger cty.dat files.
  * Fix some compilation warnings with gcc-4.4.5.
  * Correct the callsign lookup URL for qrz.com.
  * cty.dat updated to 20101025.

- Changes for xlog version 2.0.3 - 2009/07/17
  * xlog will now display an exit confirmation dialog whenever you want to
    exit the program.
  * This release fixes crashes when the function keys are used for the keyer.
    Thanks Jack, AK7O for reporting.
  * Remote logging now adds a "?:" string, which is used by eepkeyer written
    by Mike K6EEP, see http://www.hamsoftware.org. You will have to set
    "add data to QSO frame" in the first page of the preferences dialog.
    Eepkeyer now wil send one character at a time for the callsign, which
    can be used for dupe checking. Patch by Mike, K6EEP.
  * When bands are removed or added from the scoring window through "Settings
    -> Dialogs and Window", the scoring window will now get updated
    correctly. Reported by Ron, W6FM.
  * Dupe checking did not work when checking against other bands. This has
    been fixed.
  * A new tool has been added. When "Tools -> Find unknown countries" is
    selected, xlog will show a list of contacts for which DXCC lookup fails.
    You can then correct this by using a "DXCC-" string in the awards column.
  * There were several minor bugfixes.
  * cty.dat updated to cty-1912.

- Changes for xlog version 2.0.2 - 2009/06/10
  * This fixes distance and azimuth calculation for stations west of
    Greenwich. Thanks to Dana, AF7Z for reporting.
  * Changing the locator in the preferences dialog now correctly updates the
    corresponding latitude and longitude entries.
  * You might need to re-configure your location in the preferences dialog
    with this release.
  * cty.dat updated to cty-1909.

- Changes for xlog version 2.0.1 - 2009/02/23
  * Compiler flags have been fixed to avoid conflicts between different
    versions of GTK+ and GLIB.
  * Add a compilation fix for 64 bit architectures.
  * The desktop menu entry has been fixed.
  * The win32 version will now use the native windows fork function for
    displaying the handbook so the gui will not get blocked.
  * When Options -> Country Map is displayed for the first time, xlog will
    display a map if the awards or callsign fields are filled correctly.
    Reported by Larry, W4LK.
  * Using ctrl-k no longer unselects a possible selected QSO. This way you
    can update a logged QSO with the help of ctrl-k.
  * cty.dat updated to cty-1902.

- Changes for xlog version 2.0 - 2009/02/10
  * A fix has been added for displaying Help -> Keys from the menu.
  * Fixed a crash after creating a new log which already exists.
  * Fixed a crash which occurs when attempting to print when no log is open.
    Thanks Jean-Luc, F5IBH for reporting.
  * A map would sometimes not be updated when changing a QSO, fixed.
    Thanks Tom, DL1JBE for reporting.
  * This release fixes drawing of the locator map when a band is changed. This
    was reported by several people and tested by 4Z5ST, IK5PVX and CT1DRB.
  * WB5BKL has reported no QSO data when exporting to ADIF with number greater
    than 1 in the first QSO selection box, This has been fixed.
  * Callsign sorting and grouping now only works when exporting to TSV.
  * Make sure we do not include newlines and tabs when receiving remote data.
    Reported by Pierfrancesco, IK5PVX.
  * When exporting to cabrillo truncate frequency to kHz on shortwave and
    use the correct strings for UHF bands.
  * cty.dat has been updated to version 1901.
  * xlog now respect the --docdir switch from 'configure'. Patch by Tom DL1JBE.
  * Spanish translation updates by Jaime, EA4TV.
  * Portuguese translation updates by David, CT1DRB.
  * Swedish translations updated by Peter, SM4ABE.
  * German translations updated by Martin, DL5RMH.
  * Slovak updated by Mike, OM4AA.
  * French updated by Jean-Luc, F5IBH.
  * Polish updated by Boguslaw, SQ5TB.
  * Czech translations updated by Martin, OK1RR.
  * Italian updated by Luca Monducci of the Debian Italian Localization team.
  * Danish has been removed because it has been unmaintained for a long time.
  * A note has been added to the INSTALL file for people having trouble
    compiling xlog with language support on FreeBSD.
  * A first win32 binary release is distributed, which lacks the following:
    - There is no data exchange with other applications.
    - Printing has been disabled.
    - There is no keyer available.
    Reports are very welcome, especially about the hamlib functionality. I
    don't own a windows OS, the binary was tested on linux/wine, so YMMV.

- Changes for xlog version 1.9 - 2009/01/09
  * Czech translation updates by Martin, OK1RR.
  * cty.dat has been updated to version 1817.
  * When doing a TSV export, records can now be sorted by DXCC and callsign.
    Sorting by callsign is especially useful for printing multiple QSO's
    on one label when using glabels. Thanks Stephane, F8FCE.
    You can determine how many QSO's per label are printed by changing the
    TSV export settings in the Dialogs and Windows -> export page.
  * Patch by Jon, LA4RT so xlog can send latin-1 character to cwdaemon.
  * xlog can now extract the version of cty.dat, it will be displayed when
    showing the about dialog.
  * It is now possible to load logs by alphabet or by "last modification date",
    the setting for this is in the Logs page of the preferences dialog.
    Thanks Pierfrancesco Caci, IK5PVX for suggesting.
  * The print dialog now adds a page where you can decide what columns to
    print. Suggested by Ed, W3NR and Boris, 4Z5ST.
  * Ctrl-a is no longer used for adding a QSO. Instead, you should use ctrl-w
    (write to log). This means ctrl-a (select all) is available for selecting
    text in xlog's text entries. For closing a log, you now need to use
    ctrl-shift-w. Thanks Len, WT6G for the idea.
  * The documentation has been moved to /usr/local/share/doc/xlog. The glabels
    template has moved to /usr/local/share/doc/xlog/glabels.
  * Country maps have been added. Use Options->Country map to display it.
  * A button next to the callsign entry has been added. When clicked it will
    lookup the callsign with your internet browser on your preferred server.
    The settings for this server is on the Info page of the preferences dialog
    and takes the form http://www.qrz.com/<call>, where <call> will be replaced
    with the callsign. Suggested by Rob, KL7NA and Boris, 4Z5ST.
  * It is no longer possible to view scoring for an award when the scoring
    window is not active.
  * A new macro has been added to the keyer. '~' stands for the last exchange
    message received. It can be used in contests where you forward the last
    exchange. The initial message can be set in page 2 if the preferences
    dialog. For more information read the manual. Thanks Jon, LA4RT for the
    initial patch.

- Changes for xlog version 1.8.1 - 2008/09/01
  * This fixes the use of the ctrl+k key and fixes the use of defaults.

- Changes for xlog version 1.8 - 2008/08/28
  * XML is no longer used for saving and recalling preferences. The new config
    file is xlog.cfg which is placed in $HOME/.xlog and uses the GKeyFile
    format. So you will need to reconfigure xlog.
  * The Control-Shift-A key combination has been replace by Control-space,
    which is easier to use.
  * Printing has changed, xlog now uses native GTK+ printing instead of the
    libgnomeprint libraries. This means there now is a separate dialog for
    "Page Setup" and "Print" under the Log menu. "Page Setup" allows you to
    choose landscape or portrait for the printed log, the default being
    portrait. When choosing print, you can select a printer or print to a
    pdf / postscript document.
  * Selecting of columns for printing has been removed. You should choose
    portrait or landscape in the "Page Setup" dialog and a suitable
    magnification in the "Print" dialog to make sure your log fits on paper.
  * Extra columns for contests have been removed in the printed log. Most
    contest admins will accept cabrillo logs anyway.
  * xlog now uses a fixed 12 points lettertype for printing.
  * xlog now prints the logname and the printdate in the footer.
  * When selecting Edit->Find or ctrl+f and a find dialog is already open,
    xlog now will focus this dialog instead if bringing up a second one.
  * The search dialog has been redesigned. You can now search for a callsign
    in the callsign field or search for a string in any of the other fields.
    You can also search in the current log or all of the open logs.
    The dialog will be kept open until the Close button is clicked.
  * Ctrl+6 or "Tools->Awards->Locator" will now show a list of maidenhead
    locators worked and confirmed on different bands. You will need to enable
    locator scoring in the "Settings->Dialogs and Windows" scoring page for
    this to work.
  * Ctrl+7 will draw a world map with locators as colored squares.
    Worked squares are red, confirmed squares green. You can select the band
    you want to see scoring for. The locator is shown as a tooltip when you
    move your mouse over the map.
  * Editest fixes by Stephane: a fix to the editest date reading and ability
    to retrieve band freq for that log format.
  * The import dialog now adds the possibility to import into the current log.
    After import all columns in the log are enabled and you should use the
    log-editor the show/hide columns. The log may also need sorting.
    Suggested by David Quental, CT1DRB.
  * Import now uses the GtkAssistant widget in which the user is guided
    through the import process.
  * Adif fixes for conversion from band to frequency higher than 28 MHz.
  * Handling of the keyer has changed. In CQ mode, after the CQTU entry is
    sent, the QSO is automatically added to the log. Likewise, in S&P mode
    the QSO is added after S&PTU is sent. Suggested by Al, NH7O.
  * Portuguese translations by David, CT1DRB.
  * Italian translations by Carlo Dormeletti, I-3929.
  * Polish by Boguslaw Ciastek, SQ5TB updated.
  * Fixed a crash when receiving remote data and no log open. Reported by
    Joshua, KC0BUF.
  * xlog now uses the latest CTY.DAT revision (CTY-1808).

- Changes for xlog version 1.7 - 2008/01/30
  * Scroll to the last QSO when the log is automatically loaded and there
    are more than 1000 QSO's. Thanks Jon LA4RT for reporting.
  * Display of the about dialog has been fixed.
  * TSV export for glabels has been fixed. The exported columns did not match
    the ones in the 'Settings->Dialogs and Windows->export' setting.
    Reported by John, K3GHH.
  * We no longer use tiny fonts for the remarks entry and when importing
    logs. It is easier in the eyes. Reported by Hein, PA0NQ.
  * The info page of the preferences dialog now updates QRA locator when
    latitude/longitude is changed and vice-versa.
  * Xlog now uses the functions provided by hamlib for calculating distance
    and bearing.
  * The old behaviour has been restored when a DXCC country has been confirmed,
    country worked count will be set to "0".
  * The same behaviour has been added for all the other awards, so if a
    country has been confirmed, the count is set to zero. Otherwise, the number
    of countries will be displayed.
  * A new key combination has been added, Control-Shift-A will add a QSO and
    fill in defaults for the next QSO. It is the same as using Control-a
    followed by Control-k. This is especially useful in contests. Requested
    by Dominique, HB9HLI.
  * The following changes by Stephane Fillod, F8CFE:
  * WAS, WAZ, IOTA and locator scoring have been added.
  * Xlog now knows how to import IOTA contest logs and fills in the AWARDS
    field.
  * It does work also with any ARRL contest where the state is exchanged.
  * EDI import is now capable of filling in BAND and POWER fields.
  * EDI import fixed when importing utf-8 dates.
  * EDI export: take into account the change of wwl() logic.
  * EDI export properly generates CRLF eol (according to official format).

- Changes for xlog version 1.6.2 - 2007/12/03
  * Because of using the old wwl code, locator distance calculation stopped
    working. This has been fixed. Thanks to Stephane for the patch!

- Changes for xlog version 1.6.1 - 2007/11/28
  * Compilation fixes.
  * Fix appearance of the scoring window. Thanks to flavio, IK3OCD and
    Boris, 4Z5ST for reporting.
  * Fix power retrieval from the rig. Thanks Pat, KB8PYM and Martin, AA6E
    for the report.
  * Some fixes for EDI and EDITEST file format, patch by Stephane, F8CFE.
  * Some changes to the S-meter coding which will hopefully make it more
    accurate.
  * If there is no communication with the rig, hamlib will be stopped and
    a warning dialog will be shown.
  * The wac scoring is now updated correctly when a log is closed.
  * Country worked count would be set to "0" whenever you would have at
    least one confirmed QSO with that country. Patch by Stephane.
  * When using the bandoptionmenu the band would sometimes be truncated.
  * WAC scoring will now get updated when importing a log.
  * Include the old wwl code again because of license problems with the new
    code.
  * All of xlog is now GPL version 3.

- Changes for xlog version 1.6 - 2007/11/05
  * Swedish translation updates by Peter, SM4ABE
  * The "worked before" window is now activated with "Control+Shift w".
  * There was a small bugfix for the "worked before" window. Selection of
    QSO's in this window would sometimes fail when several contacts with the
    same callsign were displayed.
  * German translation thanks to Martin, DL5RMH.
  * Defaults now also work when the band- and modeoptionmenus are activated
    in the QSO frame. Thanks to DL5MRH.
  * The UTC time length now is truncated to HHMM (the default for xlog), even
    if the log displays time in seconds.
  * Time length is not touched when updating a QSO if hours and minutes
    are the same. Both changes suggested by Martin, DL5RMH.
  * Frequency is not touched when using "update" when the frequency is
    the same as used in the optionmenu. For example: if the optionmenu uses
    "7" and the frequency in the log says "7.030" we don't change it when
    using "update". Suggested by Martin, DL5RMH.
  * The FAQ has been removed and integrated with the manual.
  * The manual has been rewritten and is now available as html, see
    /usr[/local]/share/xlog/manual/index.html.
  * xlog now uses xdg-open (available from the xdg-utils package) for opening
    URL's and for reading the manual from the menu. xdg-open always uses the
    default browser as configured for your gnome, kde or xfce desktop.
  * xdg-email is used for opening "mailto:" links, this is only important for
    the about dialog.
  * A small fix for Cabrillo, so we correctly export USB contacts. Thanks
    Jacob Anawalt, KD7YKO.
  * A Cabrillo import fix for NAQP contests by Jacob, KD7YKO.
  * Another fix from Jacob which fixes a crash when using large remarks
    fields.
  * xlog has been ported to the latest GTK+ version, which is 2.12.0.
  * The keyer window is now prevented from resizing when the end of line is
    reached. Thanks Al, NH7O for reporting.
  * WAC (Worked All Continents) award scoring has been added. You will have
    to enable it from the Settings -> 'Dialogs and Windows' -> Scoring page.
    This adds a new valid entry for the AWARDS entry. You can use "WAC-"
    to modify a continent lookup. Valid strings are "NA EU SA OC AS AF".
    For example, UA9A callsign are located in Europe, but xlog will think
    it is Asia. Just add "DXCC-EU" to the AWARDS column.
  * An overview of your WAC scoring can be seen by selecting Tools ->
    Awards -> WAC from the menu. Ctrl + 2 is a shortcut for this.
  * xlog will now recognise K1-K0 and VK1-VK0 callsign districts.
  * When importing a cabrillo file, a remark can be added to all of the log
    fields by entering a value in the import dialog.
  * Adopted the wwl rewrite by Diane, VA3DB.

- Changes for xlog version 1.5 - 2007/01/30
  (.. deleted, as previous version .. )

4 files changed, 427 insertions, 52 deletions

diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index dd196ba1b7d..f01815f330d 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.36 2010/11/15 22:57:31 abs Exp $
+# $NetBSD: Makefile,v 1.37 2010/12/25 13:39:54 mef Exp $
 #
 
-DISTNAME=	xlog-1.5
-PKGREVISION=	9
+DISTNAME=	xlog-2.0.4
 CATEGORIES=	ham
-MASTER_SITES=	http://www.qsl.net/pg4i/download/
+MASTER_SITES=	http://download.savannah.gnu.org/releases/xlog/
 
 MAINTAINER=	wulf@NetBSD.org
-HOMEPAGE=	http://www.qsl.net/pg4i/linux/xlog.html
+HOMEPAGE=	http://www.nongnu.org/xlog/
 COMMENT=	Amateur Radio logging program
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -15,6 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_PKGLOCALEDIR=yes
 USE_TOOLS+=	gmake pkg-config
+DEPENDS+=	xdg-utils:../../misc/xdg-utils
 
 CONFIGURE_ARGS+=	--enable-hamlib
 
@@ -23,4 +23,5 @@ CONFIGURE_ARGS+=	--enable-hamlib
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/xlog/PLIST b/ham/xlog/PLIST
index 3f93a08f523..a7d47b550a8 100644
--- a/ham/xlog/PLIST
+++ b/ham/xlog/PLIST
@@ -1,18 +1,90 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:00:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2010/12/25 13:39:54 mef Exp $
 bin/xlog
 man/man1/xlog.1
 share/applications/xlog.desktop
+share/doc/xlog/AUTHORS
+share/doc/xlog/BUGS
+share/doc/xlog/ChangeLog
+share/doc/xlog/KEYS
+share/doc/xlog/TODO
+share/doc/xlog/glabels/qsllabels.glabels
+share/doc/xlog/manual/img1.png
+share/doc/xlog/manual/index.html
+share/doc/xlog/manual/manual.css
+share/doc/xlog/manual/manual.html
+share/doc/xlog/manual/next.png
+share/doc/xlog/manual/next_g.png
+share/doc/xlog/manual/node1.html
+share/doc/xlog/manual/node10.html
+share/doc/xlog/manual/node11.html
+share/doc/xlog/manual/node12.html
+share/doc/xlog/manual/node13.html
+share/doc/xlog/manual/node14.html
+share/doc/xlog/manual/node15.html
+share/doc/xlog/manual/node16.html
+share/doc/xlog/manual/node17.html
+share/doc/xlog/manual/node18.html
+share/doc/xlog/manual/node19.html
+share/doc/xlog/manual/node2.html
+share/doc/xlog/manual/node20.html
+share/doc/xlog/manual/node21.html
+share/doc/xlog/manual/node22.html
+share/doc/xlog/manual/node23.html
+share/doc/xlog/manual/node24.html
+share/doc/xlog/manual/node25.html
+share/doc/xlog/manual/node26.html
+share/doc/xlog/manual/node27.html
+share/doc/xlog/manual/node28.html
+share/doc/xlog/manual/node29.html
+share/doc/xlog/manual/node3.html
+share/doc/xlog/manual/node30.html
+share/doc/xlog/manual/node31.html
+share/doc/xlog/manual/node32.html
+share/doc/xlog/manual/node33.html
+share/doc/xlog/manual/node34.html
+share/doc/xlog/manual/node35.html
+share/doc/xlog/manual/node4.html
+share/doc/xlog/manual/node5.html
+share/doc/xlog/manual/node6.html
+share/doc/xlog/manual/node7.html
+share/doc/xlog/manual/node8.html
+share/doc/xlog/manual/node9.html
+share/doc/xlog/manual/prev.png
+share/doc/xlog/manual/prev_g.png
+share/doc/xlog/manual/up.png
+share/doc/xlog/manual/up_g.png
+share/doc/xlog/manual/xlog-defaultsdialog.png
+share/doc/xlog/manual/xlog-dupecheckdialog.png
+share/doc/xlog/manual/xlog-exportsettings.png
+share/doc/xlog/manual/xlog-importdialog.png
+share/doc/xlog/manual/xlog-keyerwindow.png
+share/doc/xlog/manual/xlog-logeditor.png
+share/doc/xlog/manual/xlog-mainwindow.png
+share/doc/xlog/manual/xlog-mergelogdialog.png
+share/doc/xlog/manual/xlog-newlogdialog.png
+share/doc/xlog/manual/xlog-pagesetupdialog.png
+share/doc/xlog/manual/xlog-preferencesdialog-general.png
+share/doc/xlog/manual/xlog-preferencesdialog-hamlib.png
+share/doc/xlog/manual/xlog-preferencesdialog-info.png
+share/doc/xlog/manual/xlog-preferencesdialog-logs.png
+share/doc/xlog/manual/xlog-printdialog.png
+share/doc/xlog/manual/xlog-scorewindow.png
+share/doc/xlog/manual/xlog-searchdialog.png
+share/doc/xlog/manual/xlog-workedwindow.png
+share/icons/gnome-mime-text-x-xlog.png
+share/icons/xlog-icon.png
 share/locale/cs/LC_MESSAGES/xlog.mo
-share/locale/da/LC_MESSAGES/xlog.mo
+share/locale/de/LC_MESSAGES/xlog.mo
 share/locale/es/LC_MESSAGES/xlog.mo
 share/locale/fr/LC_MESSAGES/xlog.mo
+share/locale/it/LC_MESSAGES/xlog.mo
 share/locale/nl/LC_MESSAGES/xlog.mo
 share/locale/pl/LC_MESSAGES/xlog.mo
+share/locale/pt/LC_MESSAGES/xlog.mo
 share/locale/sk/LC_MESSAGES/xlog.mo
 share/locale/sv/LC_MESSAGES/xlog.mo
 share/mime/packages/xlog.xml
-share/pixmaps/gnome-mime-text-x-xlog.png
-share/pixmaps/xlog-icon.png
+share/pixmaps/xlog/countrymap.png
 share/pixmaps/xlog/cwdaemon.png
 share/pixmaps/xlog/gnome-mime-text-x-xlog.png
 share/pixmaps/xlog/jigsaw.png
@@ -34,33 +106,348 @@ share/pixmaps/xlog/s9.xpm
 share/pixmaps/xlog/xlog-b4.png
 share/pixmaps/xlog/xlog-icon.png
 share/pixmaps/xlog/xlog-keyer.png
+share/pixmaps/xlog/xlog-map.png
 share/pixmaps/xlog/xlog-scoring.png
 share/pixmaps/xlog/xlog.png
+share/pixmaps/xlog/xlog.svg
 share/pixmaps/xlog/xlog.xpm
-share/xlog/AUTHORS
-share/xlog/BUGS
-share/xlog/ChangeLog
-share/xlog/FAQ
-share/xlog/KEYS
-share/xlog/MANUAL
-share/xlog/THANKS
-share/xlog/TODO
+share/xlog/dxcc/area.dat
 share/xlog/dxcc/cty.dat
-share/xlog/images/xlog-defaultsdialog.png
-share/xlog/images/xlog-dupecheckdialog.png
-share/xlog/images/xlog-exportdialog.png
-share/xlog/images/xlog-importdialog.png
-share/xlog/images/xlog-keyerwindow.png
-share/xlog/images/xlog-logeditor.png
-share/xlog/images/xlog-mainwindow.png
-share/xlog/images/xlog-mergelogdialog.png
-share/xlog/images/xlog-newlogdialog.png
-share/xlog/images/xlog-openlogdialog.png
-share/xlog/images/xlog-preferencesdialog-general.png
-share/xlog/images/xlog-preferencesdialog-hamlib.png
-share/xlog/images/xlog-preferencesdialog-info.png
-share/xlog/images/xlog-preferencesdialog-logs.png
-share/xlog/images/xlog-printdialog.png
-share/xlog/images/xlog-scorewindow.png
-share/xlog/images/xlog-workedwindow.png
-share/xlog/qsllabels.glabels
+share/xlog/maps/1S.png
+share/xlog/maps/3A.png
+share/xlog/maps/3B6.png
+share/xlog/maps/3B8.png
+share/xlog/maps/3B9.png
+share/xlog/maps/3C.png
+share/xlog/maps/3C0.png
+share/xlog/maps/3D2.png
+share/xlog/maps/3D2/c.png
+share/xlog/maps/3D2/r.png
+share/xlog/maps/3DA.png
+share/xlog/maps/3V.png
+share/xlog/maps/3W.png
+share/xlog/maps/3X.png
+share/xlog/maps/3Y/b.png
+share/xlog/maps/3Y/p.png
+share/xlog/maps/4J.png
+share/xlog/maps/4L.png
+share/xlog/maps/4O.png
+share/xlog/maps/4S.png
+share/xlog/maps/4U1I.png
+share/xlog/maps/4U1U.png
+share/xlog/maps/4W.png
+share/xlog/maps/4X.png
+share/xlog/maps/5A.png
+share/xlog/maps/5B.png
+share/xlog/maps/5H.png
+share/xlog/maps/5N.png
+share/xlog/maps/5R.png
+share/xlog/maps/5T.png
+share/xlog/maps/5U.png
+share/xlog/maps/5V.png
+share/xlog/maps/5W.png
+share/xlog/maps/5X.png
+share/xlog/maps/5Z.png
+share/xlog/maps/6W.png
+share/xlog/maps/6Y.png
+share/xlog/maps/7O.png
+share/xlog/maps/7P.png
+share/xlog/maps/7Q.png
+share/xlog/maps/7X.png
+share/xlog/maps/8P.png
+share/xlog/maps/8Q.png
+share/xlog/maps/8R.png
+share/xlog/maps/9A.png
+share/xlog/maps/9G.png
+share/xlog/maps/9H.png
+share/xlog/maps/9J.png
+share/xlog/maps/9K.png
+share/xlog/maps/9L.png
+share/xlog/maps/9M2.png
+share/xlog/maps/9M6.png
+share/xlog/maps/9N.png
+share/xlog/maps/9Q.png
+share/xlog/maps/9U.png
+share/xlog/maps/9V.png
+share/xlog/maps/9X.png
+share/xlog/maps/9Y.png
+share/xlog/maps/A2.png
+share/xlog/maps/A3.png
+share/xlog/maps/A4.png
+share/xlog/maps/A5.png
+share/xlog/maps/A6.png
+share/xlog/maps/A7.png
+share/xlog/maps/A9.png
+share/xlog/maps/AP.png
+share/xlog/maps/BS7.png
+share/xlog/maps/BV.png
+share/xlog/maps/BV9P.png
+share/xlog/maps/BY.png
+share/xlog/maps/C2.png
+share/xlog/maps/C3.png
+share/xlog/maps/C5.png
+share/xlog/maps/C6.png
+share/xlog/maps/C9.png
+share/xlog/maps/CE.png
+share/xlog/maps/CE0X.png
+share/xlog/maps/CE0Y.png
+share/xlog/maps/CE0Z.png
+share/xlog/maps/CE9.png
+share/xlog/maps/CM.png
+share/xlog/maps/CN.png
+share/xlog/maps/CP.png
+share/xlog/maps/CT.png
+share/xlog/maps/CT3.png
+share/xlog/maps/CU.png
+share/xlog/maps/CX.png
+share/xlog/maps/CY0.png
+share/xlog/maps/CY9.png
+share/xlog/maps/D2.png
+share/xlog/maps/D4.png
+share/xlog/maps/D6.png
+share/xlog/maps/DL.png
+share/xlog/maps/DU.png
+share/xlog/maps/E3.png
+share/xlog/maps/E4.png
+share/xlog/maps/E5/n.png
+share/xlog/maps/E5/s.png
+share/xlog/maps/E7.png
+share/xlog/maps/EA.png
+share/xlog/maps/EA6.png
+share/xlog/maps/EA8.png
+share/xlog/maps/EA9.png
+share/xlog/maps/EI.png
+share/xlog/maps/EK.png
+share/xlog/maps/EL.png
+share/xlog/maps/EP.png
+share/xlog/maps/ER.png
+share/xlog/maps/ES.png
+share/xlog/maps/ET.png
+share/xlog/maps/EU.png
+share/xlog/maps/EX.png
+share/xlog/maps/EY.png
+share/xlog/maps/EZ.png
+share/xlog/maps/F.png
+share/xlog/maps/FG.png
+share/xlog/maps/FH.png
+share/xlog/maps/FJ.png
+share/xlog/maps/FK.png
+share/xlog/maps/FK/c.png
+share/xlog/maps/FM.png
+share/xlog/maps/FO.png
+share/xlog/maps/FO/a.png
+share/xlog/maps/FO/c.png
+share/xlog/maps/FO/m.png
+share/xlog/maps/FP.png
+share/xlog/maps/FR.png
+share/xlog/maps/FR/g.png
+share/xlog/maps/FR/j.png
+share/xlog/maps/FR/t.png
+share/xlog/maps/FS.png
+share/xlog/maps/FT5W.png
+share/xlog/maps/FT5X.png
+share/xlog/maps/FT5Z.png
+share/xlog/maps/FW.png
+share/xlog/maps/FY.png
+share/xlog/maps/G.png
+share/xlog/maps/GD.png
+share/xlog/maps/GI.png
+share/xlog/maps/GJ.png
+share/xlog/maps/GM.png
+share/xlog/maps/GU.png
+share/xlog/maps/GW.png
+share/xlog/maps/H4.png
+share/xlog/maps/H40.png
+share/xlog/maps/HA.png
+share/xlog/maps/HB.png
+share/xlog/maps/HB0.png
+share/xlog/maps/HC.png
+share/xlog/maps/HC8.png
+share/xlog/maps/HH.png
+share/xlog/maps/HI.png
+share/xlog/maps/HK.png
+share/xlog/maps/HK0/a.png
+share/xlog/maps/HK0/m.png
+share/xlog/maps/HL.png
+share/xlog/maps/HM.png
+share/xlog/maps/HP.png
+share/xlog/maps/HR.png
+share/xlog/maps/HS.png
+share/xlog/maps/HV.png
+share/xlog/maps/HZ.png
+share/xlog/maps/I.png
+share/xlog/maps/IS.png
+share/xlog/maps/J2.png
+share/xlog/maps/J3.png
+share/xlog/maps/J5.png
+share/xlog/maps/J6.png
+share/xlog/maps/J7.png
+share/xlog/maps/J8.png
+share/xlog/maps/JA.png
+share/xlog/maps/JD/m.png
+share/xlog/maps/JD/o.png
+share/xlog/maps/JT.png
+share/xlog/maps/JW.png
+share/xlog/maps/JX.png
+share/xlog/maps/JY.png
+share/xlog/maps/K.png
+share/xlog/maps/KG4.png
+share/xlog/maps/KH0.png
+share/xlog/maps/KH1.png
+share/xlog/maps/KH2.png
+share/xlog/maps/KH3.png
+share/xlog/maps/KH4.png
+share/xlog/maps/KH5.png
+share/xlog/maps/KH5K.png
+share/xlog/maps/KH6.png
+share/xlog/maps/KH7K.png
+share/xlog/maps/KH8.png
+share/xlog/maps/KH8/s.png
+share/xlog/maps/KH9.png
+share/xlog/maps/KL.png
+share/xlog/maps/KP1.png
+share/xlog/maps/KP2.png
+share/xlog/maps/KP4.png
+share/xlog/maps/KP5.png
+share/xlog/maps/LA.png
+share/xlog/maps/LU.png
+share/xlog/maps/LX.png
+share/xlog/maps/LY.png
+share/xlog/maps/LZ.png
+share/xlog/maps/OA.png
+share/xlog/maps/OD.png
+share/xlog/maps/OE.png
+share/xlog/maps/OH.png
+share/xlog/maps/OH0.png
+share/xlog/maps/OJ0.png
+share/xlog/maps/OK.png
+share/xlog/maps/OM.png
+share/xlog/maps/ON.png
+share/xlog/maps/OX.png
+share/xlog/maps/OY.png
+share/xlog/maps/OZ.png
+share/xlog/maps/P2.png
+share/xlog/maps/P4.png
+share/xlog/maps/PA.png
+share/xlog/maps/PJ2.png
+share/xlog/maps/PJ7.png
+share/xlog/maps/PY.png
+share/xlog/maps/PY0F.png
+share/xlog/maps/PY0S.png
+share/xlog/maps/PY0T.png
+share/xlog/maps/PZ.png
+share/xlog/maps/R1FJ.png
+share/xlog/maps/R1MV.png
+share/xlog/maps/S0.png
+share/xlog/maps/S2.png
+share/xlog/maps/S5.png
+share/xlog/maps/S7.png
+share/xlog/maps/S9.png
+share/xlog/maps/SM.png
+share/xlog/maps/SP.png
+share/xlog/maps/ST.png
+share/xlog/maps/SU.png
+share/xlog/maps/SV.png
+share/xlog/maps/SV/a.png
+share/xlog/maps/SV5.png
+share/xlog/maps/SV9.png
+share/xlog/maps/T2.png
+share/xlog/maps/T30.png
+share/xlog/maps/T31.png
+share/xlog/maps/T32.png
+share/xlog/maps/T33.png
+share/xlog/maps/T5.png
+share/xlog/maps/T7.png
+share/xlog/maps/T8.png
+share/xlog/maps/TA.png
+share/xlog/maps/TF.png
+share/xlog/maps/TG.png
+share/xlog/maps/TI.png
+share/xlog/maps/TI9.png
+share/xlog/maps/TJ.png
+share/xlog/maps/TK.png
+share/xlog/maps/TL.png
+share/xlog/maps/TN.png
+share/xlog/maps/TR.png
+share/xlog/maps/TT.png
+share/xlog/maps/TU.png
+share/xlog/maps/TY.png
+share/xlog/maps/TZ.png
+share/xlog/maps/UA.png
+share/xlog/maps/UA2.png
+share/xlog/maps/UA9.png
+share/xlog/maps/UK.png
+share/xlog/maps/UN.png
+share/xlog/maps/UR.png
+share/xlog/maps/V2.png
+share/xlog/maps/V3.png
+share/xlog/maps/V4.png
+share/xlog/maps/V5.png
+share/xlog/maps/V6.png
+share/xlog/maps/V7.png
+share/xlog/maps/V8.png
+share/xlog/maps/VE.png
+share/xlog/maps/VK.png
+share/xlog/maps/VK0H.png
+share/xlog/maps/VK0M.png
+share/xlog/maps/VK9C.png
+share/xlog/maps/VK9L.png
+share/xlog/maps/VK9M.png
+share/xlog/maps/VK9N.png
+share/xlog/maps/VK9W.png
+share/xlog/maps/VK9X.png
+share/xlog/maps/VP2E.png
+share/xlog/maps/VP2M.png
+share/xlog/maps/VP2V.png
+share/xlog/maps/VP5.png
+share/xlog/maps/VP6.png
+share/xlog/maps/VP6/d.png
+share/xlog/maps/VP8.png
+share/xlog/maps/VP8/g.png
+share/xlog/maps/VP8/h.png
+share/xlog/maps/VP8/o.png
+share/xlog/maps/VP8/s.png
+share/xlog/maps/VP9.png
+share/xlog/maps/VQ9.png
+share/xlog/maps/VR.png
+share/xlog/maps/VU.png
+share/xlog/maps/VU4.png
+share/xlog/maps/VU7.png
+share/xlog/maps/XE.png
+share/xlog/maps/XF4.png
+share/xlog/maps/XT.png
+share/xlog/maps/XU.png
+share/xlog/maps/XW.png
+share/xlog/maps/XX9.png
+share/xlog/maps/XZ.png
+share/xlog/maps/YA.png
+share/xlog/maps/YB.png
+share/xlog/maps/YI.png
+share/xlog/maps/YJ.png
+share/xlog/maps/YK.png
+share/xlog/maps/YL.png
+share/xlog/maps/YN.png
+share/xlog/maps/YO.png
+share/xlog/maps/YS.png
+share/xlog/maps/YU.png
+share/xlog/maps/YV.png
+share/xlog/maps/YV0.png
+share/xlog/maps/Z2.png
+share/xlog/maps/Z3.png
+share/xlog/maps/ZA.png
+share/xlog/maps/ZB.png
+share/xlog/maps/ZC4.png
+share/xlog/maps/ZD7.png
+share/xlog/maps/ZD8.png
+share/xlog/maps/ZD9.png
+share/xlog/maps/ZF.png
+share/xlog/maps/ZK2.png
+share/xlog/maps/ZK3.png
+share/xlog/maps/ZL.png
+share/xlog/maps/ZL7.png
+share/xlog/maps/ZL8.png
+share/xlog/maps/ZL9.png
+share/xlog/maps/ZP.png
+share/xlog/maps/ZS.png
+share/xlog/maps/ZS8.png
+share/xlog/maps/worldmap.jpg
diff --git a/ham/xlog/distinfo b/ham/xlog/distinfo
index 47b0d658a21..9417ff59476 100644
--- a/ham/xlog/distinfo
+++ b/ham/xlog/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2007/10/05 22:57:04 joerg Exp $
+$NetBSD: distinfo,v 1.13 2010/12/25 13:39:54 mef Exp $
 
-SHA1 (xlog-1.5.tar.gz) = bb86f7e2784c3937c04c171fc9dad36af6b591c7
-RMD160 (xlog-1.5.tar.gz) = 05338f71ff090117fc30cca460ee699f9107daa6
-Size (xlog-1.5.tar.gz) = 866421 bytes
+SHA1 (xlog-2.0.4.tar.gz) = 48ef247e09abbc194361dd6c8fee666e947b82dd
+RMD160 (xlog-2.0.4.tar.gz) = 16ceebc75a3c5b993db9da77eda3ffad9b8fc484
+Size (xlog-2.0.4.tar.gz) = 11146213 bytes
 SHA1 (patch-aa) = ae23e56971d16454791dca298756c65654bfc961
-SHA1 (patch-ab) = c527586cb227c5953e6dfe87edcbfd4ebc030d09
diff --git a/ham/xlog/patches/patch-ab b/ham/xlog/patches/patch-ab
deleted file mode 100644
index c8d482a2373..00000000000
--- a/ham/xlog/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/10/05 22:57:04 joerg Exp $
-
---- src/Makefile.in.orig	2007-10-05 22:06:11.000000000 +0000
-+++ src/Makefile.in
-@@ -231,7 +231,6 @@ INCLUDES = \
- 	-DG_DISABLE_DEPRECATED \
- 	-DGDK_DISABLE_DEPRECATED \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED \
--	-DGTK_DISABLE_DEPRECATED \
- 	-DDATADIR=\""$(datadir)"\" \
- 	-DXLOG_LOCALEDIR=\""$(datadir)/locale"\" \
- 	-DXLOG_DATADIR=\""$(datadir)/xlog"\"