From 216b13a37cc01aadc8b7bc2b5dafd984fd3b9856 Mon Sep 17 00:00:00 2001 From: sobomax Date: Fri, 14 Jul 2000 11:38:44 +0000 Subject: Update to 0.89 on i386, remove aout bits and cleanup the port. --- x11-toolkits/xforms/Makefile | 46 ++++++++++---------------- x11-toolkits/xforms/distinfo | 5 ++- x11-toolkits/xforms/patches.alpha/patch-aa | 33 +++++++++++++++++++ x11-toolkits/xforms/patches.alpha/patch-ab | 11 +++++++ x11-toolkits/xforms/patches.i386/patch-aa | 53 ++++++++++++++++++++++++++++++ x11-toolkits/xforms/patches.i386/patch-ab | 40 ++++++++++++++++++++++ x11-toolkits/xforms/pkg-descr | 2 ++ x11-toolkits/xforms/pkg-plist | 3 +- 8 files changed, 160 insertions(+), 33 deletions(-) create mode 100644 x11-toolkits/xforms/patches.alpha/patch-aa create mode 100644 x11-toolkits/xforms/patches.alpha/patch-ab create mode 100644 x11-toolkits/xforms/patches.i386/patch-aa create mode 100644 x11-toolkits/xforms/patches.i386/patch-ab (limited to 'x11-toolkits/xforms') diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile index 2dc89b62191..56748236846 100644 --- a/x11-toolkits/xforms/Makefile +++ b/x11-toolkits/xforms/Makefile @@ -6,43 +6,33 @@ # PORTNAME= xforms -PORTVERSION= 0.88.1 -CATEGORIES= graphics x11-toolkits +PORTVERSION= 0.89 +CATEGORIES= x11-toolkits graphics +MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/${MASTER_SITE_SUBDIR}/ EXTRACT_SUFX= .tgz +MAINTAINER= gena@NetVision.net.il + USE_X_PREFIX= yes INSTALLS_SHLIB= yes -.include +WRKSRC= ${WRKDIR}/${PORTNAME} -.if ${PORTOBJFORMAT} == "elf" -.if ${MACHINE_ARCH} == "alpha" -DISTNAME= bxform-freebsd-alpha -.else -DISTNAME= bxform-freebsd-elf -.endif -MASTER_SITES= ${MASTER_SITE_LOCAL} \ - http://bragg.phys.uwm.edu/~zhao/ftp/ -MASTER_SITE_SUBDIR= steve -PATCHDIR= ${.CURDIR}/patches.elf -.else -DISTNAME= bxform-088 -MASTER_SITES= ftp://bragg.phys.uwm.edu/pub/xforms/freeBSD/ \ - ftp://ftp.via.ecp.fr/pub2/xforms/freeBSD/ \ - ftp://ftp.st.ryukoku.ac.jp/pub/X11/xforms/freeBSD/ -.endif - -MAINTAINER= gena@NetVision.net.il - -PATCH_STRIP= -p0 -t -WRKSRC= ${WRKDIR}/xforms MAN1= fdesign.1 fd2ps.1 MAN5= xforms.5 -post-install: -.if !defined(NOMANCOMPRESS) - @${RM} ${PREFIX}/man/man5/forms.5 - @${LN} -fs xforms.5.gz ${PREFIX}/man/man5/forms.5.gz +.include + +.if ${MACHINE_ARCH} == "alpha" +PORTVERSION= 0.88 +DISTNAME= bxform-${PORTVERSION:S/.//} +MASTER_SITE_SUBDIR= freeBSD-alpha +PATCHDIR= ${MASTERDIR}/patches.alpha +.else +DISTNAME= bxform-${PORTVERSION:S/.//}-elf +MASTER_SITE_SUBDIR= freeBSD +PATCHDIR= ${MASTERDIR}/patches.i386 +MAN1+= iconvert.1 .endif .include diff --git a/x11-toolkits/xforms/distinfo b/x11-toolkits/xforms/distinfo index 4a835c288b0..bfb07bf3693 100644 --- a/x11-toolkits/xforms/distinfo +++ b/x11-toolkits/xforms/distinfo @@ -1,3 +1,2 @@ -MD5 (bxform-088.tgz) = 106c6d429e1b2a11f460e5375c5d51c6 -MD5 (bxform-freebsd-alpha.tgz) = c5451ac858392230ee84a7caea5a153f -MD5 (bxform-freebsd-elf.tgz) = 7f95c27c217d7c0509463bab1b56aa17 +MD5 (bxform-088.tgz) = c5451ac858392230ee84a7caea5a153f +MD5 (bxform-089-elf.tgz) = db961972b4cdc09043c367854b07dcff diff --git a/x11-toolkits/xforms/patches.alpha/patch-aa b/x11-toolkits/xforms/patches.alpha/patch-aa new file mode 100644 index 00000000000..faef06f3ada --- /dev/null +++ b/x11-toolkits/xforms/patches.alpha/patch-aa @@ -0,0 +1,33 @@ +--- Makefile.orig Fri Jul 14 13:55:28 2000 ++++ Makefile Fri Jul 14 13:59:34 2000 +@@ -15,12 +15,14 @@ + SYSLIB=-lX11 -lm + SHELL=/bin/sh + +-FORMHEADER=forms.h +-FORMLIB=libforms.a +- + .include "mkconfig.h" + ##### don't change anything after this line #### + ++all: link ++ ++link: ++ -@mv FORMS/libforms.a FORMS/$(FORMLIB); ++ + demo: + @(cd DEMOS; make) + +@@ -40,9 +42,9 @@ + cp FORMS/xforms.5 $(MAN5_DIR); chmod $(MANMODE) $(MAN5_DIR)/xforms.5 + cp DESIGN/fdesign.1 $(MAN1_DIR); chmod $(MANMODE) $(MAN1_DIR)/fdesign.1 + cp fd2ps/fd2ps.1 $(MAN1_DIR); chmod $(MANMODE) $(MAN1_DIR)/fd2ps.1 +- @if [ ! -f $(MAN5_DIR)/forms.5 ]; then\ +- ln -s $(MAN5_DIR)/xforms.5 $(MAN5_DIR)/forms.5;\ +- fi ++# @if [ ! -f $(MAN5_DIR)/forms.5 ]; then\ ++# ln -s $(MAN5_DIR)/xforms.5 $(MAN5_DIR)/forms.5;\ ++# fi + clean: + (cd DEMOS; make $@) + empty: diff --git a/x11-toolkits/xforms/patches.alpha/patch-ab b/x11-toolkits/xforms/patches.alpha/patch-ab new file mode 100644 index 00000000000..286412acfc3 --- /dev/null +++ b/x11-toolkits/xforms/patches.alpha/patch-ab @@ -0,0 +1,11 @@ +--- mkconfig.h.orig Fri Jul 14 14:15:02 2000 ++++ mkconfig.h Fri Jul 14 14:15:15 2000 +@@ -27,7 +27,7 @@ + DOC_DIR=$(LIB_TOPDIR)/lib + MANMODE=644 + # name and header of the library +-FORMLIB=libforms.a ++FORMLIB=libxforms.a + FORMHEADER=forms.h + + # make shared lib: $(MKSHLIB) diff --git a/x11-toolkits/xforms/patches.i386/patch-aa b/x11-toolkits/xforms/patches.i386/patch-aa new file mode 100644 index 00000000000..65b59997889 --- /dev/null +++ b/x11-toolkits/xforms/patches.i386/patch-aa @@ -0,0 +1,53 @@ +--- Makefile.orig Mon Aug 2 01:17:35 1999 ++++ Makefile Fri Jul 14 14:05:58 2000 +@@ -15,14 +15,17 @@ + SYSLIB=-lX11 -lm + SHELL=/bin/sh + +-FORMHEADER=forms.h +-FORMLIB=libforms.a +- + .include "mkconfig.h" + + + ##### don't change anything after this line #### + ++all: link ++ ++link: ++ @mv FORMS/libforms.a FORMS/$(FORMLIB); ++ @mv FORMS/$(SHARED_LIB) FORMS/$(SHARED_NAME) ++ + demo: + @(cd DEMOS; make) + +@@ -34,11 +37,11 @@ + cp FORMS/$(FORMLIB) $(LIB_DIR);chmod $(LIBMODE) $(LIB_DIR)/$(FORMLIB) + cp DESIGN/fdesign $(BIN_DIR); chmod $(BINMODE) $(BIN_DIR)/fdesign + cp fd2ps/fd2ps $(BIN_DIR); chmod $(BINMODE) $(BIN_DIR)/fd2ps +- -@if [ "$(SHARED_LIB)" != "" ]; then\ +- cp FORMS/$(SHARED_LIB) $(LIB_DIR); \ +- chmod $(LIBMODE) $(LIB_DIR)/$(SHARED_LIB);\ +- if [ "$(SHARED_NAME)" != "" ]; then\ +- $(LN) $(LIB_DIR)/$(SHARED_LIB) $(LIB_DIR)/$(SHARED_NAME);\ ++ -@if [ "$(SHARED_NAME)" != "" ]; then\ ++ cp FORMS/$(SHARED_NAME) $(LIB_DIR); \ ++ chmod $(LIBMODE) $(LIB_DIR)/$(SHARED_NAME);\ ++ if [ "$(SHARED_SO)" != "" ]; then\ ++ $(LN) $(LIB_DIR)/$(SHARED_NAME) $(LIB_DIR)/$(SHARED_SO);\ + fi \ + fi + cp FORMS/$(FORMHEADER) $(HEADER_DIR);\ +@@ -47,9 +50,9 @@ + cp DESIGN/fdesign.1 $(MAN1_DIR); chmod $(MANMODE) $(MAN1_DIR)/fdesign.1 + cp fd2ps/fd2ps.1 $(MAN1_DIR); chmod $(MANMODE) $(MAN1_DIR)/fd2ps.1 + cp DEMOS/iconvert.1 $(MAN1_DIR); chmod $(MANMODE) $(MAN1_DIR)/iconvert.1 +- @if [ ! -f $(MAN5_DIR)/forms.5 ]; then\ +- ln -s $(MAN5_DIR)/xforms.5 $(MAN5_DIR)/forms.5;\ +- fi ++# @if [ ! -f $(MAN5_DIR)/forms.5 ]; then\ ++# ln -s $(MAN5_DIR)/xforms.5 $(MAN5_DIR)/forms.5;\ ++# fi + clean: + (cd DEMOS; make $@) + empty: diff --git a/x11-toolkits/xforms/patches.i386/patch-ab b/x11-toolkits/xforms/patches.i386/patch-ab new file mode 100644 index 00000000000..1d88a7c7c8c --- /dev/null +++ b/x11-toolkits/xforms/patches.i386/patch-ab @@ -0,0 +1,40 @@ +--- mkconfig.h.orig Mon Aug 2 01:11:50 1999 ++++ mkconfig.h Fri Jul 14 13:32:19 2000 +@@ -13,7 +13,7 @@ + + # where the library should be installed + +-LIB_TOPDIR=/usr/X11R6 ++LIB_TOPDIR=$(PREFIX) + + LIB_DIR=$(LIB_TOPDIR)/lib + LIBMODE=644 +@@ -21,21 +21,21 @@ + HEADER_DIR=$(LIB_TOPDIR)/include + HEADERMODE=644 + +-BIN_DIR=/usr/local/bin ++BIN_DIR=$(PREFIX)/bin + BINMODE=711 + +-MAN5_DIR=/usr/man/man5 +-MAN1_DIR=/usr/man/man1 +-DOC_DIR=/usr/local/lib ++MAN5_DIR=$(PREFIX)/man/man5 ++MAN1_DIR=$(PREFIX)/man/man1 ++DOC_DIR=$(PREFIX)/share/xforms + MANMODE=644 + # name and header of the library +-FORMLIB=libforms.a ++FORMLIB=libxforms.a + FORMHEADER=forms.h + + # make shared lib: $(MKSHLIB) + SHARED_LIB=libforms.so.0.89 +-SHARED_NAME=libforms.so +-SHARED_SO=libforms.so ++SHARED_NAME=libxforms.so.0 ++SHARED_SO=libxforms.so + MKSHLIB=ld -shared -soname $(SHARED_SO) -o $(SHARED_LIB)\ + `ls *.o|grep -v glcanvas.o` ulib/*.o ../xpm-3.4k/lib/libXpm.a $(JPEG) -lc + diff --git a/x11-toolkits/xforms/pkg-descr b/x11-toolkits/xforms/pkg-descr index b4676511f59..5eb050b02e3 100644 --- a/x11-toolkits/xforms/pkg-descr +++ b/x11-toolkits/xforms/pkg-descr @@ -19,3 +19,5 @@ To use the mailing list, send your message to Remember your message will be sent to many people. Please DO NOT send subscribe/unsubscribe messages to the list. + +WWW: http://world.std.com/~xforms/ diff --git a/x11-toolkits/xforms/pkg-plist b/x11-toolkits/xforms/pkg-plist index 33015c15a4f..8598633a297 100644 --- a/x11-toolkits/xforms/pkg-plist +++ b/x11-toolkits/xforms/pkg-plist @@ -2,6 +2,5 @@ bin/fd2ps bin/fdesign include/forms.h lib/libxforms.a -lib/libxforms.so.0.88 lib/libxforms.so -man/man5/forms.5.gz +lib/libxforms.so.0 -- cgit 37fc8c5c06f0390871302c47b254c4e35bf53'>From Sergey:andreas2000-12-022-0/+52 * Rename ${FILESDIR}/patch-* to ${PATCHDIR}/extra-patch-*.asami2000-10-081-1/+1 * patch submission, cisco got a copy.andreas2000-08-031-0/+22 * - update from F4.0.3 to F4.0.4andreas2000-07-162-4/+4 * As threatened on freebsd-ports: all startup scripts know about the twotg2000-07-052-3/+21 * Update with the new PORTNAME/PORTVERSION variablescpiazza2000-04-101-3/+3 * Use EXTRA_PATCHES instead of copying a patch into ${PATCHDIR}, whichasami2000-03-041-6/+1 * General comment cleanups.hoek1999-12-291-1/+1 * Port update after repository copyandreas1999-11-1010-150/+143 * oops. Saved the wrong file, now descr. is o.k. again.andreas1999-10-151-135/+4 * Style.andreas1999-10-151-4/+4 * Bring it back again.andreas1999-10-1510-0/+512 * Delete port: tac_plusfenner1999-09-0710-415/+0 * $Id$ -> $FreeBSD$peter1999-08-301-1/+1 * echo -> ${ECHO} or ${ECHO_MSG} and in some cases, move echo stuffmharo1999-08-281-3/+3 * chmod -> ${CHMOD}mharo1999-08-231-2/+2 * Commit #3/4 to enforce caps, no period.hoek1999-06-271-1/+1 * WWW: This is definately the daemon's work. In Chuck we trust.mharo1999-05-031-2/+1 * Adjust port Makefiles to new EXTRACT_* variable defaults. See log ofasami1999-02-031-2/+4 * This netted the largest set of mis-installed manpages, yet!hoek1998-08-191-1/+0 * File moved on MASTER_SITE.jseger1998-01-161-2/+2 * - Fix problem with configuration file name in the startup script.max1997-09-176-12/+166