diff options
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/xforms/Makefile | 16 | ||||
-rw-r--r-- | x11-toolkits/xforms/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/xforms/files/patch-aa | 20 | ||||
-rw-r--r-- | x11-toolkits/xforms/files/patch-ab | 20 | ||||
-rw-r--r-- | x11-toolkits/xforms/patches.alpha/patch-aa | 33 | ||||
-rw-r--r-- | x11-toolkits/xforms/patches.alpha/patch-ab | 11 | ||||
-rw-r--r-- | x11-toolkits/xforms/patches.i386/patch-aa | 53 | ||||
-rw-r--r-- | x11-toolkits/xforms/patches.i386/patch-ab | 40 | ||||
-rw-r--r-- | x11-toolkits/xforms/pkg-plist | 6 |
9 files changed, 51 insertions, 150 deletions
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile index 3f12dc853aee..ffb8a60300f4 100644 --- a/x11-toolkits/xforms/Makefile +++ b/x11-toolkits/xforms/Makefile @@ -6,7 +6,8 @@ # PORTNAME= xforms -PORTVERSION= 0.89 +PORTVERSION= 0.88 +PORTEPOCH= 1 CATEGORIES= x11-toolkits graphics MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/${MASTER_SITE_SUBDIR}/ EXTRACT_SUFX= .tgz @@ -15,27 +16,24 @@ MAINTAINER= gena@NetVision.net.il USE_X_PREFIX= yes INSTALLS_SHLIB= yes +NO_FILTER_SHLIBS= yes WRKSRC= ${WRKDIR}/${PORTNAME} MAN1= fdesign.1 fd2ps.1 -MAN5= xforms.5 +MAN5= xforms.5 forms.5 .include <bsd.port.pre.mk> .if ${MACHINE_ARCH} == "alpha" -PORTVERSION= 0.88 -DISTNAME= bxform-${PORTVERSION:S/.//} MASTER_SITE_SUBDIR= freeBSD-alpha -PATCHDIR= ${MASTERDIR}/patches.alpha +DISTNAME= bxform-${PORTVERSION:S/.//} .else -DISTNAME= bxform-${PORTVERSION:S/.//}-elf MASTER_SITE_SUBDIR= freeBSD -PATCHDIR= ${MASTERDIR}/patches.i386 -MAN1+= iconvert.1 +DISTNAME= bxform-${PORTVERSION:S/.//}-elf .endif post-install: - @${LN} -sf ${PREFIX}/lib/libxforms.so.0 ${PREFIX}/lib/libforms.so + @${LN} -sf ${PREFIX}/lib/libforms.so.0.88 ${PREFIX}/lib/libforms.so.0 .include <bsd.port.post.mk> diff --git a/x11-toolkits/xforms/distinfo b/x11-toolkits/xforms/distinfo index bfb07bf3693f..de0043d81a76 100644 --- a/x11-toolkits/xforms/distinfo +++ b/x11-toolkits/xforms/distinfo @@ -1,2 +1,2 @@ MD5 (bxform-088.tgz) = c5451ac858392230ee84a7caea5a153f -MD5 (bxform-089-elf.tgz) = db961972b4cdc09043c367854b07dcff +MD5 (bxform-088-elf.tgz) = 30d178a335f71422eaf20464ce305854 diff --git a/x11-toolkits/xforms/files/patch-aa b/x11-toolkits/xforms/files/patch-aa new file mode 100644 index 000000000000..be4f73dea94f --- /dev/null +++ b/x11-toolkits/xforms/files/patch-aa @@ -0,0 +1,20 @@ +--- mkconfig.h.orig Sun Feb 4 18:49:19 2001 ++++ mkconfig.h Sun Feb 4 18:51:40 2001 +@@ -10,7 +10,7 @@ + + # where the library should be installed + +-LIB_TOPDIR=/usr ++LIB_TOPDIR=${PREFIX} + + LIB_DIR=$(LIB_TOPDIR)/lib + LIBMODE=644 +@@ -18,7 +18,7 @@ + HEADER_DIR=$(LIB_TOPDIR)/include + HEADERMODE=644 + +-BIN_DIR=/usr/local/bin ++BIN_DIR=${PREFIX}/bin + BINMODE=711 + + MAN5_DIR=$(LIB_TOPDIR)/man/man5 diff --git a/x11-toolkits/xforms/files/patch-ab b/x11-toolkits/xforms/files/patch-ab new file mode 100644 index 000000000000..30e38468d156 --- /dev/null +++ b/x11-toolkits/xforms/files/patch-ab @@ -0,0 +1,20 @@ + +$FreeBSD$ + +--- Makefile.orig Mon Oct 26 05:04:54 1998 ++++ Makefile Fri Mar 2 20:32:52 2001 +@@ -41,9 +41,13 @@ + 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;\ ++ cp $(MAN5_DIR)/xforms.5 $(MAN5_DIR)/forms.5;\ + fi + clean: + (cd DEMOS; make $@) + empty: + (cd DEMOS; make $@) ++ ++# add blank all target ++all: ++ diff --git a/x11-toolkits/xforms/patches.alpha/patch-aa b/x11-toolkits/xforms/patches.alpha/patch-aa deleted file mode 100644 index faef06f3adac..000000000000 --- a/x11-toolkits/xforms/patches.alpha/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 deleted file mode 100644 index 286412acfc34..000000000000 --- a/x11-toolkits/xforms/patches.alpha/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 65b599978897..000000000000 --- a/x11-toolkits/xforms/patches.i386/patch-aa +++ /dev/null @@ -1,53 +0,0 @@ ---- 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 deleted file mode 100644 index 1d88a7c7c8c2..000000000000 --- a/x11-toolkits/xforms/patches.i386/patch-ab +++ /dev/null @@ -1,40 +0,0 @@ ---- 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-plist b/x11-toolkits/xforms/pkg-plist index 5379745a437b..bc5bfe0917fd 100644 --- a/x11-toolkits/xforms/pkg-plist +++ b/x11-toolkits/xforms/pkg-plist @@ -1,7 +1,7 @@ bin/fd2ps bin/fdesign include/forms.h +lib/libforms.a lib/libforms.so -lib/libxforms.a -lib/libxforms.so -lib/libxforms.so.0 +lib/libforms.so.0 +lib/libforms.so.0.88 |