Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 Jan 1999 02:37:23 +0200 (SAT)
From:      reg@shale.csir.co.za
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/9829: Port fix: ggv
Message-ID:  <199901310037.CAA59127@shale.csir.co.za>

next in thread | raw e-mail | index | archive | help

>Number:         9829
>Category:       ports
>Synopsis:       Port fix: ggv
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 30 16:40:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Lea
>Release:        FreeBSD 3.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:

	FreeBSD Ports collection

>Description:

	Distfile updated without version number bump.  4.0-CURRENT support
	added. Minor cleanup and impilict depends.  patch-ad added to fix
	problem with glib 1.1.13 defining NONE.

>How-To-Repeat:

	

>Fix:
	
	
diff -urN ggv.old/Makefile ggv/Makefile
--- ggv.old/Makefile	Wed Jan 27 10:31:51 1999
+++ ggv/Makefile	Sun Jan 31 02:33:23 1999
@@ -7,26 +7,25 @@
 #
 
 DISTNAME=	ggv-0.26
-CATEGORIES=	print
+CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	ggv
 
 MAINTAINER=	nacai@iname.com
 
+BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gnomeui.1:${PORTSDIR}/x11/gnomelibs
 
-BROKEN=		"gnome 0.99.3"
+# implicit dependencies:
+# gettext, xpm, gtk11-devel, gnomelibs
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 .include <bsd.port.mk>
diff -urN ggv.old/files/md5 ggv/files/md5
--- ggv.old/files/md5	Mon Oct 19 16:29:02 1998
+++ ggv/files/md5	Sun Jan 24 16:37:37 1999
@@ -1 +1 @@
-MD5 (ggv-0.26.tar.gz) = efe9c011165f0313600e5988b005a6d2
+MD5 (ggv-0.26.tar.gz) = ff3cf03289b3effd8fc8fb0e29ab6e03
diff -urN ggv.old/patches/patch-aa ggv/patches/patch-aa
--- ggv.old/patches/patch-aa	Mon Oct 19 16:29:02 1998
+++ ggv/patches/patch-aa	Tue Jan 26 14:14:10 1999
@@ -1,20 +1,43 @@
---- configure.orig	Thu Oct 15 04:18:51 1998
-+++ configure	Thu Oct 15 04:19:37 1998
-@@ -925,12 +925,12 @@
+--- configure.orig	Wed Dec 16 23:06:18 1998
++++ configure	Tue Jan 26 14:13:02 1999
+@@ -1076,13 +1076,13 @@
+ 	    fi
+ 	
+ 	    if test "$no_gnome_config" = "yes"; then
+-              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:1081: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-	      if test -f $gnome_prefix/gnomeConf.sh; then
++              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
++echo "configure:1081: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++	      if test -f $prefix/share/gnome/gnomeConf.sh; then
+ 	        echo "$ac_t""found" 1>&6
+ 	        echo "loading gnome configuration from" \
+-		     "$gnome_prefix/gnomeConf.sh"
+-	        . $gnome_prefix/gnomeConf.sh
++		     "$prefix/share/gnome/gnomeConf.sh"
++	        . $prefix/share/gnome/gnomeConf.sh
+ 	        
+ 	      else
+ 	        echo "$ac_t""not found" 1>&6
+@@ -4024,15 +4024,15 @@
+ fi
  
+         
+-	USE_INCLUDED_LIBINTL=yes
++#	USE_INCLUDED_LIBINTL=yes
+         CATOBJEXT=.gmo
+         INSTOBJEXT=.mo
+         DATADIRNAME=share
+-	INTLDEPS='$(top_builddir)/intl/libintl.a'
+-	INTLLIBS=$INTLDEPS
+-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+-        nls_cv_header_intl=intl/libintl.h
+-        nls_cv_header_libgt=intl/libgettext.h
++#	INTLDEPS='$(top_builddir)/intl/libintl.a'
++#	INTLLIBS=$INTLDEPS
++#	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++#        nls_cv_header_intl=intl/libintl.h
++#        nls_cv_header_libgt=intl/libgettext.h
+       fi
  
