Update to xforms-1.2.4.
This commit is contained in:
ajacoutot
parent
7ce1de1cd2
commit
2b9fd68a54
@ -1,37 +1,30 @@
|
||||
# $OpenBSD: Makefile,v 1.45 2013/10/11 21:21:06 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.46 2015/06/26 12:29:11 ajacoutot Exp $
|
||||
|
||||
COMMENT= GUI toolkit for X11
|
||||
COMMENT= GUI toolkit for X11
|
||||
|
||||
DISTNAME= xforms-1.0
|
||||
REVISION= 3
|
||||
SHARED_LIBS= flimage 1.0 \
|
||||
forms 1.0 \
|
||||
formsGL 1.0
|
||||
CATEGORIES= x11
|
||||
DISTNAME= xforms-1.2.4
|
||||
CATEGORIES= x11
|
||||
|
||||
HOMEPAGE= http://xforms-toolkit.org/
|
||||
SHARED_LIBS += forms 2.0 # 3.3
|
||||
SHARED_LIBS += flimage 2.0 # 3.3
|
||||
SHARED_LIBS += formsGL 2.0 # 3.3
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=xforms/}
|
||||
HOMEPAGE= http://xforms-toolkit.org/
|
||||
|
||||
# LGPL
|
||||
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=xforms/}
|
||||
|
||||
# LGPLv2.1
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB= GL X11 Xau Xdmcp Xext Xpm c jpeg m tiff
|
||||
WANTLIB += GL ICE SM X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
|
||||
WANTLIB += Xpm Xxf86vm c drm glapi jpeg m pthread pthread-stubs
|
||||
WANTLIB += stdc++ xcb xcb-dri2 xcb-glx
|
||||
|
||||
CONFIGURE_STYLE= imake
|
||||
MAKE_FLAGS= LIBflimage_VERSION=${LIBflimage_VERSION} \
|
||||
LIBforms_VERSION=${LIBforms_VERSION} \
|
||||
LIBformsGL_VERSION=${LIBformsGL_VERSION} \
|
||||
OPTIMIZER="${CFLAGS}"
|
||||
LIB_DEPENDS= graphics/jpeg
|
||||
|
||||
BUILD_DEPENDS= graphics/jpeg
|
||||
|
||||
LIB_DEPENDS= graphics/tiff
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
# crud confuses update-plist
|
||||
post-extract:
|
||||
@find ${WRKDIST} -name \*.orig -print0 | xargs -0 rm
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--with-extra-prefix=${LOCALBASE} \
|
||||
--disable-docs
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (xforms-1.0.tar.gz) = VBBWYk/UKJW9ud8E5k8pNviVBYlnPQV2HOm9PzwPxIU=
|
||||
SIZE (xforms-1.0.tar.gz) = 1012878
|
||||
SHA256 (xforms-1.2.4.tar.gz) = eMxrBwcbvqofkG4KItXpmA5I+JE1d7wILWYa/ly3VpY=
|
||||
SIZE (xforms-1.2.4.tar.gz) = 2206406
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-gl_Imakefile,v 1.1 2005/12/31 17:29:38 naddy Exp $
|
||||
--- gl/Imakefile.orig Sat Dec 31 18:19:37 2005
|
||||
+++ gl/Imakefile Sat Dec 31 18:20:18 2005
|
||||
@@ -71,7 +71,7 @@ CCOPTIONS =
|
||||
STD_DEFINES = LibraryDefines
|
||||
CDEBUGFLAGS = LibraryCDebugFlags
|
||||
#else
|
||||
-#define SoRev XFORMSLIBREV
|
||||
+#define SoRev LIBformsGL_VERSION
|
||||
#define IncSubdir X11
|
||||
#include <Library.tmpl>
|
||||
#endif
|
||||
@@ -102,11 +102,11 @@ LibraryObjectRule()
|
||||
|
||||
#if DoSharedLib
|
||||
# if DoNormalLib
|
||||
-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),shared,..)
|
||||
+SharedLibraryTarget($(LIBNAME),$(LIBformsGL_VERSION),$(OBJS),shared,..)
|
||||
# else
|
||||
-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),.,.)
|
||||
+SharedLibraryTarget($(LIBNAME),$(LIBformsGL_VERSION),$(OBJS),.,.)
|
||||
#endif
|
||||
-InstallSharedLibrary($(LIBNAME),$(XFORMSLIBREV),$(XFORMSLIBDIR))
|
||||
+InstallSharedLibrary($(LIBNAME),$(LIBformsGL_VERSION),$(XFORMSLIBDIR))
|
||||
#endif
|
||||
#if DoNormalLib
|
||||
NormalLibraryTarget($(LIBNAME),$(OBJS))
|
||||
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-image_Imakefile,v 1.1 2005/12/31 17:29:38 naddy Exp $
|
||||
--- image/Imakefile.orig Sat Dec 31 18:18:24 2005
|
||||
+++ image/Imakefile Sat Dec 31 18:19:22 2005
|
||||
@@ -101,7 +101,7 @@ CCOPTIONS = -nostdinc
|
||||
STD_DEFINES = LibraryDefines
|
||||
CDEBUGFLAGS = LibraryCDebugFlags
|
||||
#else
|
||||
-#define SoRev XFORMSLIBREV
|
||||
+#define SoRev LIBflimage_VERSION
|
||||
#define IncSubdir X11
|
||||
#include <Library.tmpl>
|
||||
#endif
|
||||
@@ -153,11 +153,11 @@ LibraryObjectRule()
|
||||
|
||||
#if DoSharedLib
|
||||
#if DoNormalLib
|
||||
-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),shared,..)
|
||||
+SharedLibraryTarget($(LIBNAME),$(LIBflimage_VERSION),$(OBJS),shared,..)
|
||||
#else
|
||||
-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),.,.)
|
||||
+SharedLibraryTarget($(LIBNAME),$(LIBflimage_VERSION),$(OBJS),.,.)
|
||||
#endif
|
||||
-InstallSharedLibrary($(LIBNAME),$(XFORMSLIBREV),$(XFORMSLIBDIR))
|
||||
+InstallSharedLibrary($(LIBNAME),$(LIBflimage_VERSION),$(XFORMSLIBDIR))
|
||||
#endif
|
||||
#if DoNormalLib
|
||||
NormalLibraryTarget($(LIBNAME),$(OBJS))
|
||||
@ -1,25 +1,24 @@
|
||||
$OpenBSD: patch-image_image_xwd_c,v 1.1 2002/12/26 01:58:39 margarida Exp $
|
||||
--- image/image_xwd.c.orig Tue Dec 24 04:17:11 2002
|
||||
+++ image/image_xwd.c Tue Dec 24 04:19:02 2002
|
||||
@@ -81,6 +81,7 @@ typedef union
|
||||
}
|
||||
tLong;
|
||||
$OpenBSD: patch-image_image_xwd_c,v 1.2 2015/06/26 12:29:11 ajacoutot Exp $
|
||||
--- image/image_xwd.c.orig Tue Dec 10 21:33:18 2013
|
||||
+++ image/image_xwd.c Fri Jun 26 14:16:18 2015
|
||||
@@ -88,6 +88,7 @@ typedef union
|
||||
/***************************************
|
||||
***************************************/
|
||||
|
||||
+#ifndef swap32
|
||||
static CARD32
|
||||
swap32(CARD32 in)
|
||||
swap32( CARD32 in )
|
||||
{
|
||||
@@ -97,10 +98,11 @@ swap32(CARD32 in)
|
||||
@@ -104,9 +105,12 @@ swap32( CARD32 in )
|
||||
|
||||
return t.l;
|
||||
}
|
||||
+#endif
|
||||
|
||||
|
||||
+#ifndef swap16
|
||||
#define swap16(a) ((((a)&0xff)<<8)|(((a)>>8)&0xff))
|
||||
-
|
||||
-
|
||||
#define swap16( a ) ( ( ( ( a ) &0xff ) <<8 ) | ( ( ( a ) >> 8 ) & 0xff ) )
|
||||
+#endif
|
||||
|
||||
static void
|
||||
swap_header(XWDFileHeader * h)
|
||||
|
||||
/***************************************
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-lib_Imakefile,v 1.1 2005/12/31 17:29:38 naddy Exp $
|
||||
--- lib/Imakefile.orig Sat Dec 31 17:55:11 2005
|
||||
+++ lib/Imakefile Sat Dec 31 17:58:16 2005
|
||||
@@ -150,7 +150,7 @@ CCOPTIONS =
|
||||
STD_DEFINES = LibraryDefines
|
||||
CDEBUGFLAGS = LibraryCDebugFlags
|
||||
#else
|
||||
-#define SoRev XFORMSLIBREV
|
||||
+#define SoRev LIBforms_VERSION
|
||||
#define IncSubdir X11
|
||||
#include <Library.tmpl>
|
||||
#endif
|
||||
@@ -199,11 +199,11 @@ LibraryObjectRule()
|
||||
|
||||
#if DoSharedLib
|
||||
# if DoNormalLib
|
||||
-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),shared,..)
|
||||
+SharedLibraryTarget($(LIBNAME),$(LIBforms_VERSION),$(OBJS),shared,..)
|
||||
# else
|
||||
-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),.,.)
|
||||
+SharedLibraryTarget($(LIBNAME),$(LIBforms_VERSION),$(OBJS),.,.)
|
||||
#endif
|
||||
-InstallSharedLibrary($(LIBNAME),$(XFORMSLIBREV),$(XFORMSLIBDIR))
|
||||
+InstallSharedLibrary($(LIBNAME),$(LIBforms_VERSION),$(XFORMSLIBDIR))
|
||||
#endif
|
||||
#if DoNormalLib
|
||||
NormalLibraryTarget($(LIBNAME),$(OBJS))
|
||||
@ -1,14 +1,18 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2013/10/11 20:40:07 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.9 2015/06/26 12:29:11 ajacoutot Exp $
|
||||
@bin bin/fd2ps
|
||||
@bin bin/fdesign
|
||||
include/X11/flimage.h
|
||||
include/X11/forms.h
|
||||
include/X11/glcanvas.h
|
||||
include/flimage.h
|
||||
include/forms.h
|
||||
include/glcanvas.h
|
||||
lib/libflimage.a
|
||||
lib/libflimage.la
|
||||
@lib lib/libflimage.so.${LIBflimage_VERSION}
|
||||
lib/libforms.a
|
||||
lib/libforms.la
|
||||
@lib lib/libforms.so.${LIBforms_VERSION}
|
||||
lib/libformsGL.a
|
||||
lib/libformsGL.la
|
||||
@lib lib/libformsGL.so.${LIBformsGL_VERSION}
|
||||
@man man/man1/fd2ps.1
|
||||
@man man/man1/fdesign.1
|
||||
@man man/man5/xforms.5
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user