pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/openmotif Add DragonFly support (untested). Provid...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/161fde5d28ae
branches:  trunk
changeset: 496387:161fde5d28ae
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jun 27 14:08:15 2005 +0000

description:
Add DragonFly support (untested). Provided by Jörg Sonnenberger
in PR 30258.

While here, clean up pkglint warnings.

diffstat:

 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   |   53 ++++++--
 x11/openmotif/patches/patch-bj   |   13 ++
 6 files changed, 342 insertions(+), 48 deletions(-)

diffs (truncated from 532 to 300 lines):

diff -r 7f7d79e9bf3a -r 161fde5d28ae x11/openmotif/Makefile
--- a/x11/openmotif/Makefile    Mon Jun 27 13:34:41 2005 +0000
+++ b/x11/openmotif/Makefile    Mon Jun 27 14:08:15 2005 +0000
@@ -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 @@
 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-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 @@
 # 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 -r 7f7d79e9bf3a -r 161fde5d28ae x11/openmotif/distinfo
--- a/x11/openmotif/distinfo    Mon Jun 27 13:34:41 2005 +0000
+++ b/x11/openmotif/distinfo    Mon Jun 27 14:08:15 2005 +0000
@@ -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-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-bg) = 582f455b066bd4f12160d719c885e9d8423632e5
 SHA1 (patch-bh) = 4025190b6200398b54cfa075da8976e96bf7c3ee
 SHA1 (patch-bi) = 4dced20ce293f8635f121f77e9112e93766b9723
+SHA1 (patch-bj) = c7e2e4613d6911628ecc4f019ab5f78a2c4c03ea
diff -r 7f7d79e9bf3a -r 161fde5d28ae x11/openmotif/files/DragonFly.cf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/openmotif/files/DragonFly.cf  Mon Jun 27 14:08:15 2005 +0000
@@ -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 \                     @@\



Home | Main Index | Thread Index | Old Index