diff options
| author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2001-11-23 08:48:04 +0000 |
|---|---|---|
| committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2001-11-23 08:48:04 +0000 |
| commit | b43bb5f8ffe14c214eb6955eac0ae1b14b2b9482 (patch) | |
| tree | 9da6350ffaea8abb225ff6e2064d5f7494b908ab /x11-toolkits/open-motif | |
| parent | d2295f27ebf2b8ff6f01fd84d939808040999e22 (diff) | |
| download | ports-b43bb5f8ffe14c214eb6955eac0ae1b14b2b9482.tar.gz ports-b43bb5f8ffe14c214eb6955eac0ae1b14b2b9482.zip | |
stop installing host.def, Motif.tmpl/rules and use stock one.
This unbreaks XFree86-4-Server building.
PR: 31534
Non-response from: maintainer
Notes
Notes:
svn path=/head/; revision=50406
Diffstat (limited to 'x11-toolkits/open-motif')
| -rw-r--r-- | x11-toolkits/open-motif/Makefile | 12 | ||||
| -rw-r--r-- | x11-toolkits/open-motif/files/patch-cf-Imakefile | 12 | ||||
| -rw-r--r-- | x11-toolkits/open-motif/pkg-plist | 5 |
3 files changed, 7 insertions, 22 deletions
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index c2f092e074fa..b5032ddd785f 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -8,7 +8,7 @@ PORTNAME= open-motif PORTVERSION= 2.1.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ftp://openmotif.opengroup.org/pub/openmotif/R${PORTVERSION}/tars/ \ ftp://ftp.opengroup.org/pub/openmotif/R${PORTVERSION}/tars/ \ @@ -666,16 +666,6 @@ post-configure: @${CP} ${X11BASE}/bin/imake ${WRKSRC}/config/imake/ cd ${WRKSRC} && ${MAKE} imake.bootstrap -pre-install: - @if [ -f ${PREFIX}/lib/X11/config/host.def.orig ]; then \ - : ; \ - elif [ -f ${PREFIX}/lib/X11/config/host.def ]; then \ - ${MV} ${PREFIX}/lib/X11/config/host.def \ - ${PREFIX}/lib/X11/config/host.def.orig; \ - else \ - : ; \ - fi - post-install: share-doc share-guides share-examples ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .for dir in Mrm Xm diff --git a/x11-toolkits/open-motif/files/patch-cf-Imakefile b/x11-toolkits/open-motif/files/patch-cf-Imakefile index d60a021faa02..24be3044b382 100644 --- a/x11-toolkits/open-motif/files/patch-cf-Imakefile +++ b/x11-toolkits/open-motif/files/patch-cf-Imakefile @@ -1,11 +1,11 @@ ---- config/cf/Imakefile.org Fri Apr 28 08:03:58 2000 -+++ config/cf/Imakefile Sat Aug 5 04:49:26 2000 -@@ -98,7 +98,7 @@ - x386.cf \ +--- config/cf/Imakefile.orig Fri Nov 2 03:58:47 2001 ++++ config/cf/Imakefile Fri Nov 2 03:59:06 2001 +@@ -121,8 +121,6 @@ + QNX.cf \ xfree86.cf -INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) -+INSTFILES = Motif.rules Motif.tmpl host.def - +- all:: + InstallMultipleDestFlags(install,$(INSTFILES),$(CONFIGDIR),$(INSTDATFLAGS)) diff --git a/x11-toolkits/open-motif/pkg-plist b/x11-toolkits/open-motif/pkg-plist index 35086e8bcf68..01d76ea14c61 100644 --- a/x11-toolkits/open-motif/pkg-plist +++ b/x11-toolkits/open-motif/pkg-plist @@ -1,7 +1,4 @@ @comment $FreeBSD$ -@exec [ -f %D/lib/X11/config/host.def.orig ] || mv %D/lib/X11/config/host.def %D/lib/X11/config/host.def.orig -lib/X11/config/host.def -@unexec [ -f %D/%F.orig ] && mv %D/%F.orig %D/%F || : %%MOTIF_DEMOS%%bin/DNDDemo %%MOTIF_DEMOS%%bin/UTMXmText %%MOTIF_DEMOS%%bin/aicon @@ -370,9 +367,7 @@ lib/X11/bindings/sun lib/X11/bindings/sun_at lib/X11/bindings/tek lib/X11/bindings/xmbind.alias -lib/X11/config/Motif.rules lib/X11/config/Motif.rules.openmotif -lib/X11/config/Motif.tmpl lib/X11/config/Motif.tmpl.openmotif %%MOTIF_DEMOS%%lib/X11/help/aicon.help %%MOTIF_DEMOS%%lib/X11/help/draw.help |