pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/openmotif Update OpenMotif to 2.2.3. Too many chan...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c4f53efd6a6a
branches: trunk
changeset: 504522:c4f53efd6a6a
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon Dec 12 19:55:41 2005 +0000
description:
Update OpenMotif to 2.2.3. Too many changes to list here, but most
importantly no more imake usage.
diffstat:
x11/openmotif/DEINSTALL | 32 -
x11/openmotif/INSTALL | 38 -
x11/openmotif/Makefile | 93 +---
x11/openmotif/PLIST | 115 ++++-
x11/openmotif/distinfo | 63 +--
x11/openmotif/files/DragonFly.cf | 228 -----------
x11/openmotif/files/NoInstall.rules | 56 --
x11/openmotif/files/OpenMotif.def | 13 -
x11/openmotif/patches/patch-aa | 30 +-
x11/openmotif/patches/patch-ab | 21 +-
x11/openmotif/patches/patch-ac | 24 +-
x11/openmotif/patches/patch-ad | 35 +-
x11/openmotif/patches/patch-ae | 25 +-
x11/openmotif/patches/patch-af | 51 +-
x11/openmotif/patches/patch-ag | 47 +-
x11/openmotif/patches/patch-ah | 22 +-
x11/openmotif/patches/patch-ai | 12 -
x11/openmotif/patches/patch-aj | 22 +-
x11/openmotif/patches/patch-ak | 20 +-
x11/openmotif/patches/patch-al | 13 -
x11/openmotif/patches/patch-am | 9 -
x11/openmotif/patches/patch-an | 13 -
x11/openmotif/patches/patch-ao | 13 -
x11/openmotif/patches/patch-ap | 695 ------------------------------------
x11/openmotif/patches/patch-aq | 11 -
x11/openmotif/patches/patch-ar | 77 ---
x11/openmotif/patches/patch-as | 69 ---
x11/openmotif/patches/patch-at | 12 -
x11/openmotif/patches/patch-au | 32 -
x11/openmotif/patches/patch-av | 16 -
x11/openmotif/patches/patch-aw | 134 ------
x11/openmotif/patches/patch-ax | 201 ----------
x11/openmotif/patches/patch-ay | 61 ---
x11/openmotif/patches/patch-az | 6 +-
x11/openmotif/patches/patch-bh | 40 +-
x11/openmotif/patches/patch-bj | 13 -
36 files changed, 294 insertions(+), 2068 deletions(-)
diffs (truncated from 2900 to 300 lines):
diff -r 1d8351276277 -r c4f53efd6a6a x11/openmotif/DEINSTALL
--- a/x11/openmotif/DEINSTALL Mon Dec 12 19:53:12 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.4 2003/08/30 20:23:08 jlam Exp $
-
-X11BASE=@X11BASE@
-MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules
-MOTIF_TMPL=${PKG_PREFIX}/lib/X11/config/Motif.tmpl
-X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
-HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
-
-case ${STAGE} in
-POST-DEINSTALL)
- ${ECHO} -n "Updating ${HOSTDEF}..."
- ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak
- ( ${GREP} -v OpenMotif ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF}
- ${RM} -f ${HOSTDEF}.bak
- if [ ${PKG_PREFIX} != ${X11BASE} ] && \
- [ -f ${X11_HOSTDEF} ] && \
- ${CMP} -s ${X11_HOSTDEF} ${HOSTDEF}
- then
- ${RM} -f ${HOSTDEF}
- fi
- ${ECHO} "done."
-
- ${RM} -f ${MOTIF_RULES} ${MOTIF_TMPL}
- if [ ${PKG_PREFIX} = ${X11BASE} ]
- then
- ${MV} -f ${MOTIF_RULES}.openmotif.bak ${MOTIF_RULES} 2>/dev/null
- ${MV} -f ${MOTIF_TMPL}.openmotif.bak ${MOTIF_TMPL} 2>/dev/null
- fi
-
- ${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE}
- ;;
-esac
diff -r 1d8351276277 -r c4f53efd6a6a x11/openmotif/INSTALL
--- a/x11/openmotif/INSTALL Mon Dec 12 19:53:12 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# $NetBSD: INSTALL,v 1.6 2004/03/12 02:03:25 reed Exp $
-
-X11BASE=@X11BASE@
-MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules
-MOTIF_TMPL=${PKG_PREFIX}/lib/X11/config/Motif.tmpl
-X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
-HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
-
-case ${STAGE} in
-POST-INSTALL)
- if [ ${PKG_PREFIX} = ${X11BASE} ]
- then
- ${MV} -f ${MOTIF_RULES} ${MOTIF_RULES}.openmotif.bak 2>/dev/null
- ${MV} -f ${MOTIF_TMPL} ${MOTIF_TMPL}.openmotif.bak 2>/dev/null
- fi
- ${LN} -sf OpenMotif.rules ${MOTIF_RULES}
- ${LN} -sf OpenMotif.tmpl ${MOTIF_TMPL}
-
- if [ ${PKG_PREFIX} = ${X11BASE} -o -f ${HOSTDEF} ]
- then
- ${ECHO} -n "Updating ${HOSTDEF} for OpenMotif ..."
- ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak
- else
- ${ECHO} -n "Creating ${HOSTDEF} for OpenMotif ..."
- if [ -f ${X11_HOSTDEF} ]
- then
- ${CP} -f ${X11_HOSTDEF} ${HOSTDEF}.bak
- else
- ${CP} -f /dev/null ${HOSTDEF}.bak
- fi
- fi
- ( ${GREP} -v OpenMotif ${HOSTDEF}.bak; \
- ${ECHO} '#include <OpenMotif.def>'; \
- ) > ${HOSTDEF}
- ${RM} -f ${HOSTDEF}.bak
- ${ECHO} "done."
- ;;
-esac
diff -r 1d8351276277 -r c4f53efd6a6a x11/openmotif/Makefile
--- a/x11/openmotif/Makefile Mon Dec 12 19:53:12 2005 +0000
+++ b/x11/openmotif/Makefile Mon Dec 12 19:55:41 2005 +0000
@@ -1,20 +1,12 @@
-# $NetBSD: Makefile,v 1.38 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/12 19:55:41 joerg Exp $
-PKGVER= 2.1.30
-DISTNAME= openmotif${PKGVER}
+PKGVER= 2.2.3
+DISTNAME= openMotif-${PKGVER}
PKGNAME= openmotif-${PKGVER}
-PKGREVISION= 4
CATEGORIES= x11
-MOTIF_SITES= ftp://openmotif.opengroup.org/pub/openmotif/R${PKGVER}/ \
- ftp://ftp.opengroup.org/pub/openmotif/R${PKGVER}/ \
- ftp://ftp.kddlabs.co.jp/X11/openmotif/R${PKGVER}/
-MASTER_SITES= ${MOTIF_SITES:=tars/}
+MASTER_SITES= http://ftp.motifzone.com/src/
-PATCH_SITES= ${MOTIF_SITES:=fixes/}
-PATCHFILES= patch1 patch2 patch3 patch4 patch5
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= tech-pkg%NetBSD.org@localhost
+MAINTAINER= joerg%NetBSD.org@localhost
HOMEPAGE= http://www.opengroup.org/openmotif/
COMMENT= The Open Group Motif toolkit for the X Window System
@@ -22,43 +14,21 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/motif
-DIST_SUBDIR= openmotif
USE_X11BASE= yes
-USE_PKGINSTALL= yes
-BUILD_TARGET= World
-USE_TOOLS+= tbl
-
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-
-FILES_SUBST+= X11BASE=${X11BASE:Q}
-
-.include "../../mk/bsd.prefs.mk"
+USE_LIBTOOL= yes
+USE_TOOLS= gmake tbl
+GNU_CONFIGURE= yes
-.if ${OPSYS} == "FreeBSD"
-PLIST_SUBST+= AVAILABLE="@comment "
-.else
-PLIST_SUBST+= AVAILABLE=
-.endif
+SUBST_CLASSES+= man_rename
+SUBST_STAGE.man_rename= pre-configure
+SUBST_MESSAGE.man_rename= "Fixing hardcoded paths."
+SUBST_FILES.man_rename= doc/man/man3/Makefile.in
+SUBST_SED.man_rename= -e 's: Core.3: XCore.3:g' \
+ -e 's: Object.3: XObject.3:g' -e 's: Shell.3: XShell.3:g'
-# We must use GNU make on Linux
-.if ${OPSYS} == "Linux"
-USE_TOOLS+= gmake
-.endif
-
-INSTALLATION_DIRS= lib/X11/config man/man1 man/man3 man/man5
-
-.include "../../mk/x11.buildlink3.mk"
-
-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.*.
-# 3) Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to
+# 2) Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to
# avoid manpage conflicts with other packages.
#
post-patch:
@@ -72,13 +42,6 @@
${MV} -f $${manpage}.fixed $${manpage}; \
done; \
${CP} -f man4/mwmrc.4 man5/mwmrc.5
- cd ${WRKSRC}/config/cf; \
- files="Motif.rules Motif.tmpl"; \
- for configfile in $${files}; do \
- dest="Open$${configfile}"; \
- ${RM} -f $${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; \
@@ -91,18 +54,6 @@
done; \
done
-# Link the appropriate directories since we're building OpenMotif outside
-# of the X11R6 source tree.
-#
-do-configure:
- ${MKDIR} ${WRKSRC}/imports/x11
- cd ${WRKSRC}/imports/x11; for dir in bin include lib; do \
- if [ -d $${dir} ]; then \
- ${RM} $${dir}; \
- fi; \
- ${LN} -s ${BUILDLINK_X11_DIR}/$${dir} $${dir}; \
- done
-
# Filter the manpages through tbl.
post-build:
cd ${WRKSRC}/doc/man; \
@@ -111,17 +62,5 @@
${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 configfile in $${files}; do \
- dest="${PREFIX}/lib/X11/config/Open$${configfile}"; \
- ${INSTALL_DATA} $${configfile} $${dest}; \
- done
- cd ${WRKSRC}/doc/man; \
- for manpage in man1/*.1 man3/*.3 man5/*.5; do \
- ${INSTALL_MAN} $${manpage} ${PREFIX}/man/$${manpage}; \
- done
-
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1d8351276277 -r c4f53efd6a6a x11/openmotif/PLIST
--- a/x11/openmotif/PLIST Mon Dec 12 19:53:12 2005 +0000
+++ b/x11/openmotif/PLIST Mon Dec 12 19:55:41 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/02 23:10:29 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/12/12 19:55:41 joerg Exp $
bin/mwm
bin/uil
bin/xmbind
@@ -27,10 +27,11 @@
include/Xm/ArrowBGP.h
include/Xm/ArrowBP.h
include/Xm/AtomMgr.h
-include/Xm/BaseClassI.h
include/Xm/BaseClassP.h
include/Xm/BulletinB.h
include/Xm/BulletinBP.h
+include/Xm/ButtonBox.h
+include/Xm/ButtonBoxP.h
include/Xm/CacheP.h
include/Xm/CareVisualT.h
include/Xm/CascadeB.h
@@ -40,7 +41,13 @@
include/Xm/ClipWindowP.h
include/Xm/ColorObjP.h
include/Xm/ColorP.h
+include/Xm/ColorS.h
+include/Xm/ColorSP.h
+include/Xm/Column.h
+include/Xm/ColumnP.h
include/Xm/ComboBox.h
+include/Xm/ComboBox2.h
+include/Xm/ComboBox2P.h
include/Xm/ComboBoxP.h
include/Xm/Command.h
include/Xm/CommandP.h
@@ -49,6 +56,9 @@
include/Xm/ContainerP.h
include/Xm/ContainerT.h
include/Xm/CutPaste.h
+include/Xm/DataF.h
+include/Xm/DataFP.h
+include/Xm/DataFSelP.h
include/Xm/DesktopP.h
include/Xm/DialogS.h
include/Xm/DialogSEP.h
@@ -64,17 +74,26 @@
include/Xm/DragOverS.h
include/Xm/DragOverSP.h
include/Xm/DrawP.h
+include/Xm/DrawUtils.h
include/Xm/DrawingA.h
include/Xm/DrawingAP.h
include/Xm/DrawnB.h
include/Xm/DrawnBP.h
+include/Xm/DropDown.h
+include/Xm/DropDownP.h
include/Xm/DropSMgr.h
include/Xm/DropSMgrP.h
include/Xm/DropTrans.h
include/Xm/DropTransP.h
+include/Xm/Ext.h
+include/Xm/Ext18List.h
+include/Xm/Ext18ListP.h
include/Xm/ExtObjectP.h
+include/Xm/ExtP.h
include/Xm/FileSB.h
include/Xm/FileSBP.h
+include/Xm/FontS.h
+include/Xm/FontSP.h
include/Xm/Form.h
include/Xm/FormP.h
include/Xm/Frame.h
@@ -83,6 +102,12 @@
include/Xm/GadgetP.h
include/Xm/GrabShell.h
include/Xm/GrabShellP.h
+include/Xm/Hierarchy.h
+include/Xm/HierarchyP.h
+include/Xm/IconBox.h
+include/Xm/IconBoxP.h
+include/Xm/IconButton.h
+include/Xm/IconButtonP.h
include/Xm/IconFile.h
include/Xm/IconFileP.h
include/Xm/IconG.h
@@ -109,12 +134,20 @@
Home |
Main Index |
Thread Index |
Old Index