5 files changed, 22 insertions, 15 deletions

diff --git a/graphics/box/Makefile b/graphics/box/Makefile
index 64a12f8e13ff..292a6dda7774 100644
--- a/graphics/box/Makefile
+++ b/graphics/box/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	box
-PORTVERSION=	0.2.1
+PORTVERSION=	0.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}c/Box%20-%20the%20compiler/${DISTNAME}/
 
@@ -16,6 +16,9 @@ COMMENT=	Compiler for box, the figure description language
 BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man
 LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
 
+LICENSE_COMB=	multi
+LICENSE=	GPLv2 LGPL3
+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -26,6 +29,9 @@ MAN1=		${PORTNAME}.1
 post-patch:
 	${TOUCH} ${WRKSRC}/man/${PORTNAME}.sgml
 
+check regression-test: build
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} check)
+
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
diff --git a/graphics/box/distinfo b/graphics/box/distinfo
index 15687f6d84fd..0ca65392ed27 100644
--- a/graphics/box/distinfo
+++ b/graphics/box/distinfo
@@ -1,2 +1,2 @@
-SHA256 (box-0.2.1.tar.gz) = b34ae16f7bbf4fcaca7a246bf63c8c7ecbee333e5ac291d36beb503d42f4e5ab
-SIZE (box-0.2.1.tar.gz) = 950209
+SHA256 (box-0.2.2.tar.gz) = 060f016415d1edf7eaf36b984bd85e511050e1eb45b904bbde1dead05017ce4d
+SIZE (box-0.2.2.tar.gz) = 951210
diff --git a/graphics/box/files/patch-box__Makefile.in b/graphics/box/files/patch-box__Makefile.in
deleted file mode 100644
index 7f6244113c15..000000000000
--- a/graphics/box/files/patch-box__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./box/Makefile.in.orig	2011-02-13 18:23:20.000000000 -0800
-+++ ./box/Makefile.in	2011-02-13 18:23:53.000000000 -0800
-@@ -329,7 +329,7 @@
-   paths.c main.c cmpproc.c bltinarray.c ast.c value.c \
-   compiler.c operator.c namespace.c autogen.c tsdesc.c
- 
--box_LDADD = $(LIBLTDL) libboxcore0.2.la
-+box_LDADD = libboxcore0.2.la $(LIBLTDL)
- box_LDFLAGS = -static
- box_DEPENDENCIES = $(LTDLDEPS)
- all: $(BUILT_SOURCES)
diff --git a/graphics/box/files/patch-tests__dylib__Makefile.dev b/graphics/box/files/patch-tests__dylib__Makefile.dev
new file mode 100644
index 000000000000..3c6807552dc4
--- /dev/null
+++ b/graphics/box/files/patch-tests__dylib__Makefile.dev
@@ -0,0 +1,11 @@
+--- ./tests/dylib/Makefile.dev.orig	2011-04-06 13:42:46.000000000 -0700
++++ ./tests/dylib/Makefile.dev	2011-04-06 13:42:59.000000000 -0700
+@@ -6,7 +6,7 @@
+ $(DESTDIR)/libmylib.la: mylib.c
+ 	$(LIBTOOL) --mode=compile gcc -c -I../.. mylib.c
+ 	$(LIBTOOL) --mode=link gcc -module -o libmylib.la mylib.lo -rpath $(DESTDIR)
+-        $(LIBTOOL) --mode=install cp libmylib.la $(DESTDIR)/libmylib.la
++	$(LIBTOOL) --mode=install cp libmylib.la $(DESTDIR)/libmylib.la
+ 	#gcc -I../.. -fPIC -shared -o libmylib.so mylib.c
+ 
+ clean:
diff --git a/graphics/box/pkg-plist b/graphics/box/pkg-plist
index b248d3f4602a..9ec2f5b915f3 100644
--- a/graphics/box/pkg-plist
+++ b/graphics/box/pkg-plist
@@ -13,7 +13,7 @@ include/box0.2/box/msgbase.h
 include/box0.2/box/occupation.h
 include/box0.2/box/print.h
 include/box0.2/box/srcpos.h
-include/box0.2/box/str.h
+include/box0.2/box/strutils.h
 include/box0.2/box/types.h
 include/box0.2/box/version.h
 include/box0.2/box/virtmach.h
@@ -41,6 +41,7 @@ lib/box0.2/pkg/_text.bxh
 lib/box0.2/pkg/_window.bxh
 lib/box0.2/pkg/arrows.bxh
 lib/box0.2/pkg/bounce.bxh
+lib/box0.2/pkg/caps.bxh
 lib/box0.2/pkg/electric.bxh
 lib/box0.2/pkg/g.bxh
 lib/box0.2/pkg/label.bxh