- Update to 1.3

- Add LICENSE
- Update COMMENT
- Strip shared library
- Support STAGEDIR
- Sort PLIST
- Update pkg-descr
- Take maintainership

6 files changed, 33 insertions, 87 deletions

diff --git a/archivers/librtfcomp/Makefile b/archivers/librtfcomp/Makefile
index b2a2ed9094b0..87361d732a14 100644
--- a/archivers/librtfcomp/Makefile
+++ b/archivers/librtfcomp/Makefile
@@ -2,24 +2,42 @@
 # $FreeBSD$
 
 PORTNAME=	librtfcomp
-PORTVERSION=	1.1
-CATEGORIES?=	archivers
-MASTER_SITES=	SF/synce/SynCE/0.10.0
+PORTVERSION=	1.3
+CATEGORIES=	archivers
+MASTER_SITES=	SF/synce/SynCE/${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT?=	LZRTF compression library
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT?=	Library for handling compressed RTF documents
 
+LICENSE=	LGPL21
 
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
+SLAVEDIRS=	archivers/py-librtfcomp
 
-.if defined(RTFCOMP_SLAVE) && ${RTFCOMP_SLAVE} == "pythonb"
-CONFIGURE_ARGS=	--enable-python-bindings
+.if defined(SLAVEPORT) && ${SLAVEPORT} == "py"
+CATEGORIES+=	python
+CONFIGURE_ARGS+=--enable-python-bindings
 .else
-CONFIGURE_ARGS=	--disable-python-bindings
+CONFIGURE_ARGS+=--disable-python-bindings
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/VISIBILITY=/ s| -fvisibility=hidden||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|$$(top_builddir)/src/librtfcomp.la|${LOCALBASE}/lib/librtfcomp.la|g' ${WRKSRC}/python/Makefile.in
+
+post-build:
+.if !defined(SLAVEPORT)
+	@${STRIP_CMD} ${WRKSRC}/src/.libs/librtfcomp.so.0
+.endif
+
+post-install:
+.if !defined(SLAVEPORT)
+	${INSTALL_SCRIPT} ${WRKSRC}/tests/fromrtf ${STAGEDIR}${PREFIX}/bin/fromrtf
+	${INSTALL_SCRIPT} ${WRKSRC}/tests/test ${STAGEDIR}${PREFIX}/bin/testrtf
+	${INSTALL_SCRIPT} ${WRKSRC}/tests/tortf ${STAGEDIR}${PREFIX}/bin/tortf
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/librtfcomp/distinfo b/archivers/librtfcomp/distinfo
index 7a6337318f19..5b1caa7d891b 100644
--- a/archivers/librtfcomp/distinfo
+++ b/archivers/librtfcomp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (librtfcomp-1.1.tar.gz) = a4bb19cd7a8713d48cbf20161bbe79ff4e79777491d57cb8a48fdb88567ef7a3
-SIZE (librtfcomp-1.1.tar.gz) = 334800
+SHA256 (librtfcomp-1.3.tar.gz) = 5ade6031956e2bdc3b6b2024bf658459d4d381e33bb5e59264f30eefc8a5f3b4
+SIZE (librtfcomp-1.3.tar.gz) = 328891
diff --git a/archivers/librtfcomp/files/patch-configure b/archivers/librtfcomp/files/patch-configure
deleted file mode 100644
index ebdfeaa02378..000000000000
--- a/archivers/librtfcomp/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-06-23 13:28:21.000000000 +1000
-+++ configure	2008-06-23 13:28:30.000000000 +1000
-@@ -19265,7 +19265,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test x"$have_gccvisibility" = x"yes"; then
--	VISIBILITY="-DHAVE_GCCVISIBILITY -fvisibility=hidden"
-+	VISIBILITY="-DHAVE_GCCVISIBILITY"
- fi
- 
- 
diff --git a/archivers/librtfcomp/files/patch-test_Makefile.in b/archivers/librtfcomp/files/patch-test_Makefile.in
deleted file mode 100644
index 7638bf373d0c..000000000000
--- a/archivers/librtfcomp/files/patch-test_Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
---- tests/Makefile.in.orig	2008-06-13 23:05:10.000000000 +1000
-+++ tests/Makefile.in	2008-06-13 23:07:12.000000000 +1000
-@@ -36,8 +36,8 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = test$(EXEEXT) tortf$(EXEEXT) fromrtf$(EXEEXT)
--noinst_PROGRAMS = test$(EXEEXT) tortf$(EXEEXT) fromrtf$(EXEEXT)
-+bin_PROGRAMS = testrtf$(EXEEXT) tortf$(EXEEXT) fromrtf$(EXEEXT)
-+noinst_PROGRAMS = testrtf$(EXEEXT) tortf$(EXEEXT) fromrtf$(EXEEXT)
- subdir = tests
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -54,10 +54,10 @@
- fromrtf_OBJECTS = $(am_fromrtf_OBJECTS)
- fromrtf_LDADD = $(LDADD)
- fromrtf_DEPENDENCIES = ../src/librtfcomp.la
--am_test_OBJECTS = main.$(OBJEXT)
--test_OBJECTS = $(am_test_OBJECTS)
--test_LDADD = $(LDADD)
--test_DEPENDENCIES = ../src/librtfcomp.la
-+am_testrtf_OBJECTS = main.$(OBJEXT)
-+testrtf_OBJECTS = $(am_testrtf_OBJECTS)
-+testrtf_LDADD = $(LDADD)
-+testrtf_DEPENDENCIES = ../src/librtfcomp.la
- am_tortf_OBJECTS = tortf.$(OBJEXT)
- tortf_OBJECTS = $(am_tortf_OBJECTS)
- tortf_LDADD = $(LDADD)
-@@ -73,8 +73,8 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(fromrtf_SOURCES) $(test_SOURCES) $(tortf_SOURCES)
--DIST_SOURCES = $(fromrtf_SOURCES) $(test_SOURCES) $(tortf_SOURCES)
-+SOURCES = $(fromrtf_SOURCES) $(testrtf_SOURCES) $(tortf_SOURCES)
-+DIST_SOURCES = $(fromrtf_SOURCES) $(testrtf_SOURCES) $(tortf_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -195,7 +195,7 @@
- target_alias = @target_alias@
- INCLUDES = -I../include
- LDADD = ../src/librtfcomp.la
--test_SOURCES = main.c
-+testrtf_SOURCES = main.c
- tortf_SOURCES = tortf.c
- fromrtf_SOURCES = fromrtf.c 
- EXTRA_DIST = testnote.crtf
-@@ -270,9 +270,9 @@
- fromrtf$(EXEEXT): $(fromrtf_OBJECTS) $(fromrtf_DEPENDENCIES) 
- 	@rm -f fromrtf$(EXEEXT)
- 	$(LINK) $(fromrtf_LDFLAGS) $(fromrtf_OBJECTS) $(fromrtf_LDADD) $(LIBS)
--test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
--	@rm -f test$(EXEEXT)
--	$(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
-+testrtf$(EXEEXT): $(testrtf_OBJECTS) $(testrtf_DEPENDENCIES) 
-+	@rm -f testrtf$(EXEEXT)
-+	$(LINK) $(testrtf_LDFLAGS) $(testrtf_OBJECTS) $(testrtf_LDADD) $(LIBS)
- tortf$(EXEEXT): $(tortf_OBJECTS) $(tortf_DEPENDENCIES) 
- 	@rm -f tortf$(EXEEXT)
- 	$(LINK) $(tortf_LDFLAGS) $(tortf_OBJECTS) $(tortf_LDADD) $(LIBS)
diff --git a/archivers/librtfcomp/pkg-descr b/archivers/librtfcomp/pkg-descr
index cfb74961d55e..41d0adfc241c 100644
--- a/archivers/librtfcomp/pkg-descr
+++ b/archivers/librtfcomp/pkg-descr
@@ -1,3 +1,3 @@
-LZRTF compression library
+librtfcomp is a library for handling compressed RTF documents.
 
 WWW: http://synce.sourceforge.net/
diff --git a/archivers/librtfcomp/pkg-plist b/archivers/librtfcomp/pkg-plist
index c2c32685068a..d90f6da7e0eb 100644
--- a/archivers/librtfcomp/pkg-plist
+++ b/archivers/librtfcomp/pkg-plist
@@ -1,8 +1,8 @@
 bin/fromrtf
 bin/testrtf
 bin/tortf
-include/rtfcomp/rtfcomp.h
 include/rtfcomp/errors.h
+include/rtfcomp/rtfcomp.h
 lib/librtfcomp.a
 lib/librtfcomp.la
 lib/librtfcomp.so