From 05dcb0fb06629867089d6b2fb076106bd79fb9a6 Mon Sep 17 00:00:00 2001 From: sakamoto Date: Sun, 5 Aug 2001 17:04:21 +0000 Subject: Fix method to use xunicode s/USE_XUNICODE/FOX_USE_XUNICODE/ and define USE_UNICODE to X_CFLAGS. Update from 0.99.172 to 0.99.174 http://www.geocrawler.com/archives/3/3372/2001/6/0/6025503/ [Foxgui-announce]New drop of FOX [0.99.173] http://www.geocrawler.com/archives/3/3372/2001/7/0/6162289/ [Foxgui-announce]New FOX drop [0.99.174] --- x11/fox/Makefile | 17 ++++++++--------- x11/fox/buildlink.mk | 37 +++++++++++++++++++++++++++++++++++++ x11/fox/distinfo | 16 ++++++++-------- x11/fox/patches/patch-ab | 4 ++-- x11/fox/pkg/PLIST | 12 +++++++++--- 5 files changed, 64 insertions(+), 22 deletions(-) create mode 100644 x11/fox/buildlink.mk diff --git a/x11/fox/Makefile b/x11/fox/Makefile index 74018ee62a9..9d11a96abf1 100644 --- a/x11/fox/Makefile +++ b/x11/fox/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:57 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/08/05 17:04:21 sakamoto Exp $ # FreeBSD Id: ports/x11-toolkits/fox/Makefile,v 1.14 2001/02/23 19:00:05 knu Exp -DISTNAME= fox-0.99.172 +DISTNAME= fox-0.99.174 CATEGORIES= x11 MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \ ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/ @@ -10,30 +10,29 @@ MAINTAINER= sakamoto@netbsd.org HOMEPAGE= http://www.cfdrc.com/FOX/fox.html COMMENT= Fast and extensive C++ GUI toolkit -DEPENDS+= jpeg-*:../../graphics/jpeg -DEPENDS+= png>=1.0.11:../../graphics/png - -.if !defined(USE_XUNICODE) || ${USE_XUNICODE} == "YES" +.if !defined(FOX_USE_XUNICODE) || ${FOX_USE_XUNICODE} == "YES" MASTER_SITES+= http://www.ab.wakwak.com/~tino/jatk/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xunicode-0.3.2.2${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xunicode-0.3.3${EXTRACT_SUFX} PATCH_SITES= http://www.ab.wakwak.com/~tino/jatk/fox/ PATCHFILES= ${DISTNAME:C/-/-unicode-/}.diff PATCH_DIST_STRIP=-p1 CPPFLAGS+= -I.. -X_CFLAGS= -DUSE_XUNICODE +X_CFLAGS= -DUSE_UNICODE CONFIGURE_ENV+= X_CFLAGS="${X_CFLAGS}" .endif USE_X11BASE= # defined -USE_MESA= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig GNU_CONFIGURE= # defined CONFIGURE_ARGS+=--with-opengl=mesa --with-x --with-shm=yes --enable-release +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../graphics/Mesa/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fox/buildlink.mk b/x11/fox/buildlink.mk new file mode 100644 index 00000000000..251248396ce --- /dev/null +++ b/x11/fox/buildlink.mk @@ -0,0 +1,37 @@ +# $NetBSD: buildlink.mk,v 1.1 2001/08/05 17:04:21 sakamoto Exp $ +# +# This Makefile fragment is included by packages that use fox. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.fox to the dependency pattern +# for the version of fox desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(FOX_BUILDLINK_MK) +FOX_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.fox?= fox-* +DEPENDS+= ${BUILDLINK_DEPENDS.fox}:../../x11/fox + +EVAL_PREFIX+= BUILDLINK_PREFIX.fox=fox +BUILDLINK_PREFIX.fox_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.fox= include/fox/* +BUILDLINK_FILES.fox+= lib/libFOX-* +BUILDLINK_FILES.fox+= lib/libFOX.* + +BUILDLINK_TARGETS.fox= fox-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.fox} + +CPPFLAGS+= -I${BUILDLINK_DIR}/include/fox + +pre-configure: ${BUILDLINK_TARGETS.fox} +fox-buildlink: _BUILDLINK_USE + +.endif # FOX_BUILDLINK_MK diff --git a/x11/fox/distinfo b/x11/fox/distinfo index 3105ff8301f..72f4226180d 100644 --- a/x11/fox/distinfo +++ b/x11/fox/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.5 2001/05/27 07:57:38 sakamoto Exp $ +$NetBSD: distinfo,v 1.6 2001/08/05 17:04:21 sakamoto Exp $ -SHA1 (fox-0.99.172.tar.gz) = c808e5311818a256ef7ba3e8962274b531f92509 -Size (fox-0.99.172.tar.gz) = 1609946 bytes -SHA1 (xunicode-0.3.2.2.tar.gz) = 43116978f960a865b16a7f18a85b86d8c256dceb -Size (xunicode-0.3.2.2.tar.gz) = 142799 bytes -SHA1 (fox-unicode-0.99.172.diff) = a3c5407b0129a7e48d4043b4736fe4237195056c -Size (fox-unicode-0.99.172.diff) = 220130 bytes -SHA1 (patch-ab) = 0bac8e55955d4cbc37fe4bbdf2b98def88a093ea +SHA1 (fox-0.99.174.tar.gz) = 4c9455646e689f5d35b6cb541db20a9646156fa2 +Size (fox-0.99.174.tar.gz) = 1631360 bytes +SHA1 (xunicode-0.3.3.tar.gz) = 279c7b7990774bf585ffdbb37fdcbb3099354206 +Size (xunicode-0.3.3.tar.gz) = 142790 bytes +SHA1 (fox-unicode-0.99.174.diff) = cfd394f0032a69d5a4c9918f2b6788f1cb11f5ca +Size (fox-unicode-0.99.174.diff) = 225018 bytes +SHA1 (patch-ab) = 959b64df0a5b30e81a09e15e04020b48598a6c39 SHA1 (patch-ac) = 4558237957c3bcec13cd11c521fa94b8e98fac40 SHA1 (patch-ae) = 33e70da09da4fa637e6f1aeb89b52b54f454562d diff --git a/x11/fox/patches/patch-ab b/x11/fox/patches/patch-ab index 42613a7d0af..8f71725559c 100644 --- a/x11/fox/patches/patch-ab +++ b/x11/fox/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2001/04/13 19:27:05 sakamoto Exp $ +$NetBSD: patch-ab,v 1.3 2001/08/05 17:04:21 sakamoto Exp $ --- Makefile.in.orig Thu Apr 5 05:34:11 2001 +++ Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.2 2001/04/13 19:27:05 sakamoto Exp $ #AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies -SUBDIRS = utils include src doc tests textedit pathfinder calculator -+SUBDIRS = utils include src doc ++SUBDIRS = utils include src doc textedit pathfinder calculator EXTRA_DIST = ADDITIONS AUTHORS BUGS INSTALL LICENSE TRACING README fox.lsm index.html aclocal.m4 CLEANFILES = fox.tar.gz diff --git a/x11/fox/pkg/PLIST b/x11/fox/pkg/PLIST index 2b0d922fbca..3bc4d85077e 100644 --- a/x11/fox/pkg/PLIST +++ b/x11/fox/pkg/PLIST @@ -1,5 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2001/05/27 07:57:40 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.5 2001/08/05 17:04:21 sakamoto Exp $ bin/reswrap +bin/calculator +bin/PathFinder +bin/textedit include/fox/FX4Splitter.h include/fox/FXAccelTable.h include/fox/FXApp.h @@ -107,6 +110,7 @@ include/fox/FXPopup.h include/fox/FXPrintDialog.h include/fox/FXProfiler.h include/fox/FXProgressBar.h +include/fox/FXProgressDialog.h include/fox/FXQuat.h include/fox/FXRadioButton.h include/fox/FXRange.h @@ -133,6 +137,8 @@ include/fox/FXStatusline.h include/fox/FXStream.h include/fox/FXString.h include/fox/FXSwitcher.h +include/fox/FXTIFIcon.h +include/fox/FXTIFImage.h include/fox/FXTab.h include/fox/FXTable.h include/fox/FXText.h @@ -161,9 +167,9 @@ include/fox/fxkeys.h include/fox/fxregex.h include/fox/fxver.h include/fox/xincs.h +lib/libFOX-0.99.so.174.0 +lib/libFOX-0.99.so.174 lib/libFOX-0.99.so -lib/libFOX-0.99.so.172 -lib/libFOX-0.99.so.172.0 lib/libFOX.a lib/libFOX.la lib/libFOX.so -- cgit v1.2.3