5 files changed, 84 insertions, 48 deletions

diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index b30b2f663f55..2b8da69ed9f5 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -2,55 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	pxlib
-PORTVERSION=	0.6.3
-PORTREVISION=	1
+PORTVERSION=	0.6.5
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	5u623l20@gmail.com
 COMMENT=	C library to read various Paradox files
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=		gettext iconv perl5
+USES=		gmake iconv pathfix perl5
+USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	MAN
-MAN_DESC=	Build and install manpages
+OPTIONS_DEFINE=	MANPAGES NLS
+OPTIONS_SUB=	yes
+
+MANPAGES_BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
+			docbook2man:${PORTSDIR}/textproc/docbook-utils
+NLS_CONFIGURE_OFF=	--disable-nls
+NLS_USES=	gettext
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMAN}
-BUILD_DEPENDS+=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
-		docbook2man:${PORTSDIR}/textproc/docbook-utils
-
-MAN3=	PX_add_primary_index.3 PX_close.3 PX_close_blob.3 PX_create_blob_file.3 \
-	PX_create_file.3 PX_create_fp.3 PX_date2string.3 PX_delete.3 \
-	PX_delete_record.3 PX_get_data_alpha.3 PX_get_data_bcd.3 \
-	PX_get_data_blob.3 PX_get_data_byte.3 PX_get_data_bytes.3 \
-	PX_get_data_double.3 PX_get_data_graphic.3 PX_get_data_long.3 \
-	PX_get_data_short.3 PX_get_field.3 PX_get_fields.3 PX_get_majorversion.3 \
-	PX_get_minorversion.3 PX_get_num_fields.3 PX_get_num_records.3 \
-	PX_get_opaque.3 PX_get_parameter.3 PX_get_record.3 PX_get_record2.3 \
-	PX_get_recordsize.3 PX_get_subminorversion.3 PX_get_value.3 \
-	PX_insert_record.3 PX_new.3 PX_new2.3 PX_new3.3 PX_new_blob.3 \
-	PX_open_blob_file.3 PX_open_blob_fp.3 PX_open_file.3 PX_open_fp.3 \
-	PX_open_gsf.3 PX_put_data_alpha.3 PX_put_data_bcd.3 PX_put_data_byte.3 \
-	PX_put_data_bytes.3 PX_put_data_double.3 PX_put_data_long.3 \
-	PX_put_data_short.3 PX_put_record.3 PX_put_recordn.3 PX_read_blobdata.3 \
-	PX_read_primary_index.3 PX_retrieve_record.3 PX_set_blob_file.3 \
-	PX_set_inputencoding.3 PX_set_parameter.3 PX_set_tablename.3 \
-	PX_set_targetencoding.3 PX_set_value.3 PX_strdup.3 PX_time2string.3 \
-	PX_timestamp2string.3 PX_update_record.3 PX_write_primary_index.3 pxlib.3
-.else
 pre-build:
+.if !${PORT_OPTIONS:MMANPAGES}
 	${REINPLACE_CMD} -e 's/^DOCDIR =.*/DOCDIR =/' ${WRKSRC}/Makefile
 .endif
 
diff --git a/databases/pxlib/distinfo b/databases/pxlib/distinfo
index 2cb60ecb0b96..518d60d8c076 100644
--- a/databases/pxlib/distinfo
+++ b/databases/pxlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pxlib-0.6.3.tar.gz) = 20ea3782d8a084e9d46677a7adf0303d346f431ec1547131cf2bca2a60586c08
-SIZE (pxlib-0.6.3.tar.gz) = 517332
+SHA256 (pxlib-0.6.5.tar.gz) = 2f7a6b77069411d857a1eed75bf9774099c42d35768222314fbeaa5c290a0605
+SIZE (pxlib-0.6.5.tar.gz) = 522092
diff --git a/databases/pxlib/files/patch-Makefile.in b/databases/pxlib/files/patch-Makefile.in
deleted file mode 100644
index eb7bedabe07b..000000000000
--- a/databases/pxlib/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Dec 10 22:27:50 2005
-+++ Makefile.in	Sat Dec 10 22:29:15 2005
-@@ -250,7 +250,7 @@
- EXTRA_DIST = intltool-extract.in intltool-merge.in intltool-update.in $(spec) $(spec).in autogen.sh pxlib.pc.in
- 
- #all-local: $(spec)
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- pkgconfig_DATA = pxlib.pc
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/databases/pxlib/pkg-descr b/databases/pxlib/pkg-descr
index cf14df12283d..88168ea828bc 100644
--- a/databases/pxlib/pkg-descr
+++ b/databases/pxlib/pkg-descr
@@ -3,5 +3,4 @@ files are best supported. pxlib provides a very simple api to read the
 header and the data records of Paradox files. I also provides functions
 to convert the data into the hosts data format (little or big endian).
 
-Author: Uwe Steinmann <uwe@steinmann.cx>
 WWW: http://pxlib.sourceforge.net
diff --git a/databases/pxlib/pkg-plist b/databases/pxlib/pkg-plist
index ff8178683c76..e0591acf7364 100644
--- a/databases/pxlib/pkg-plist
+++ b/databases/pxlib/pkg-plist
@@ -7,6 +7,71 @@ lib/libpx.la
 lib/libpx.so
 lib/libpx.so.6
 libdata/pkgconfig/pxlib.pc
