From 17d06c5fece86880356d6792dc565b6460f601d4 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 27 Jun 2005 14:08:15 +0000 Subject: Add DragonFly support (untested). Provided by Jörg Sonnenberger in PR 30258. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While here, clean up pkglint warnings. --- x11/openmotif/Makefile | 39 +++---- x11/openmotif/distinfo | 7 +- x11/openmotif/files/DragonFly.cf | 228 +++++++++++++++++++++++++++++++++++++++ x11/openmotif/patches/patch-ar | 50 +++++++-- x11/openmotif/patches/patch-as | 37 +++++-- x11/openmotif/patches/patch-bj | 13 +++ 6 files changed, 334 insertions(+), 40 deletions(-) create mode 100644 x11/openmotif/files/DragonFly.cf create mode 100644 x11/openmotif/patches/patch-bj (limited to 'x11/openmotif') diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 7ce8bff7569..649d48980da 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/06/01 18:03:30 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/27 14:08:15 wiz Exp $ PKGVER= 2.1.30 DISTNAME= openmotif${PKGVER} @@ -54,6 +54,7 @@ INSTALLATION_DIRS= lib/X11/config man/man1 man/man3 man/man5 post-extract: ${CP} ${FILESDIR}/NoInstall.rules ${WRKSRC}/config/cf/NoInstall.rules ${CP} ${FILESDIR}/OpenMotif.def ${WRKSRC}/config/cf/Motif.def + ${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf/DragonFly.cf # 1) Fix the man pages to refer to the correct sections. # 2) Link Motif.* to OpenMotif.*. @@ -62,31 +63,31 @@ post-extract: # post-patch: cd ${WRKSRC}/doc/man; \ - for file in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do \ + for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do \ ${SED} -e "s|user cmd|1|g" \ -e "s|library call|3|g" \ -e "s|special file|5|g" \ -e "s|file formats|5|g" \ - $${file} > $${file}.fixed; \ - ${MV} -f $${file}.fixed $${file}; \ + $${manpage} > $${manpage}.fixed; \ + ${MV} -f $${manpage}.fixed $${manpage}; \ done; \ ${CP} -f man4/mwmrc.4 man5/mwmrc.5 cd ${WRKSRC}/config/cf; \ files="Motif.rules Motif.tmpl"; \ - for file in $${files}; do \ - dest="Open$${file}"; \ + for configfile in $${files}; do \ + dest="Open$${configfile}"; \ ${RM} -f $${dest}; \ - ${LN} -s $${file} $${dest}; \ + ${LN} -s $${configfile} $${dest}; \ done cd ${WRKSRC}/doc/man/man3; \ for name in Core Object Shell; do \ ${MV} -f $${name}.3 X$${name}.3; \ files=`${GREP} -l ".fB$${name}.fP(3)" *.3`; \ - for file in $${files}; do \ - ${MV} -f $${file} $${file}.presubst; \ + for manpage in $${files}; do \ + ${MV} -f $${manpage} $${manpage}.presubst; \ ${SED} "s|\(.fB\)$${name}\(.fP(3)\)|\1X$${name}\2|g" \ - $${file}.presubst > $${file}; \ - ${RM} -f $${file}.presubst; \ + $${manpage}.presubst > $${manpage}; \ + ${RM} -f $${manpage}.presubst; \ done; \ done @@ -105,22 +106,22 @@ do-configure: # Filter the manpages through tbl. post-build: cd ${WRKSRC}/doc/man; \ - for file in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do \ - ${TBL} $${file} > $${file}.tblized; \ - ${MV} -f $${file}.tblized $${file}; \ + for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do \ + ${TBL} $${manpage} > $${manpage}.tblized; \ + ${MV} -f $${manpage}.tblized $${manpage}; \ done # Install the OpenMotif config files and manpages. post-install: cd ${WRKSRC}/config/cf; \ files="Motif.def Motif.rules Motif.tmpl"; \ - for file in $${files}; do \ - dest="${PREFIX}/lib/X11/config/Open$${file}"; \ - ${INSTALL_DATA} $${file} $${dest}; \ + for configfile in $${files}; do \ + dest="${PREFIX}/lib/X11/config/Open$${configfile}"; \ + ${INSTALL_DATA} $${configfile} $${dest}; \ done cd ${WRKSRC}/doc/man; \ - for file in man1/*.1 man3/*.3 man5/*.5; do \ - ${INSTALL_MAN} $${file} ${PREFIX}/man/$${file}; \ + for manpage in man1/*.1 man3/*.3 man5/*.5; do \ + ${INSTALL_MAN} $${manpage} ${PREFIX}/man/$${manpage}; \ done .include "../../mk/bsd.pkg.mk" diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo index 44d45729e46..aa5a33ded75 100644 --- a/x11/openmotif/distinfo +++ b/x11/openmotif/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2005/03/10 16:00:31 wiz Exp $ +$NetBSD: distinfo,v 1.17 2005/06/27 14:08:15 wiz Exp $ SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc RMD160 (openmotif/openmotif2.1.30.tar.gz) = b404b925dbb6fe4ff6c522edf3d0f511637fb872 @@ -35,8 +35,8 @@ SHA1 (patch-an) = 0d0ba4bbbe6742c5a8b2fda475adfe8a05647cc1 SHA1 (patch-ao) = 8423174dcf89e00e76ce0a27b3d7c27cf3540a17 SHA1 (patch-ap) = 8b9fe7fcf076f6a1162f5b8a3003bbb78204bc8b SHA1 (patch-aq) = f06bde8d2151c3b60fce74e663b7eead965758a8 -SHA1 (patch-ar) = f56863037e0167b59e903195f42d7f2c0608c899 -SHA1 (patch-as) = 3327ecd54c75701e31d462b5f4ed445202fd978a +SHA1 (patch-ar) = 7401c03e7197b03eff647efc83adb6ccd20e6a9d +SHA1 (patch-as) = a7078fe22854c7e4634d8e03da1570ad2e283065 SHA1 (patch-at) = d75e7b060797997f47f0da3099e53d5d8e5c6c68 SHA1 (patch-au) = 3559258736a8534b930750294bc0865a17a51e7e SHA1 (patch-av) = 2729c9edbcbbb62016305a1f0293684b805ce50d @@ -53,3 +53,4 @@ SHA1 (patch-bf) = 211d84bccf91ed474634658a75af5d8977b052d4 SHA1 (patch-bg) = 582f455b066bd4f12160d719c885e9d8423632e5 SHA1 (patch-bh) = 4025190b6200398b54cfa075da8976e96bf7c3ee SHA1 (patch-bi) = 4dced20ce293f8635f121f77e9112e93766b9723 +SHA1 (patch-bj) = c7e2e4613d6911628ecc4f019ab5f78a2c4c03ea diff --git a/x11/openmotif/files/DragonFly.cf b/x11/openmotif/files/DragonFly.cf new file mode 100644 index 00000000000..c4f7b7db644 --- /dev/null +++ b/x11/openmotif/files/DragonFly.cf @@ -0,0 +1,228 @@ +#define UseElfFormat YES +#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 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 + +#define CcCmd cc +#define CppCmd /usr/libexec/cpp +#define PreProcessCmd CppCmd +#define StandardCppDefines -traditional +#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) +#define DefaultCCOptions /**/ +#else +#define DefaultCCOptions -Dasm=__asm +#endif +#ifndef ExtraLibraries +/* support for multi-byte locales is in libxpg4 rather than libc */ +#define ExtraLibraries /**/ +#endif +#ifndef UseGnuMalloc +#define UseGnuMalloc NO +#endif + +#define HasSetUserContext YES + +#ifndef ExtraLoadFlags +#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) +#endif + +#ifndef SharedLibraryLoadFlags +#define SharedLibraryLoadFlags -shared -rpath $(USRLIBDIRPATH) +#endif + +#ifndef GnuMallocLibrary +#define GnuMallocLibrary -lgnumalloc +#endif + +#ifndef HasZlib +#define HasZlib YES +#endif + +#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 + +#define OptimizedCDebugFlags -O2 + +#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 + +#ifdef i386Architecture +#include +#endif diff --git a/x11/openmotif/patches/patch-ar b/x11/openmotif/patches/patch-ar index b381798cfcc..8b51fa16b8d 100644 --- a/x11/openmotif/patches/patch-ar +++ b/x11/openmotif/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.2 2004/03/16 23:59:42 danw Exp $ +$NetBSD: patch-ar,v 1.3 2005/06/27 14:08:15 wiz Exp $ ---- config/imake/imakemdep.h.orig Sat Mar 13 22:27:36 2004 -+++ config/imake/imakemdep.h -@@ -265,10 +265,10 @@ in this Software without prior written a +--- config/imake/imakemdep.h.orig 2005-05-16 17:00:00.000000000 +0200 ++++ config/imake/imakemdep.h 2005-05-16 17:04:32.000000000 +0200 +@@ -265,10 +265,10 @@ #ifdef _CRAY #define DEFAULT_CPP "/lib/pcpp" #endif @@ -11,20 +11,20 @@ $NetBSD: patch-ar,v 1.2 2004/03/16 23:59:42 danw Exp $ #define DEFAULT_CPP "/usr/libexec/cpp" #endif -#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__DragonFly__) #define USE_CC_E #endif #if defined(__sgi) && defined(__ANSI_CPP__) -@@ -326,7 +326,7 @@ char *cpp_argv[ARGUMENTS] = { +@@ -326,7 +326,7 @@ "-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(__APPLE__) ++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) || defined(__APPLE__) || defined(__DragonFly__) # ifdef __i386__ "-D__i386__", # endif -@@ -336,6 +336,9 @@ char *cpp_argv[ARGUMENTS] = { +@@ -336,6 +336,9 @@ # ifdef __m68k__ "-D__m68k__", # endif @@ -34,16 +34,44 @@ $NetBSD: patch-ar,v 1.2 2004/03/16 23:59:42 danw Exp $ # ifdef __GNUC__ "-traditional", # endif -@@ -988,6 +991,12 @@ struct symtab predefs[] = { +@@ -662,14 +665,14 @@ + # 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 { \ +@@ -968,7 +971,9 @@ + #ifdef __sgi + {"__sgi", "1"}, #endif +-#ifdef __FreeBSD__ ++#ifdef __DragonFly__ ++ {"__DragonFly__", "1"}, ++#elif defineD(__FreeBSD__) + {"__FreeBSD__", "1"}, + #endif + #ifdef __OpenBSD__ +@@ -989,6 +994,12 @@ #ifdef __QNXNTO__ {"__QNXNTO__", "1"}, -+#endif + #endif +#ifdef __ppc__ + {"__ppc__", "1"}, +#endif +#ifdef __BIG_ENDIAN__ + {"__BIG_ENDIAN__", "1"}, - #endif ++#endif /* add any additional symbols before this line */ {NULL, NULL} + }; diff --git a/x11/openmotif/patches/patch-as b/x11/openmotif/patches/patch-as index 62e42eec1a1..adb58dfed66 100644 --- a/x11/openmotif/patches/patch-as +++ b/x11/openmotif/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.3 2004/03/16 23:59:42 danw Exp $ +$NetBSD: patch-as,v 1.4 2005/06/27 14:08:15 wiz Exp $ --- config/cf/Imake.cf.orig Sat Mar 13 21:19:59 2004 +++ config/cf/Imake.cf -@@ -73,6 +73,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v +@@ -73,6 +73,9 @@ # if defined(__sparc__) || defined(sparc) # define SparcArchitecture # undef sparc @@ -12,7 +12,7 @@ $NetBSD: patch-as,v 1.3 2004/03/16 23:59:42 danw Exp $ # endif # ifdef mips # define MipsArchitecture -@@ -129,6 +132,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v +@@ -129,6 +132,9 @@ # if defined(__sparc__) || defined(sparc) # define SparcArchitecture # undef sparc @@ -22,11 +22,33 @@ $NetBSD: patch-as,v 1.3 2004/03/16 23:59:42 danw Exp $ # endif # ifdef mips # define MipsArchitecture -@@ -720,6 +726,21 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v - #endif +@@ -150,7 +155,21 @@ + # endif + #endif /* NetBSD */ + +-#ifdef __FreeBSD__ ++#ifdef __DragonFly__ ++# define MacroIncludeFile ++# define MacroFile DragonFly.cf ++# undef __DragonFly__ ++# ifdef __i386__ ++# define i386BsdArchitecture ++# define i386Architecture ++# undef i386 ++# endif ++# ifdef __amd64__ ++# define AMD64Architecture ++# undef __amd64__ ++# undef __x86_64__ ++# endif ++#elif defined __FreeBSD__ + # define MacroIncludeFile + # define MacroFile FreeBSD.cf + # undef __FreeBSD__ +@@ -721,6 +743,21 @@ #endif #endif /* QNX/Neutrino */ -+ + +#if defined(__APPLE__) +# undef __APPLE__ +# define MacroIncludeFile @@ -41,6 +63,7 @@ $NetBSD: patch-as,v 1.3 2004/03/16 23:59:42 danw Exp $ +# undef __i386__ +# endif +#endif - ++ #ifndef MacroIncludeFile XCOMM WARNING: Imake.cf not configured; guessing at definitions!!! + XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake. diff --git a/x11/openmotif/patches/patch-bj b/x11/openmotif/patches/patch-bj new file mode 100644 index 00000000000..c0c38da84a9 --- /dev/null +++ b/x11/openmotif/patches/patch-bj @@ -0,0 +1,13 @@ +$NetBSD: patch-bj,v 1.1 2005/06/27 14:08:15 wiz Exp $ + +--- config/imake/imake.c.orig 2004-03-04 18:45:52.000000000 +0100 ++++ config/imake/imake.c 2004-08-10 17:20:20.000000000 +0200 +@@ -145,7 +145,7 @@ + * #include INCLUDE_IMAKEFILE + * + */ +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + /* This needs to be before _POSIX_SOURCE gets defined */ + # include + # include -- cgit v1.2.3