From Jan.Stocker@t-online.de  Mon Apr  8 08:50:21 2002
Return-Path: <Jan.Stocker@t-online.de>
Received: from twoflower.liebende.de (pD9507F67.dip.t-dialin.net [217.80.127.103])
	by hub.freebsd.org (Postfix) with ESMTP id 5B7E237B404
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  8 Apr 2002 08:50:14 -0700 (PDT)
Received: from twoflower (localhost [127.0.0.1])
	by twoflower.liebende.de (8.12.2/8.12.2) with ESMTP id g38Fmd20000476;
	Mon, 8 Apr 2002 17:48:39 +0200 (CEST)
	(envelope-from Jan.Stocker@t-online.de)
Received: (from root@localhost)
	by twoflower (8.12.2/8.12.2/Submit) id g38Fmd1d000475;
	Mon, 8 Apr 2002 17:48:39 +0200 (CEST)
Message-Id: <200204081548.g38Fmd1d000475@twoflower>
Date: Mon, 8 Apr 2002 17:48:39 +0200 (CEST)
From: Jan Stocker <Jan.Stocker@t-online.de>
Reply-To: Jan Stocker <Jan.Stocker@t-online.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: "Jan.Stocker" <Jan.Stocker@t-online.de>
Subject: nethack3-gnome missing gnome includes / library
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         36880
>Category:       ports
>Synopsis:       nethack3-gnome missing gnome includes / library
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 08 09:00:04 PDT 2002
>Closed-Date:    Wed May 15 05:04:16 JST 2002
>Last-Modified:  Wed May 15 05:04:16 JST 2002
>Originator:     Jan Stocker
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
>Description:
Compilation failed 
	a) missing gnome header (gnome.h)
	b) no defined dependency to libkpathsea but linking it 

>How-To-Repeat:
	cd /usr/ports/games/nethack3-gnome
	make
>Fix:
	a) adding new include prefix (.../gnome-1.0)
	b) removing kpathsea and popt, adding libgnugetopt as dependency and
           link option
	c) Updating to new 3.4.0 version

diff -u -r -P nethack3-gnome.orig/Makefile nethack3-gnome/Makefile
--- nethack3-gnome.orig/Makefile	Sun Mar 31 15:00:43 2002
+++ nethack3-gnome/Makefile	Fri Apr  5 20:21:43 2002
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	nethack
-PORTVERSION=	3.3.1
+PORTVERSION=	3.4.0
 CATEGORIES=	games gnome
-MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh331/src/
+MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh340/src/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-gnome
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -21,6 +21,8 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
+
+LIB_DEPENDS=    gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
diff -u -r -P nethack3-gnome.orig/distinfo nethack3-gnome/distinfo
--- nethack3-gnome.orig/distinfo	Wed Dec 12 05:24:01 2001
+++ nethack3-gnome/distinfo	Fri Apr  5 19:56:25 2002
@@ -1 +1 @@
-MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2
+MD5 (nethack-340.tgz) = 0093f14fbbe449d5b188bfb6aa4eae4f
diff -u -r -P nethack3-gnome.orig/files/patch-include::config.h nethack3-gnome/files/patch-include::config.h
--- nethack3-gnome.orig/files/patch-include::config.h	Wed Dec 12 05:24:01 2001
+++ nethack3-gnome/files/patch-include::config.h	Fri Apr  5 19:56:25 2002
@@ -1,24 +1,24 @@
-*** include/config.h.orig	Sat Jul 22 03:13:51 2000
---- include/config.h	Sat Dec  9 13:31:34 2000
+*** include/config.h.orig	Thu Mar 21 00:42:43 2002
+--- include/config.h	Sun Mar 31 14:38:32 2002
 ***************
 *** 45,51 ****
   #define TTY_GRAPHICS	/* good old tty based graphics */
   /* #define X11_GRAPHICS */	/* X11 interface */
   /* #define QT_GRAPHICS */	/* Qt interface */
 ! /* #define GNOME_GRAPHICS */	/* Gnome interface */
+  /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
   
   /*
-   * Define the default window system.  This should be one that is compiled
 --- 45,51 ----
   #define TTY_GRAPHICS	/* good old tty based graphics */
   /* #define X11_GRAPHICS */	/* X11 interface */
   /* #define QT_GRAPHICS */	/* Qt interface */
-! #define GNOME_GRAPHICS 	/* Gnome interface */
+! #define GNOME_GRAPHICS /* Gnome interface */
+  /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
   
   /*
-   * Define the default window system.  This should be one that is compiled
 ***************
-*** 151,161 ****
+*** 163,173 ****
   
   #ifdef UNIX
   /* path and file name extension for compression program */
@@ -30,7 +30,7 @@
   #endif
   
   #ifndef COMPRESS
---- 151,161 ----
+--- 163,173 ----
   
   #ifdef UNIX
   /* path and file name extension for compression program */
@@ -43,19 +43,19 @@
   
   #ifndef COMPRESS
 ***************
-*** 186,192 ****
-   * otherwise it will be the current directory.
-   */
-  # ifndef HACKDIR
-! #  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
+*** 201,207 ****
+  #  ifdef __APPLE__
+  #    define HACKDIR "nethackdir"	/* nethack directory */
+  #  else
+! #    define HACKDIR "/usr/games/lib/nethackdir"
+  #  endif
   # endif
   
-  /*
---- 186,192 ----
-   * otherwise it will be the current directory.
-   */
-  # ifndef HACKDIR
-! #  define HACKDIR "/usr/local/share/nethack"	/* nethack directory */
+--- 201,207 ----
+  #  ifdef __APPLE__
+  #    define HACKDIR "nethackdir"	/* nethack directory */
+  #  else
+! #    define HACKDIR "/usr/local/share/nethack"
+  #  endif
   # endif
   
