diff options
author | joerg <joerg@pkgsrc.org> | 2005-12-02 22:59:40 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2005-12-02 22:59:40 +0000 |
commit | 18964f421eb6fe5b177e0869c6fb3621676bbd7b (patch) | |
tree | fd79773fa46ffbb638a123570187dd0d51433a67 /devel | |
parent | 478e9bae6951de285bb27d730a40ccc95c031e1e (diff) | |
download | pkgsrc-18964f421eb6fe5b177e0869c6fb3621676bbd7b.tar.gz |
Add DragonFly support. Bump revision due to PLIST change.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/nbitools/Makefile | 8 | ||||
-rw-r--r-- | devel/nbitools/PLIST | 3 | ||||
-rw-r--r-- | devel/nbitools/distinfo | 10 | ||||
-rw-r--r-- | devel/nbitools/files/DragonFly.cf | 271 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ag | 31 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ah | 47 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-aj | 34 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-ak | 14 | ||||
-rw-r--r-- | devel/nbitools/patches/patch-al | 13 |
9 files changed, 420 insertions, 11 deletions
diff --git a/devel/nbitools/Makefile b/devel/nbitools/Makefile index c1693416096..be585297225 100644 --- a/devel/nbitools/Makefile +++ b/devel/nbitools/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:53 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/02 22:59:40 joerg Exp $ # DISTNAME= nbitools-R6.3 PKGNAME= nbitools-6.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -23,6 +23,10 @@ MAKE_ENV+= GCCCMD=gcc USE_TOOLS+= gmake .endif +post-extract: + @${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf + + post-patch: @${MV} ${WRKSRC}/config/cf/site.def ${WRKSRC}/config/cf/site.def.orig @${SED} -e 's|^\(\#define[ \t]*ProjectRoot\).*|\1 ${PREFIX}|' \ diff --git a/devel/nbitools/PLIST b/devel/nbitools/PLIST index d99fcb5aed2..bf2fe4866ac 100644 --- a/devel/nbitools/PLIST +++ b/devel/nbitools/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/03 09:53:46 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/12/02 22:59:40 joerg Exp $ include/itools/X11/Xfuncproto.h include/itools/X11/Xos.h include/itools/X11/Xosdefs.h lib/itools/X11/config/Amoeba.cf lib/itools/X11/config/DGUX.cf lib/itools/X11/config/Darwin.cf +lib/itools/X11/config/DragonFly.cf lib/itools/X11/config/FreeBSD.cf lib/itools/X11/config/Imake.cf lib/itools/X11/config/Imake.rules diff --git a/devel/nbitools/distinfo b/devel/nbitools/distinfo index 46dd760cbd8..628dc2aef79 100644 --- a/devel/nbitools/distinfo +++ b/devel/nbitools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2005/05/08 03:14:35 minskim Exp $ +$NetBSD: distinfo,v 1.8 2005/12/02 22:59:40 joerg Exp $ SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a RMD160 (nbitools-R6.3.tar.gz) = 047f64b113a0307b045573bfe429b59063ae38ea @@ -9,7 +9,9 @@ SHA1 (patch-ac) = 4cb8804bae2d7e815b36640c55789b5ed7b7fb75 SHA1 (patch-ad) = b0c18505891834182c57819489b7d9890802d550 SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550 SHA1 (patch-af) = 9a7e4bd19863d086a1e57f1cd9484b05189cbda6 -SHA1 (patch-ag) = cd7da1a5c47fc37ee8ade78903cc9195219a4c66 -SHA1 (patch-ah) = 1048c4cda63de7bd23213785d7614ec8e00f0c9c +SHA1 (patch-ag) = f0d09ad369eef0ceb64b946679eb910ee8909c59 +SHA1 (patch-ah) = 10645ba6e875cca81c7cb67e570b737f16ccfa26 SHA1 (patch-ai) = 9085fda5360c672865561e2c0aeafdc34596eb66 -SHA1 (patch-aj) = ab3f2807a92bf228ec1aa8bfb8a586de964e3a1c +SHA1 (patch-aj) = b3ec58e0fcbed869e230e0e3fa8b37517ed1b52e +SHA1 (patch-ak) = 293f304c8e4dcafd2dd0f344c322df9fae9ff4a2 +SHA1 (patch-al) = d3f31eb2594560b75508fac223680fb9a01fe35c diff --git a/devel/nbitools/files/DragonFly.cf b/devel/nbitools/files/DragonFly.cf new file mode 100644 index 00000000000..115ab628649 --- /dev/null +++ b/devel/nbitools/files/DragonFly.cf @@ -0,0 +1,271 @@ +/* $NetBSD: DragonFly.cf,v 1.1 2005/12/02 22:59:40 joerg Exp $ */ + +#define UseElfFormat DefaultToElfFormat +#define OSBinaryFormat [ELF] + +#ifndef OSName +#define OSName DefaultOSName OSBinaryFormat +#endif +#ifndef OSVendor +#define OSVendor /**/ +#endif +#ifndef OSMajorVersion +#define OSMajorVersion DefaultOSMajorVersion +#endif +#ifndef OSMinorVersion +#define OSMinorVersion DefaultOSMinorVersion +#endif +#ifndef OSTeenyVersion +#define OSTeenyVersion DefaultOSTeenyVersion +#endif +XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) + +#define HasGcc YES +#define HasGcc2 YES +#define HasCplusplus YES +#define HasGcc2ForCplusplus YES +#define GccUsesGas YES +#define UseGas YES +#define GnuCpp YES +#define HasNdbm YES +#define HasPutenv YES +#define HasSnprintf YES +#define HasBSD44Sockets YES +#ifndef HasLibCrypt +# define HasLibCrypt YES +#endif +#ifndef HasShm +# define HasShm YES +#endif +#define HasWChar32 YES + +#define HasPosixThreads YES +#define ThreadedX YES +#define BuildThreadStubLibrary YES +#define NeedUIThrStubs YES +#define HasThreadSafeAPI NO +#define ThreadsLibraries -pthread +XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too +#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE + +#define AvoidNullMakeCommand YES +#define StripInstalledPrograms YES +#define CompressAllFonts YES +#define Malloc0ReturnsNull YES +#define NeedConstPrototypes YES +#define NeedFunctionPrototypes YES +#define NeedNestedPrototypes YES +#define NeedVarargsPrototypes YES +#define NeedWidePrototypes NO + +#define MkdirHierCmd mkdir -p + +#ifndef HasMktemp +#define HasMktemp YES +#endif + +#define CcCmd cc +#define CppCmd cpp +#define PreProcessCmd CppCmd +#define StandardCppDefines -traditional +#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) +#define DefaultCCOptions /**/ +#else +#define DefaultCCOptions -ansi -pedantic -Dasm=__asm +#endif +#ifndef UseGnuMalloc +#define UseGnuMalloc NO +#endif + +#define HasSetUserContext YES + +#ifndef GnuMallocLibrary +#define GnuMallocLibrary -lgnumalloc +#endif + +#ifndef HasZlib +#define HasZlib YES +#endif + +#if HasPam +#define PamLibrary -lpam +#endif + +#ifndef TkLibName +#define TkLibName tk80 +#endif +#ifndef TkIncDir +#define TkIncDir /usr/local/include/tk8.0 +#endif +#ifndef TclLibName +#define TclLibName tcl80 +#endif +#ifndef TclIncDir +#define TclIncDir /usr/local/include/tcl8.0 +#endif + +#ifndef JpTkLibName +#define JpTkLibName tk80jp +#endif +#ifndef JpTkIncDir +#define JpTkIncDir /usr/local/include/tk8.0jp +#endif +#ifndef JpTclLibName +#define JpTclLibName tcl80jp +#endif +#ifndef JpTclIncDir +#define JpTclIncDir /usr/local/include/tcl8.0jp +#endif + +#undef InstallCmd +#define InstallCmd /usr/bin/install + +#define AsmElfDefines -D__ELF__ + +#if GccUsesGas +# define GccGasOption -DGCCUSESGAS +# define AsmDefines -DUSE_GAS AsmElfDefines +#else +# define GccGasOption /**/ +# define AsmDefines AsmElfDefines +#endif + +#define ServerExtraDefines GccGasOption XFree86ServerDefines + +#define StandardDefines -DCSRG_BASED + +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +#define XawI18nDefines -DUSE_XWCHAR_STRING +#define HasMakefileSafeInclude YES +#define IncludeMakefile(file) @@# dependencies are in .depend +#define DependFileName .depend +#ifndef BuildDynamicLoading +#define BuildDynamicLoading YES +#endif +#ifndef ForceNormalLib +#define ForceNormalLib YES +#endif +#define HasMkstemp YES + +/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ +#ifndef DefaultGcc2i386Opt +#define DefaultGcc2i386Opt -O2 +#endif + +#ifdef i386Architecture +# define OptimizedCDebugFlags DefaultGcc2i386Opt +#else +# define OptimizedCDebugFlags -O2 +#endif + +#ifndef PreIncDir +# define PreIncDir /usr/include +#endif + +#define TroffCmd groff -Tps +#define NroffCmd groff -Tascii +#define SetTtyGroup YES + +#ifndef ExtraFilesToClean +# define ExtraFilesToClean *.core +#endif + +#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/gnu/bin:/usr/local/bin +#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR) +#ifndef SystemManDirectory +#define SystemManDirectory /usr/share/man +#endif + +#define InstKmemFlags -g kmem -m 2755 + +/* + * Compress manual pages + */ +#ifndef CompressManPages +# define CompressManPages YES +#endif + +#if CompressManPages + +#ifndef CompressManCmd +# define CompressManCmd gzip -n +#endif + COMPRESSMANCMD = CompressManCmd + +#ifndef InstallManPageLong +#define InstallManPageLong(file,destdir,dest) @@\ +install.man:: file.man @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ + $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ + -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) +#endif + +#ifndef InstallGenManPageLong +#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ +install.man:: file.man @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.suffix* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ + $(DESTDIR)destdir/dest.suffix @@\ + -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix +#endif + +#ifndef InstallMultipleMan +#define InstallMultipleMan(list,dest) @@\ +install.man:: list @@\ + MakeDir($(DESTDIR)dest) @@\ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + for i in list; do \ @@\ + (set -x; \ @@\ + MNAME=`echo $$i | cut -f1 -d.`; \ @@\ + $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\ + $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\ + $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ + $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\ + done +#endif + +/* + * InstallManPageAliases - install soft links for aliases. + */ +#ifndef InstallManPageAliases +#define InstallManPageAliases(file,destdir,aliases) @@\ +install.man:: @@\ + @(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\ + for i in aliases; do (set -x; \ @@\ + $(RM) $(DESTDIR)destdir/$$i.*; \ @@\ + (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\ + $$i.$${SUFFIX})); \ @@\ + done) +#endif + +/* + * InstallGenManPageAliases - install soft links for aliases. + */ +#ifndef InstallGenManPageAliases +#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ + InstallManPageAliases(file,destdir,aliases) +#endif +#endif + +#define HasBsdMake YES + +#ifndef StaticLibrary +#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic +#endif + +#define DlLibrary -rdynamic + +#if BuildDynamicLoading +#define ServerExtraSysLibs DlLibrary +#else +#define ServerExtraSysLibs /**/ +#endif + +#include <bsdLib.rules> + +#ifdef i386Architecture +#include <xfree86.cf> +#endif diff --git a/devel/nbitools/patches/patch-ag b/devel/nbitools/patches/patch-ag index 17fdcac4acd..b128db6514b 100644 --- a/devel/nbitools/patches/patch-ag +++ b/devel/nbitools/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.2 2004/12/28 10:30:58 minskim Exp $ +$NetBSD: patch-ag,v 1.3 2005/12/02 22:59:40 joerg Exp $ --- config/imake/imake.c.orig 2002-02-13 10:32:00.000000000 -0600 +++ config/imake/imake.c @@ -7,7 +7,34 @@ $NetBSD: patch-ag,v 1.2 2004/12/28 10:30:58 minskim Exp $ * <add any global targets like 'clean' and long dependencies> */ -#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__) || defined(__DragonFly__) /* This needs to be before _POSIX_SOURCE gets defined */ # include <sys/param.h> # include <sys/types.h> +@@ -1028,7 +1028,7 @@ static void get_ld_version(inFile) + } + #endif + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + static void + get_binary_format(FILE *inFile) + { +@@ -1064,7 +1064,7 @@ static void get_gcc_incdir(inFile) + FILE* inFile; + { + static char* gcc_path[] = { +-#if defined(linux) || defined(__OpenBSD__) ++#if defined(linux) || defined(__OpenBSD__) || defined(__DragonFly__) + "/usr/bin/cc", /* for Linux PostIncDir */ + #endif + "/usr/local/bin/gcc", +@@ -1161,7 +1161,7 @@ define_os_defaults(inFile) + get_ld_version(inFile); + #endif + get_gcc_incdir(inFile); +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + get_binary_format(inFile); + #endif + #endif /* WIN32 */ diff --git a/devel/nbitools/patches/patch-ah b/devel/nbitools/patches/patch-ah index 7ebb522333f..9945839a853 100644 --- a/devel/nbitools/patches/patch-ah +++ b/devel/nbitools/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.3 2005/05/08 03:14:35 minskim Exp $ +$NetBSD: patch-ah,v 1.4 2005/12/02 22:59:40 joerg Exp $ --- config/imake/imakemdep.h.orig 2002-02-12 13:36:00.000000000 -0600 +++ config/imake/imakemdep.h @@ -23,6 +23,24 @@ $NetBSD: patch-ah,v 1.3 2005/05/08 03:14:35 minskim Exp $ #define DEFAULT_CPP "/usr/bin/cpp" #endif #ifdef __uxp__ +@@ -268,7 +273,7 @@ in this Software without prior written a + #if defined(__386BSD__) || defined(__OpenBSD__) + #define DEFAULT_CPP "/usr/libexec/cpp" + #endif +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + #define USE_CC_E + #endif + #if defined(__sgi) && defined(__ANSI_CPP__) +@@ -326,7 +331,7 @@ char *cpp_argv[ARGUMENTS] = { + "-Uunix", /* remove unix symbol so that filename unix.c okay */ + #endif + #endif +-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) ++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) || defined(__DragonFly__) + # ifdef __i386__ + "-D__i386__", + # endif @@ -639,6 +644,12 @@ char *cpp_argv[ARGUMENTS] = { # define DEFAULT_OS_MINOR_REV "v %*d.%1s" # define DEFAULT_OS_TEENY_REV "v %*d.%*c%[.0-9]" @@ -36,3 +54,30 @@ $NetBSD: patch-ah,v 1.3 2005/05/08 03:14:35 minskim Exp $ #elif defined(__osf__) /* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */ # define DEFAULT_OS_MAJOR_REV "r %*[^0-9]%[0-9]" +@@ -662,14 +673,14 @@ char *cpp_argv[ARGUMENTS] = { + # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" + # define DEFAULT_OS_TEENY_REV "v %[0-9]" + /* # define DEFAULT_OS_NAME "srm %[^\n]" */ /* Not useful on ISC */ +-#elif defined(__FreeBSD__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + /* BSD/OS too? */ + /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */ + # define DEFAULT_OS_MAJOR_REV "r %[0-9]" + # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" + # define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" + # define DEFAULT_OS_NAME "srm %[^\n]" +-# if defined(__FreeBSD__) ++# if defined(__FreeBSD__) || defined(__DragonFly__) + /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */ + # define DEFAULT_OS_TEENY_REV_FROB(buf, size) \ + do { \ +@@ -974,6 +985,9 @@ struct symtab predefs[] = { + #ifdef __FreeBSD__ + {"__FreeBSD__", "1"}, + #endif ++#ifdef __DragonFly__ ++ {"__DragonFly__", "1"}, ++#endif + #ifdef __OpenBSD__ + {"__OpenBSD__", "1"}, + #endif diff --git a/devel/nbitools/patches/patch-aj b/devel/nbitools/patches/patch-aj index 831b0d3cbaf..2f15d63939e 100644 --- a/devel/nbitools/patches/patch-aj +++ b/devel/nbitools/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.1 2005/05/08 03:14:35 minskim Exp $ +$NetBSD: patch-aj,v 1.2 2005/12/02 22:59:40 joerg Exp $ --- config/cf/Imake.cf.orig 2005-05-07 21:33:29.000000000 -0500 +++ config/cf/Imake.cf @@ -24,3 +24,35 @@ $NetBSD: patch-aj,v 1.1 2005/05/08 03:14:35 minskim Exp $ #if defined(clipper) || defined(__clipper__) # undef clipper # define MacroIncludeFile <ingr.cf> +@@ -264,9 +279,30 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v + # define playstation2Architecture + # undef playstation2 + # endif ++# ifdef __x86_64__ ++# define AMD64Architecture ++# undef __x86_64__ ++# endif + #endif /* NetBSD */ + +-#ifdef __FreeBSD__ ++#ifdef __DragonFly__ ++# define MacroIncludeFile <DragonFly.cf> ++# define MacroFile DragonFly.cf ++# undef __DragonFly__ ++# define DragonFlyArchitecture ++# define FreeBSDArchitecture ++# define KFreeBSDArchitecture ++# ifdef __i386__ ++# define i386BsdArchitecture ++# define i386Architecture ++# undef i386 ++# endif ++# ifdef __amd64__ ++# define AMD64Architecture ++# undef __amd64__ ++# undef __x86_64__ ++# endif ++#elif defined __FreeBSD__ + # define MacroIncludeFile <FreeBSD.cf> + # define MacroFile FreeBSD.cf + # undef __FreeBSD__ diff --git a/devel/nbitools/patches/patch-ak b/devel/nbitools/patches/patch-ak new file mode 100644 index 00000000000..013eaf39e5e --- /dev/null +++ b/devel/nbitools/patches/patch-ak @@ -0,0 +1,14 @@ +$NetBSD: patch-ak,v 1.1 2005/12/02 22:59:40 joerg Exp $ + +--- config/cf/Imakefile.orig 2002-05-28 15:48:03.000000000 +0000 ++++ config/cf/Imakefile +@@ -46,7 +46,8 @@ sunLib.rules \ + sv3Lib.rules \ + sv4Lib.rules \ + QNX.rules \ +-xf86.rules ++xf86.rules \ ++DragonFly.cf + + TMPLFILES = \ + Imake.tmpl \ diff --git a/devel/nbitools/patches/patch-al b/devel/nbitools/patches/patch-al new file mode 100644 index 00000000000..d9a231d3cf4 --- /dev/null +++ b/devel/nbitools/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1 2005/12/02 22:59:40 joerg Exp $ + +--- config/cf/bsdLib.rules.orig 1999-07-21 12:01:05.000000000 +0000 ++++ config/cf/bsdLib.rules +@@ -173,7 +173,7 @@ LintLibReferences(varname,libname,libsou + * InstallSharedLibrary - generate rules to install the shared library. + * NOTE: file must be executable, hence "INSTBINFLAGS" + */ +-#ifndef FreeBSDArchitecture ++#if !defined(FreeBSDArchitecture) && !defined(__DragonFly__) + #ifndef InstallSharedLibrary + #define InstallSharedLibrary(libname,rev,dest) @@\ + install:: Concat(lib,libname.so.rev) @@\ |