- Switch to USES=libtool, drop .la files

- Stagify
- Fix shebangs

Approved by:	portmgr blanket

2 files changed, 15 insertions, 41 deletions

diff --git a/math/tablix/Makefile b/math/tablix/Makefile
index a1a77f3e9e09..6dfd7d4421cf 100644
--- a/math/tablix/Makefile
+++ b/math/tablix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tablix2
 PORTVERSION=	0.3.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math www
 MASTER_SITES=	http://www.tablix.org/releases/stable/ \
 		http://my.samba.org/
@@ -18,19 +18,19 @@ PVM_ROOT=	${LOCALBASE}/lib/pvm
 
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
-USES=		gettext gmake
+USES=		gettext gmake libtool shebangfix
+SHEBANG_FILES=	${WRKSRC}/utils/tablix2_plot \
+		${WRKSRC}/utils/tablix2_benchmark \
+		${WRKSRC}/ttf/tablix2_test
 
 CONFIGURE_ENV=	PVM_ROOT=${PVM_ROOT} PVM_LIB=${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-MAN1=	tablix2.1 tablix2_benchmark.1 tablix2_kernel.1 tablix2_output.1 \
-	tablix2_plot.1 tablix2_test.1
-
-NO_STAGE=	yes
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/tablix2 ${PVM_ROOT}/bin/FREEBSD/tablix2
-	${INSTALL_SCRIPT} ${WRKSRC}/src/tablix2_kernel ${PVM_ROOT}/bin/FREEBSD/tablix2_kernel
-	${INSTALL_SCRIPT} ${WRKSRC}/src/tablix2_output ${PVM_ROOT}/bin/FREEBSD/tablix2_output
+	${MKDIR} ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD
+	${INSTALL_SCRIPT} ${WRKSRC}/src/tablix2 ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD/tablix2
+	${INSTALL_SCRIPT} ${WRKSRC}/src/tablix2_kernel ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD/tablix2_kernel
+	${INSTALL_SCRIPT} ${WRKSRC}/src/tablix2_output ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD/tablix2_output
 
 .include <bsd.port.mk>
diff --git a/math/tablix/pkg-plist b/math/tablix/pkg-plist
index 33c811a06021..8bde6cea0611 100644
--- a/math/tablix/pkg-plist
+++ b/math/tablix/pkg-plist
@@ -7,70 +7,44 @@ bin/tablix2_test
 lib/pvm/bin/FREEBSD/tablix2
 lib/pvm/bin/FREEBSD/tablix2_kernel
 lib/pvm/bin/FREEBSD/tablix2_output
-lib/tablix2/available.la
 lib/tablix2/available.so
-lib/tablix2/consecutive.la
 lib/tablix2/consecutive.so
-lib/tablix2/events_sameday.la
 lib/tablix2/events_sameday.so
-lib/tablix2/export_csv.la
 lib/tablix2/export_csv.so
-lib/tablix2/export_gnutu.la
 lib/tablix2/export_gnutu.so
-lib/tablix2/export_htmlcss.la
 lib/tablix2/export_htmlcss.so
-lib/tablix2/export_htmlcss2.la
 lib/tablix2/export_htmlcss2.so
-lib/tablix2/export_ttf.la
 lib/tablix2/export_ttf.so
-lib/tablix2/export_vcal.la
 lib/tablix2/export_vcal.so
-lib/tablix2/firstlastequal.la
 lib/tablix2/firstlastequal.so
-lib/tablix2/firstorlast.la
 lib/tablix2/firstorlast.so
-lib/tablix2/fixed.la
 lib/tablix2/fixed.so
-lib/tablix2/fixedtime.la
 lib/tablix2/fixedtime.so
-lib/tablix2/freemorning.la
 lib/tablix2/freemorning.so
-lib/tablix2/freeperiod.la
 lib/tablix2/freeperiod.so
-lib/tablix2/holes.la
 lib/tablix2/holes.so
-lib/tablix2/maxconsecutive.la
 lib/tablix2/maxconsecutive.so
-lib/tablix2/maxperday.la
 lib/tablix2/maxperday.so
-lib/tablix2/minrooms.la
 lib/tablix2/minrooms.so
-lib/tablix2/perday.la
 lib/tablix2/perday.so
-lib/tablix2/placecapability.la
 lib/tablix2/placecapability.so
-lib/tablix2/preferredroom.la
 lib/tablix2/preferredroom.so
-lib/tablix2/preferredtime.la
 lib/tablix2/preferredtime.so
-lib/tablix2/recurrence.la
 lib/tablix2/recurrence.so
-lib/tablix2/sameday.la
 lib/tablix2/sameday.so
-lib/tablix2/sametime.la
 lib/tablix2/sametime.so
-lib/tablix2/sametimeas.la
 lib/tablix2/sametimeas.so
-lib/tablix2/simplesametime.la
 lib/tablix2/simplesametime.so
-lib/tablix2/timeblocks.la
 lib/tablix2/timeblocks.so
-lib/tablix2/timeblocks_sameday.la
 lib/tablix2/timeblocks_sameday.so
-lib/tablix2/timeplace.la
 lib/tablix2/timeplace.so
-lib/tablix2/walk.la
 lib/tablix2/walk.so
+man/man1/tablix2.1.gz
+man/man1/tablix2_benchmark.1.gz
+man/man1/tablix2_kernel.1.gz
+man/man1/tablix2_output.1.gz
+man/man1/tablix2_plot.1.gz
+man/man1/tablix2_test.1.gz
 share/locale/sl/LC_MESSAGES/tablix2.mo
 share/tablix2/modulesref.xml
 @dirrm lib/tablix2