From 238db7a36f80efef056a83a27413b4f6af3792dd Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Fri, 27 Jun 2014 16:11:09 +0000
Subject: [PATCH] - Stage support - Cleanup

PR:		190780
---
 textproc/scim-input-pad/Makefile  | 22 ++++++++++------------
 textproc/scim-input-pad/pkg-plist |  5 ++---
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index c529a802f218..d6769223df1c 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scim-input-pad
 PORTVERSION=	0.1.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/scim/${PORTNAME}/0.1.3/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
@@ -11,13 +11,14 @@ MASTER_SITES=	SF/scim/${PORTNAME}/0.1.3/ \
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	SCIM add-on to input various symbols with customisable on-screen pad
 
-LIB_DEPENDS=	scim-1.0.10:${PORTSDIR}/textproc/scim
+LIB_DEPENDS=	libscim-1.0.so:${PORTSDIR}/textproc/scim
 
 USE_LDCONFIG=	yes
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig libtool
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 DESKTOP_ENTRIES="SCIM Input Pad" \
 		"${COMMENT}" \
@@ -28,8 +29,6 @@ DESKTOP_ENTRIES="SCIM Input Pad" \
 
 DOCS=		ChangeLog README
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS NLS
 
 .include <bsd.port.options.mk>
@@ -44,16 +43,15 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -E 's|(SCIM_LIBEXECDIR=).*|\1${PREFIX}/lib/scim-1.0|' \
+	@${REINPLACE_CMD} -E 's|(SCIM_LIBEXECDIR=).*|\1${PREFIX}/lib/scim-1.0| ; \
+   			s|(SCIM_MODULEDIR=).*|\1${PREFIX}/lib/scim-1.0/1.4.0| ; \
+			s|(SCIM_ICONDIR=).*|\1${PREFIX}/share/scim/icons| ; \
+			s|(SCIM_DATADIR=).*|\1${PREFIX}/share/scim|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -E 's|^_NAME|NAME|g' ${WRKSRC}/data/*.pad.in
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/scim-input-pad/pkg-plist b/textproc/scim-input-pad/pkg-plist
index f425bb401f7f..f90dd642a5d7 100644
--- a/textproc/scim-input-pad/pkg-plist
+++ b/textproc/scim-input-pad/pkg-plist
@@ -1,11 +1,10 @@
 bin/scim-input-pad
 lib/scim-1.0/1.4.0/Helper/input-pad.a
-lib/scim-1.0/1.4.0/Helper/input-pad.la
 lib/scim-1.0/1.4.0/Helper/input-pad.so
 lib/libscim-input-pad.a
-lib/libscim-input-pad.la
 lib/libscim-input-pad.so
-lib/libscim-input-pad.so.1
+lib/libscim-input-pad.so.0
+lib/libscim-input-pad.so.0.1.0
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%NLS%%share/locale/de/LC_MESSAGES/scim-input-pad.mo