-  /*
diff -u -r -P nethack3-gnome.orig/files/patch-sys::unix::Makefile.src nethack3-gnome/files/patch-sys::unix::Makefile.src
--- nethack3-gnome.orig/files/patch-sys::unix::Makefile.src	Wed Dec 12 05:24:01 2001
+++ nethack3-gnome/files/patch-sys::unix::Makefile.src	Fri Apr  5 20:28:36 2002
@@ -1,5 +1,5 @@
 *** sys/unix/Makefile.src.orig	Sat Aug  5 12:52:57 2000
---- sys/unix/Makefile.src	Sat Dec  9 13:09:44 2000
+--- sys/unix/Makefile.src	Sat Mar 30 21:25:03 2002
 ***************
 *** 139,145 ****
   # directories.  The ones given below is the usual spot for linux systems.
@@ -13,7 +13,7 @@
   # directories.  The ones given below is the usual spot for linux systems.
   # The paths are for glibconfig.h and gnomesupport.h respectively.
   #
-! GNOMEINC=-I/usr/X11R6/include -I/usr/X11R6/include/gtk12 -I/usr/local/include/glib12 -I/usr/local/include/kpathsea -I../win/gnome
+! GNOMEINC=-I/usr/local/include -I/usr/X11R6/include/gnome-1.0 -I/usr/X11R6/include -I/usr/X11R6/include/gtk12 -I/usr/local/include/glib12 -I../win/gnome
   
   # flags for debugging:
   # CFLAGS = -g -I../include
@@ -27,7 +27,7 @@
   
   # on some systems the termcap library is in -ltermcap or -lcurses
   # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
---- 203,210 ----
+--- 204,211 ----
   
   #
   #
@@ -45,11 +45,11 @@
   #
   # libraries for Gem port
   WINGEMLIB = -le_gem -lgem
---- 236,242 ----
+--- 237,243 ----
   WINKDELIB = -lkdecore -lkdeui -lXext
   #
   # libraries for Gnome
-! WINGNOMELIB = -L/usr/local/lib -L/usr/X11R6/lib -lgnomeui -lgnome -lart_lgpl -lgtk12 -lgdk12 -lglib12 -lpopt -lkpathsea
+! WINGNOMELIB = -L/usr/local/lib -L/usr/X11R6/lib -lgnomesupport -lgnomeui -lgnome -lart_lgpl -lgtk12 -lgdk12 -lglib12 -lgnugetopt 
   #
   # libraries for Gem port
   WINGEMLIB = -le_gem -lgem
@@ -62,7 +62,7 @@
   
   # any other strange libraries your system needs (for Sysunix only -- the more
   # specialized targets should already be right)
---- 244,250 ----
+--- 245,251 ----
   # libraries for BeOS 
   WINBELIB = -lbe
   
diff -u -r -P nethack3-gnome.orig/pkg-descr nethack3-gnome/pkg-descr
--- nethack3-gnome.orig/pkg-descr	Wed Dec 12 05:24:01 2001
+++ nethack3-gnome/pkg-descr	Fri Apr  5 19:56:25 2002
@@ -1,4 +1,4 @@
-This is version 3.3.1 of nethack, a clasic ASCII-based adventure game
+This is version 3.4.0 of nethack, a classic ASCII-based adventure game
 with graphics support for Gnome.
 You and your faithful pet are on a quest to retrieve the lost Amulet
 of Yendor.
diff -u -r -P nethack3-gnome.orig/pkg-plist nethack3-gnome/pkg-plist
--- nethack3-gnome.orig/pkg-plist	Thu Dec 27 12:30:09 2001
+++ nethack3-gnome/pkg-plist	Fri Apr  5 19:56:25 2002
@@ -105,8 +105,14 @@
 share/nethack/minefill.lev
 share/nethack/minend-1.lev
 share/nethack/minend-2.lev
+share/nethack/minend-3.lev
 share/nethack/minetn-1.lev
 share/nethack/minetn-2.lev
+share/nethack/minetn-3.lev
+share/nethack/minetn-4.lev
+share/nethack/minetn-5.lev
+share/nethack/minetn-6.lev
+share/nethack/minetn-7.lev
 share/nethack/opthelp
 share/nethack/options
 share/nethack/oracle.lev


>Release-Note:
>Audit-Trail:

From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: Jan Stocker <Jan.Stocker@t-online.de>
Subject: Re: ports/36880: nethack3-gnome missing gnome includes / library
Date: Tue, 9 Apr 2002 02:45:10 +0900

 I would like to give several comments about this PR:
 
 1. According to the Porters Handbook, version number
    shouldn't be included in pkg-descr.
 2. Binary executable shouldn't be installed into
    ${PREFIX}/share.
 3. It would be better using '`${GNOME_CONFIG} --cflags`'
    and '`${GNOME_CONFIG} --libs`' instead of hardcoding
    pathname.
 4. Points of all above are already implemented at
    PR ports/36576 (originally that PR has sent before
    nethack3-gnome is added into ports tree...).
    You don't have to mention about upgrading ports
    unless you strongly hope to continue maintaining
    nethack3-gnome port by yourself. If you want to do
    so, I'll cut nethack3-gnome part off from PR and
    send new one.
State-Changed-From-To: open->closed 
State-Changed-By: knu 
State-Changed-When: Wed May 15 05:03:24 JST 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36880 
>Unformatted:
