diff options
| author | hubertf <hubertf@pkgsrc.org> | 2000-02-18 12:38:14 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2000-02-18 12:38:14 +0000 |
| commit | f427bc523c856e2280310e5ec16eaf97fba03dc7 (patch) | |
| tree | e59b9843dc31ca365bd123297082ee60353d874a /editors | |
| parent | bebe9558b58bf522034f989f0506a8de393bdf90 (diff) | |
| download | pkgsrc-f427bc523c856e2280310e5ec16eaf97fba03dc7.tar.gz | |
Update to V5.5.6 beta 2. Changes:
- Localisation updates
- some bugfixes
- Most important: Support of 16bit displays
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/framemaker/Makefile | 17 | ||||
| -rw-r--r-- | editors/framemaker/files/wrapper | 16 |
2 files changed, 10 insertions, 23 deletions
diff --git a/editors/framemaker/Makefile b/editors/framemaker/Makefile index 2fc4c49ad5b..aa61231371e 100644 --- a/editors/framemaker/Makefile +++ b/editors/framemaker/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/01/27 21:18:55 abs Exp $ +# $NetBSD: Makefile,v 1.2 2000/02/18 12:38:14 hubertf Exp $ # DISTNAME= fmlinux -PKGNAME= framemaker-5.5.6 +PKGNAME= framemaker-5.5.6.2 CATEGORIES= editors textproc MASTER_SITES= ftp://ftp.adobe.com/pub/adobe/magic/framemaker/unix/5.x/ \ ftp://ftp.adobe.com/pub/adobe/magic/framemaker/unix/5.x/beta/ -DISTFILES= fmlinux.txt fmlinux.tar.gz dictionaries.txt \ +DISTFILES= fmlinux.txt fmlinux2.tar.gz dictionaries.txt \ dictionaries.tar.gz help.txt help.tar.gz manuals.txt \ manuals.tar.gz @@ -15,7 +15,8 @@ HOMEPAGE= http://www.adobe.com/products/framemaker/fmlinux.html .include "../../mk/bsd.prefs.mk" .if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386") -DEPENDS= suse_linux>=6.1:../../emulators/suse_linux +# At least on 1.4.2, suse-6.3 is NOT ok, you need 6.1! +DEPENDS+= suse_linux>=6.1:../../emulators/suse_linux .endif MIRROR_DISTFILE=NO @@ -27,7 +28,9 @@ NO_CDROM= DIST_SUBDIR= framemaker # BROKEN= Does not work with suse 6.3 shlibs.rpm - needs 6.1 +.if !make(fetch) ONLY_FOR_PLATFORM=*-*-i386 +.endif WRKSRC= ${WRKDIR}/FM556_linux PLIST_SRC= ${WRKDIR}/PLIST.src @@ -35,8 +38,8 @@ FMHOME= ${PREFIX}/lib/FM556_linux FMARCH= bin/scripts/fmarch WRAPPERS= fmaddlicense maker demomaker -EXTRACT_ONLY= fmlinux.tar.gz -EXTRACT_CMD= ${GTAR} xvzf ${_DISTDIR}/fmlinux.tar.gz FM556_linux/${FMARCH} +EXTRACT_ONLY= fmlinux2.tar.gz +EXTRACT_CMD= ${GTAR} xvzf ${_DISTDIR}/fmlinux2.tar.gz FM556_linux/${FMARCH} do-build: .for wrap in ${WRAPPERS} @@ -45,7 +48,7 @@ do-build: .endfor do-install: - @${GTAR} xzvCf ${PREFIX}/lib ${_DISTDIR}/fmlinux.tar.gz + @${GTAR} xzvCf ${PREFIX}/lib ${_DISTDIR}/fmlinux2.tar.gz @${GTAR} xzvCf ${FMHOME}/fminit/usenglish ${_DISTDIR}/manuals.tar.gz @${GTAR} xzvCf ${FMHOME}/fminit/usenglish ${_DISTDIR}/help.tar.gz @${GTAR} xzvCf ${FMHOME}/fminit ${_DISTDIR}/dictionaries.tar.gz diff --git a/editors/framemaker/files/wrapper b/editors/framemaker/files/wrapper index 6a06ec09dc0..70e021d08af 100644 --- a/editors/framemaker/files/wrapper +++ b/editors/framemaker/files/wrapper @@ -23,22 +23,6 @@ END fi fi -# For some reason it crashes on 15 or 16 bit displays... not nice -# -if [ -z "$FM_BYPASS_DISPLAY_DEPTH_CHECK" ] ; then - DEPTH=`xdpyinfo | awk '/depth of root window/ {print $5}'` - if [ "$DEPTH" = 15 -o "$DEPTH" = 16 ]; then - cat << END -ABORTING: FrameMaker does not currently work on 15 or 16 bit displays, - please set your display to 8, 24, or 32 bit. - - Set the environment var 'FM_BYPASS_DISPLAY_DEPTH_CHECK' to bypass. - -END - FM_ABORT=1 - fi -fi - # Avoid 'show one error, fix it, then run again only to see another' # if [ -n "$FM_ABORT" ];then |