- 	if test "$no_gnome_config" = "yes"; then
--          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:930: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	  if test -f $gnome_prefix/gnomeConf.sh; then
-+          echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:930: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	  if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	    echo "$ac_t""found" 1>&6
--	    echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
--	    . $gnome_prefix/gnomeConf.sh
-+	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+	    . $prefix/share/gnome/gnomeConf.sh
- 	    
- 	  else
- 	    echo "$ac_t""not found" 1>&6
+             if test "$XGETTEXT" != ":"; then
diff -urN ggv.old/patches/patch-ab ggv/patches/patch-ab
--- ggv.old/patches/patch-ab	Mon Oct 19 16:29:02 1998
+++ ggv/patches/patch-ab	Sun Jan 24 16:47:18 1999
@@ -1,6 +1,6 @@
 --- Makefile.in.orig	Thu Oct 15 04:19:55 1998
 +++ Makefile.in	Thu Oct 15 04:20:12 1998
-@@ -109,7 +109,7 @@
+@@ -117,7 +117,7 @@
  INCLUDES = 			\
  	-I$(includedir)					\
  	$(GNOME_INCLUDEDIR)				\
diff -urN ggv.old/patches/patch-ac ggv/patches/patch-ac
--- ggv.old/patches/patch-ac	Thu Jan 28 23:31:43 1999
+++ ggv/patches/patch-ac	Sun Jan 31 01:58:16 1999
@@ -17,8 +17,17 @@
        *)
          $echo "$modename: unknown library version type \`$version_type'" 1>&2
          echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig	Thu Aug 20 23:44:22 1998
-+++ ltconfig	Thu Oct 15 04:20:26 1998
+--- ltconfig.orig	Wed Dec 16 23:06:15 1998
++++ ltconfig	Sun Jan 31 01:56:31 1999
+@@ -767,7 +767,7 @@
+     ;;
+ 
+   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+-  freebsd3*)
++  freebsd3* | freebsd4*)
+     archive_cmds='$CC -shared -o $lib$libobjs'
+     hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
 @@ -1105,10 +1105,21 @@
    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "$lib" | sed '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
    ;;
diff -urN ggv.old/patches/patch-ad ggv/patches/patch-ad
--- ggv.old/patches/patch-ad	Thu Jan  1 02:00:00 1970
+++ ggv/patches/patch-ad	Tue Jan 26 14:20:31 1999
@@ -0,0 +1,35 @@
+--- ps.h.orig	Tue Jan 26 13:58:49 1999
++++ ps.h	Tue Jan 26 13:59:06 1999
+@@ -40,6 +40,7 @@
+ 	/* Constants used to store keywords that are scanned. */
+ 	/* NONE is not a keyword, it tells when a field was not set */
+ 
++#undef NONE
+ enum {ATEND = -1, NONE = 0, PORTRAIT, LANDSCAPE, ASCEND, DESCEND, SPECIAL};
+ 
+ #define PSLINELENGTH 257	/* 255 characters + 1 newline + 1 NULL */
+--- ps.c.orig	Tue Jan 26 14:19:36 1999
++++ ps.c	Tue Jan 26 14:20:12 1999
+@@ -54,7 +54,10 @@
+ #endif
+ #include <ctype.h>
+ #include <X11/Xos.h>		/* #includes the appropriate <string.h> */
++#include <sys/stat.h>
++#include <glib.h>
+ #include "ps.h"
++#include "file.h"
+ 
+ #ifdef BSD4_2
+ #define memset(a,b,c) bzero(a,c)
+@@ -208,11 +211,6 @@
+ /* Jake Hamby patch 18/3/98 */
+ /* Following text added */
+  
+-#include <sys/stat.h>
+-
+-#include <glib.h>
+-
+-#include "file.h"
+ 
+ int
+ file_fileIsNotUseful(fn)

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199901310037.CAA59127>