diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index f814fb278ef..43186ebfa1c 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,42 +1,26 @@ -# $OpenBSD: Makefile,v 1.20 2002/05/16 13:40:47 naddy Exp $ +# $OpenBSD: Makefile,v 1.21 2002/05/22 05:37:24 form Exp $ +# $RuOBSD: Makefile,v 1.2 2002/05/21 12:19:30 form Exp $ -COMMENT= "GUI toolkit for X11" +COMMENT= "GUI toolkit for X11" -ONLY_FOR_ARCHS= i386 sparc m68k +DISTNAME= xforms-0.9999 +CATEGORIES= x11 +NEED_VERSION= 1.527 +MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/OpenSource/ +EXTRACT_SUFX= .tgz -XFORMS_ARCH= ${MACHINE_ARCH} +HOMEPAGE= http://world.std.com/~xforms/ -DISTNAME= bxform-088 -PKGNAME= xforms-0.88 -CATEGORIES= x11 -NEED_VERSION= 1.522 -MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/$S/ \ - ftp://ftp.fu-berlin.de/unix/X11/gui/xforms/$S/ \ - ftp://ftp.st.ryukoku.ac.jp/pub/X11/xforms/$S/ -S= openBSD-${XFORMS_ARCH} -EXTRACT_SUFX= .tgz -DIST_SUBDIR= xforms/$S - -HOMEPAGE= http://world.std.com/~xforms/ - -# I asked the author and I got permission (OpenBSD is a similar enough case -# to Linux) -- espie@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -FAKE_FLAGS= PREFIX="${PREFIX}" DESTDIR="${WRKINST}" +MAINTAINER= Oleg Safiullin -## Define OBJMACHINE so WRKDIR is defined to be ${MACHINE_ARCH}-specific. -OBJMACHINE= Yes -NO_BUILD= Yes -USE_X11= Yes +USE_X11= Yes +CONFIGURE_STYLE= imake -WRKDIST= ${WRKDIR}/xforms - -post-patch: - @mv -f ${WRKSRC}/mkconfig.h ${WRKSRC}/mkconfig.h.orig - @cp -f ${FILESDIR}/mkconfig.h ${WRKSRC} +BUILD_DEPENDS= ::graphics/jpeg .include diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo index 8b5648fe57d..e78c97b2b4a 100644 --- a/x11/xforms/distinfo +++ b/x11/xforms/distinfo @@ -1,7 +1,3 @@ -MD5 (xforms/openBSD-i386/bxform-088.tgz) = f42143e3622d69d1dd498ac047d54a39 -MD5 (xforms/openBSD-m68k/bxform-088.tgz) = a8ff1fd2670e77a78db6b9918082f3d4 -MD5 (xforms/openBSD-sparc/bxform-088.tgz) = a27759350e1ad4734e5f35f56e72dd6d -RMD160 (xforms/openBSD-i386/bxform-088.tgz) = cc5f13122939310913ec018d5db0f28ae8bc53da -RMD160 (xforms/openBSD-sparc/bxform-088.tgz) = 96c5b51c0c263033bd22df5b4ed99e47e636ff88 -SHA1 (xforms/openBSD-i386/bxform-088.tgz) = 2a42dab68e3245d00372979d994f9b200612f053 -SHA1 (xforms/openBSD-sparc/bxform-088.tgz) = 356b1ca3d56252c1070037d4f8cff1a3d3840067 +MD5 (xforms-0.9999.tgz) = 993a3492fe87ea158a075ddcb9bde500 +RMD160 (xforms-0.9999.tgz) = a841711ffc746b967a07ffe5302ef78ef7539606 +SHA1 (xforms-0.9999.tgz) = d88d24a37ab4fe37fbcb8b85f0c6a727638db217 diff --git a/x11/xforms/files/mkconfig.h b/x11/xforms/files/mkconfig.h deleted file mode 100644 index d68bd79fc4a..00000000000 --- a/x11/xforms/files/mkconfig.h +++ /dev/null @@ -1,35 +0,0 @@ -# -# NetBSD -# - -SHLIB_MAJOR= 0 -SHLIB_MINOR= 88 - -CC=cc -CCFLAG=-O -fPIC -LDFLAG= -RANLIB=ranlib -XINCLUDE=-I${X11BASE}/include -SYSLIB=-L${X11BASE}/lib -lX11 -lm - -# where the library should be installed - -LIB_DIR=${PREFIX}/lib -HEADER_DIR=${PREFIX}/include/X11 -BIN_DIR=${PREFIX}/bin - -MAN5_DIR=${PREFIX}/man/man5 -MAN1_DIR=${PREFIX}/man/man1 - -DEMO_DIR=${PREFIX}/share/examples/xforms - -# name and header of the library -FORMLIB=libforms.a -STATIC_NAME=libxforms.a -FORMHEADER=forms.h - -# shared library -SHARED_LIB=libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} -SHARED_NAME=libxforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} - -LN=ln -fs diff --git a/x11/xforms/patches/patch-Imakefile b/x11/xforms/patches/patch-Imakefile new file mode 100644 index 00000000000..e086791947a --- /dev/null +++ b/x11/xforms/patches/patch-Imakefile @@ -0,0 +1,11 @@ +$RuOBSD: patch-Imakefile,v 1.1.1.1 2002/05/18 02:35:56 form Exp $ +--- Imakefile.orig Thu May 9 19:51:00 2002 ++++ Imakefile Thu May 9 19:51:12 2002 +@@ -28,7 +28,6 @@ SUBDIRS = \ + lib \ + fdesign \ + fd2ps \ +- demos \ + /* Don't remove this line */ + + #if Optimize diff --git a/x11/xforms/patches/patch-aa b/x11/xforms/patches/patch-aa deleted file mode 100644 index 1ca273ddefc..00000000000 --- a/x11/xforms/patches/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ ---- Makefile.orig Fri Nov 14 23:48:20 1997 -+++ Makefile Tue Sep 12 23:38:39 2000 -@@ -25,24 +25,27 @@ - @(cd DEMOS; make) - - install: -- 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);\ -+ ${BSD_INSTALL_DATA} FORMS/$(FORMLIB) $(DESTDIR)$(LIB_DIR) -+ $(RANLIB) $(DESTDIR)$(LIB_DIR)/$(FORMLIB) -+ if [ "$(STATIC_NAME)" != "" ]; then \ -+ cd $(DESTDIR)$(LIB_DIR) && $(LN) $(FORMLIB) $(STATIC_NAME); \ -+ fi -+ ${BSD_INSTALL_PROGRAM} DESIGN/fdesign $(DESTDIR)$(BIN_DIR) -+ ${BSD_INSTALL_PROGRAM} fd2ps/fd2ps $(DESTDIR)$(BIN_DIR) -+ -@if [ "$(SHARED_LIB)" != "" ]; then \ -+ ${BSD_INSTALL_DATA} FORMS/$(SHARED_LIB) $(DESTDIR)$(LIB_DIR); \ -+ if [ "$(SHARED_NAME)" != "" ]; then \ -+ cd $(DESTDIR)$(LIB_DIR) && $(LN) $(SHARED_LIB) $(SHARED_NAME); \ - fi \ - fi -- cp FORMS/$(FORMHEADER) $(HEADER_DIR);\ -- chmod $(HEADERMODE) $(HEADER_DIR)/$(FORMHEADER) -- 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;\ -+ ${BSD_INSTALL_DATA} FORMS/$(FORMHEADER) $(DESTDIR)$(HEADER_DIR) -+ ${BSD_INSTALL_MAN} FORMS/xforms.5 $(DESTDIR)$(MAN5_DIR) -+ ${BSD_INSTALL_MAN} DESIGN/fdesign.1 $(DESTDIR)$(MAN1_DIR) -+ ${BSD_INSTALL_MAN} fd2ps/fd2ps.1 $(DESTDIR)$(MAN1_DIR) -+ @if [ ! -f $(DESTDIR)$(MAN5_DIR)/forms.5 ]; then \ -+ cd $(DESTDIR)$(MAN5_DIR) && $(LN) xforms.5 forms.5; \ - fi -+ - clean: - (cd DEMOS; make $@) - empty: diff --git a/x11/xforms/patches/patch-lib_image_xwd_c b/x11/xforms/patches/patch-lib_image_xwd_c new file mode 100644 index 00000000000..86b95ac258b --- /dev/null +++ b/x11/xforms/patches/patch-lib_image_xwd_c @@ -0,0 +1,25 @@ +$RuOBSD: patch-lib_image_xwd_c,v 1.1.1.1 2002/05/18 02:35:56 form Exp $ +--- lib/image_xwd.c.orig Mon May 6 15:10:18 2002 ++++ lib/image_xwd.c Mon May 6 15:11:54 2002 +@@ -77,6 +77,7 @@ typedef union + } + tLong; + ++#ifndef swap32 + static CARD32 + swap32(CARD32 in) + { +@@ -93,10 +94,11 @@ swap32(CARD32 in) + + return t.l; + } ++#endif + ++#ifndef swap16 + #define swap16(a) ((((a)&0xff)<<8)|(((a)>>8)&0xff)) +- +- ++#endif + + static void + swap_header(XWDFileHeader * h) diff --git a/x11/xforms/pkg/PFRAG.shared b/x11/xforms/pkg/PFRAG.shared index 910fc482b5d..11e93da618d 100644 --- a/x11/xforms/pkg/PFRAG.shared +++ b/x11/xforms/pkg/PFRAG.shared @@ -1,4 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1 2000/09/13 04:04:03 brad Exp $ -lib/libforms.so.0.88 -lib/libxforms.so.0.88 -DYNLIBDIR(%B) +@comment $OpenBSD: PFRAG.shared,v 1.2 2002/05/22 05:37:25 form Exp $ +lib/libforms.so.0.9999 +DYNLIBDIR(%D/lib) diff --git a/x11/xforms/pkg/PLIST b/x11/xforms/pkg/PLIST index 11a5a0cd964..362a4b1594c 100644 --- a/x11/xforms/pkg/PLIST +++ b/x11/xforms/pkg/PLIST @@ -1,11 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.3 2000/09/13 04:04:03 brad Exp $ +@comment $RuOBSD: PLIST,v 1.1.1.1 2002/05/18 02:35:56 form Exp $ bin/fd2ps bin/fdesign include/X11/forms.h lib/libforms.a -lib/libxforms.a +man/cat1/fd2ps.0 +man/cat1/fdesign.0 %%SHARED%% -man/man1/fd2ps.1 -man/man1/fdesign.1 -man/man5/forms.5 -man/man5/xforms.5