-share/locale/de/LC_MESSAGES/pxlib.mo
-share/locale/es/LC_MESSAGES/pxlib.mo
-share/locale/fr/LC_MESSAGES/pxlib.mo
+%%MANPAGES%%man/man3/PX_add_primary_index.3.gz
+%%MANPAGES%%man/man3/PX_close.3.gz
+%%MANPAGES%%man/man3/PX_close_blob.3.gz
+%%MANPAGES%%man/man3/PX_create_blob_file.3.gz
+%%MANPAGES%%man/man3/PX_create_file.3.gz
+%%MANPAGES%%man/man3/PX_create_fp.3.gz
+%%MANPAGES%%man/man3/PX_date2string.3.gz
+%%MANPAGES%%man/man3/PX_delete.3.gz
+%%MANPAGES%%man/man3/PX_delete_record.3.gz
+%%MANPAGES%%man/man3/PX_get_data_alpha.3.gz
+%%MANPAGES%%man/man3/PX_get_data_bcd.3.gz
+%%MANPAGES%%man/man3/PX_get_data_blob.3.gz
+%%MANPAGES%%man/man3/PX_get_data_byte.3.gz
+%%MANPAGES%%man/man3/PX_get_data_bytes.3.gz
+%%MANPAGES%%man/man3/PX_get_data_double.3.gz
+%%MANPAGES%%man/man3/PX_get_data_graphic.3.gz
+%%MANPAGES%%man/man3/PX_get_data_long.3.gz
+%%MANPAGES%%man/man3/PX_get_data_short.3.gz
+%%MANPAGES%%man/man3/PX_get_field.3.gz
+%%MANPAGES%%man/man3/PX_get_fields.3.gz
+%%MANPAGES%%man/man3/PX_get_majorversion.3.gz
+%%MANPAGES%%man/man3/PX_get_minorversion.3.gz
+%%MANPAGES%%man/man3/PX_get_num_fields.3.gz
+%%MANPAGES%%man/man3/PX_get_num_records.3.gz
+%%MANPAGES%%man/man3/PX_get_opaque.3.gz
+%%MANPAGES%%man/man3/PX_get_parameter.3.gz
+%%MANPAGES%%man/man3/PX_get_record.3.gz
+%%MANPAGES%%man/man3/PX_get_record2.3.gz
+%%MANPAGES%%man/man3/PX_get_recordsize.3.gz
+%%MANPAGES%%man/man3/PX_get_subminorversion.3.gz
+%%MANPAGES%%man/man3/PX_get_value.3.gz
+%%MANPAGES%%man/man3/PX_insert_record.3.gz
+%%MANPAGES%%man/man3/PX_new.3.gz
+%%MANPAGES%%man/man3/PX_new2.3.gz
+%%MANPAGES%%man/man3/PX_new3.3.gz
+%%MANPAGES%%man/man3/PX_new_blob.3.gz
+%%MANPAGES%%man/man3/PX_open_blob_file.3.gz
+%%MANPAGES%%man/man3/PX_open_blob_fp.3.gz
+%%MANPAGES%%man/man3/PX_open_file.3.gz
+%%MANPAGES%%man/man3/PX_open_fp.3.gz
+%%MANPAGES%%man/man3/PX_open_gsf.3.gz
+%%MANPAGES%%man/man3/PX_put_data_alpha.3.gz
+%%MANPAGES%%man/man3/PX_put_data_bcd.3.gz
+%%MANPAGES%%man/man3/PX_put_data_byte.3.gz
+%%MANPAGES%%man/man3/PX_put_data_bytes.3.gz
+%%MANPAGES%%man/man3/PX_put_data_double.3.gz
+%%MANPAGES%%man/man3/PX_put_data_long.3.gz
+%%MANPAGES%%man/man3/PX_put_data_short.3.gz
+%%MANPAGES%%man/man3/PX_put_record.3.gz
+%%MANPAGES%%man/man3/PX_put_recordn.3.gz
+%%MANPAGES%%man/man3/PX_read_blobdata.3.gz
+%%MANPAGES%%man/man3/PX_read_primary_index.3.gz
+%%MANPAGES%%man/man3/PX_retrieve_record.3.gz
+%%MANPAGES%%man/man3/PX_set_blob_file.3.gz
+%%MANPAGES%%man/man3/PX_set_inputencoding.3.gz
+%%MANPAGES%%man/man3/PX_set_parameter.3.gz
+%%MANPAGES%%man/man3/PX_set_tablename.3.gz
+%%MANPAGES%%man/man3/PX_set_targetencoding.3.gz
+%%MANPAGES%%man/man3/PX_set_value.3.gz
+%%MANPAGES%%man/man3/PX_strdup.3.gz
+%%MANPAGES%%man/man3/PX_time2string.3.gz
+%%MANPAGES%%man/man3/PX_timestamp2string.3.gz
+%%MANPAGES%%man/man3/PX_update_record.3.gz
+%%MANPAGES%%man/man3/PX_write_primary_index.3.gz
+%%MANPAGES%%man/man3/pxlib.3.gz
+%%NLS%%share/locale/de/LC_MESSAGES/pxlib.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pxlib.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pxlib.mo