Date: Tue, 7 Sep 1999 23:16:56 +0200 (CEST) From: lkoeller@cc.fh-lippe.de To: FreeBSD-gnats-submit@freebsd.org Subject: ports/13624: Xbae Update for 3.3-RELEASE ports (urgent!) Message-ID: <199909072116.XAA80108@cc.fh-lippe.de>
next in thread | raw e-mail | index | archive | help
>Number: 13624
>Category: ports
>Synopsis: Xbae Update to 4.7 needed for news grace port
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 7 15:40:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Lars Koeller
>Release: FreeBSD 3.2-STABLE i386
>Organization:
Fachhochschule Lippe, Lemgo, Germany
>Environment:
-
>Description:
Update Xbae to version 4.7, which is needed by grace, which is
currently broken, and will be fixed up to Friday September 10th.
>How-To-Repeat:
-
>Fix:
1) remove patches/patch-a[b-d]
2) Apply the patches appended
3) make makesum
*** /usr/ports/x11-toolkits/xbae/Makefile Wed Sep 1 23:09:53 1999
--- Makefile Tue Sep 7 23:09:08 1999
***************
*** 3,17 ****
# Date created: 11 December 96
# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
# With some
! # modifications from: Andreas Klemm <andreas@FreeBSD.org>
#
! # $FreeBSD: ports/x11-toolkits/xbae/Makefile,v 1.8 1999/08/31 06:53:01 mharo Exp $
#
! DISTNAME= Xbae-4.6.2
! PKGNAME= xbae-4.6.2
CATEGORIES= x11-toolkits math
! MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= widgets/motif
MAINTAINER= Lars.Koeller@Uni-Bielefeld.de
--- 3,18 ----
# Date created: 11 December 96
# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
# With some
! # modifications from: Andreas Klemm <andreas@FreeBSD.ORG>
#
! # $Id: Makefile,v 1.6 1998/11/14 09:43:33 asami Exp $
#
! DISTNAME= Xbae-4.7
! PKGNAME= xbae-4.7
CATEGORIES= x11-toolkits math
! MASTER_SITES= ftp://sunsite.doc.ic.ac.uk/packages/X11/contrib/widgets/ \
! ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= widgets/motif
MAINTAINER= Lars.Koeller@Uni-Bielefeld.de
*** /usr/ports/x11-toolkits/xbae/patches/patch-aa Mon May 31 13:01:00 1999
--- patches/patch-aa Tue Sep 7 22:45:44 1999
***************
*** 1,28 ****
! --- Xbae.tmpl.orig Thu Jul 10 03:15:47 1997
! +++ Xbae.tmpl Sun May 30 09:43:38 1999
! @@ -11,7 +11,7 @@
! XCOMM yes as the demos may have trouble finding the shared library.
#define DoNormalLib YES
! -#define DoSharedLib NO /* Don't define if you want the demos! */
! +#define DoSharedLib YES /* Don't define if you want the demos! */
! #define DoDebugLib NO
! XCOMM Some of the examples use Wcl. If you haven't got Wcl, it doesn't
! @@ -93,9 +93,9 @@
LOCAL_LDFLAGS = -L../../src $(EXTRA_LDOPTIONS)
#if HaveXpm
! - LOCAL_LIBRARIES = -lXbae -lXm -lXpm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
! + LOCAL_LIBRARIES = -lXbae ${MOTIFLIB} -lXpm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
#else
! - LOCAL_LIBRARIES = -lXbae -lXm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
! + LOCAL_LIBRARIES = -lXbae ${MOTIFLIB} $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
#endif
! DEPLIBS =
! INCLUDES = -I../../src
! @@ -172,4 +172,3 @@
! osaber:
! XCOMM load $(ALLDEFINES) $(OBJS)
#endif
-
--- 1,43 ----
! *** Xbae.tmpl~ Tue Jul 27 11:21:55 1999
! --- Xbae.tmpl Tue Sep 7 22:45:17 1999
! ***************
! *** 12,18 ****
#define DoNormalLib YES
! #define DoSharedLib YES
! ! #define DoDebugLib YES
! #include <Library.tmpl>
!
! --- 12,18 ----
!
! #define DoNormalLib YES
! #define DoSharedLib YES
! ! #define DoDebugLib NO
!
! #include <Library.tmpl>
!
! ***************
! *** 138,144 ****
LOCAL_LDFLAGS = -L../../src $(EXTRA_LDOPTIONS)
#if HaveXpm
! ! LOCAL_LIBRARIES = -lXbae -lXm -lXpm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
#else
! LOCAL_LIBRARIES = -lXbae -lXm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
#endif
! --- 138,144 ----
! LOCAL_LDFLAGS = -L../../src $(EXTRA_LDOPTIONS)
!
! #if HaveXpm
! ! LOCAL_LIBRARIES = -lXbae ${MOTIFLIB} -lXpm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
! #else
! LOCAL_LIBRARIES = -lXbae -lXm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
#endif
+ ***************
+ *** 182,185 ****
+ XCOMM osaber:
+ XCOMM load $(ALLDEFINES) $(OBJS)
+ XCOMM #endif
-
+ --- 182,184 ----
*** /usr/ports/x11-toolkits/xbae/pkg/PLIST Sun May 30 12:53:00 1999
--- pkg/PLIST Tue Sep 7 23:01:11 1999
***************
*** 1,17 ****
! lib/libXbae-4.6.a
lib/libXbae.a
lib/libXbae.so
! lib/libXbae.so.6.2
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D
! @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
! include/Xbae-4.6/Caption.h
! include/Xbae-4.6/CaptionP.h
! include/Xbae-4.6/Cell.h
! include/Xbae-4.6/CellP.h
! include/Xbae-4.6/Clip.h
! include/Xbae-4.6/ClipP.h
! include/Xbae-4.6/Matrix.h
! include/Xbae-4.6/MatrixP.h
! include/Xbae-4.6/patchlevel.h
! @dirrm include/Xbae-4.6
include/Xbae
--- 1,17 ----
! lib/libXbae-4.7.a
lib/libXbae.a
lib/libXbae.so
! lib/libXbae.so.7.0
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D
! @unexec /usr/bin/env OBJFORMAT==%%PORTOBJFORMAT%% /sbin/ldconfig -R
! include/Xbae-4.7/Caption.h
! include/Xbae-4.7/CaptionP.h
! include/Xbae-4.7/Input.h
! include/Xbae-4.7/InputP.h
! include/Xbae-4.7/Clip.h
! include/Xbae-4.7/ClipP.h
! include/Xbae-4.7/Matrix.h
! include/Xbae-4.7/MatrixP.h
! include/Xbae-4.7/patchlevel.h
! @dirrm include/Xbae-4.7
include/Xbae
>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?199909072116.XAA80108>