Stagify, define LICENSE (LGPL21), and generally cleanup the port while here.

4 files changed, 39 insertions, 53 deletions

diff --git a/net-im/jitsi/Makefile b/net-im/jitsi/Makefile
index 13cbd88fe525..f0e265f6a1d9 100644
--- a/net-im/jitsi/Makefile
+++ b/net-im/jitsi/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	jitsi-master-084e2b42b5
 MAINTAINER=	tzabal@it.teithe.gr
 COMMENT=	Open source IM and VoIP application
 
-MAN1=		jitsi.1
+LICENSE=	LGPL21
 
 USES=		zip
 USE_JAVA=	yes
@@ -23,59 +23,42 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 DESKTOP_ENTRIES="Jitsi" \
 		"VoIP and Instant Messenger" \
-		${PREFIX}/share/pixmaps/jitsi.png \
-		jitsi \
+		"${PREFIX}/share/pixmaps/jitsi.png" \
+		"${PORTNAME}" \
 		"Network;InstantMessaging;VideoConference;Java;" \
 		true
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 do-install:
 	@${ECHO_CMD} ">> Creating Jitsi directories..."
-	@${MKDIR} ${PREFIX}/lib/jitsi/sc-bundles
-	@${MKDIR} ${PREFIX}/lib/jitsi/lib/bundle
-	@${MKDIR} ${PREFIX}/lib/jitsi/lib/native
-
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/bundle
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native
 # Bundles (Jitsi modules)
 	@${ECHO_CMD} ">> Installing bundles (Jitsi modules)..."
-	@cd ${WRKSRC}/sc-bundles && ${COPYTREE_SHARE} \* \
-		${PREFIX}/lib/jitsi/sc-bundles
-	@${RM} ${PREFIX}/lib/jitsi/sc-bundles/*slick*.jar
-	@${RM} -r ${PREFIX}/lib/jitsi/sc-bundles/os-specific
-
-# Library Jars
+	@cd ${WRKSRC}/sc-bundles && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles
+	@${RM} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/*slick*.jar
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/os-specific
+# Library JARs
 	@${ECHO_CMD} ">> Installing library jars..."
-	@cd ${WRKSRC}/lib/bundle && ${COPYTREE_SHARE} \* \
-		${PREFIX}/lib/jitsi/lib/bundle "! -name junit.jar"
+	@cd ${WRKSRC}/lib/bundle && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${PREFIX}/lib/jitsi/lib/bundle "! -name junit.jar"
 	@cd ${WRKSRC}/lib && ${COPYTREE_SHARE} "felix.jar jdic-all.jar \
 		felix.client.run.properties logging.properties" \
-			${PREFIX}/lib/jitsi/lib
-
-# Native Libraries
-	@${ECHO_CMD} ">> Installing native libraries..."
-.if ${ARCH} != amd64
-	@cd ${WRKSRC}/lib/native/freebsd && ${COPYTREE_SHARE} \* \
-		${PREFIX}/lib/jitsi/lib/native
-.else
-	@cd ${WRKSRC}/lib/native/freebsd-64 && ${COPYTREE_SHARE} \* \
-		${PREFIX}/lib/jitsi/lib/native
-.endif
-
+			${STAGEDIR}${PREFIX}/lib/jitsi/lib
+# Native libraries
+	@${ECHO_CMD} ">> Installing native (${ARCH}) libraries..."
+	@cd ${WRKSRC}/lib/native/freebsd${ARCH:S/i386//:S/amd/-/} && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native
 # Wrapper script to run Jitsi
 	@${ECHO_CMD} ">> Installing wrapper script..."
-	@${INSTALL_SCRIPT} ${FILESDIR}/jitsi.sh ${PREFIX}/bin/jitsi
-
+	${INSTALL_SCRIPT} ${FILESDIR}/jitsi.sh ${STAGEDIR}${PREFIX}/bin/jitsi
 # Manual page
 	@${ECHO_CMD} ">> Installing the manual page..."
-	@${INSTALL_MAN} ${FILESDIR}/jitsi.1 ${MANPREFIX}/man/man1
-
+	${INSTALL_MAN} ${FILESDIR}/jitsi.1 ${STAGEDIR}${MANPREFIX}/man/man1
 # Desktop related
 	@${ECHO_CMD} ">> Installing Jitsi's logo..."
-	@${INSTALL_DATA} ${WRKSRC}/resources/images/logo/sc_logo_128x128.png \
-		${PREFIX}/share/pixmaps/jitsi.png
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKSRC}/resources/images/logo/sc_logo_128x128.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/jitsi.png
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/jitsi/pkg-descr b/net-im/jitsi/pkg-descr
index c87a78dc0bbf..b2f0046303e8 100644
--- a/net-im/jitsi/pkg-descr
+++ b/net-im/jitsi/pkg-descr
@@ -1,6 +1,8 @@
-Jitsi (formerly SIP Communicator) is an audio/video and chat communicator that
-supports protocols such as SIP, XMPP/Jabber, AIM/ICQ, Windows Live, Yahoo! and
-many other useful features. Jitsi is Open Source / Free Software, and is
-available under the terms of the LGPL.
+Jitsi (formerly SIP Communicator) is an audio/video and chat communicator
+that supports protocols such as SIP, XMPP/Jabber, AIM/ICQ, Windows Live,
+Yahoo! and many other useful features.
 
-WWW: https://jitsi.org
+Jitsi is Open Source / Free Software, and is available under the terms of
+the LGPL (version 2.1).
+
+WWW: https://jitsi.org/
diff --git a/net-im/jitsi/pkg-message b/net-im/jitsi/pkg-message
index e3436ff211ce..d8c5bcc48be2 100644
--- a/net-im/jitsi/pkg-message
+++ b/net-im/jitsi/pkg-message
@@ -1,9 +1,10 @@
--- Audio and Video codecs
+From the list of available audio codecs, deselect all except ``opus/48000''.
+From the list of available video codecs, deselect all except ``VP8''.
 
-From the list of available audio codecs, please deselect all except 'opus/48000'.
-From the list of available video codecs, please deselect all except 'VP8'.
-You can make this change via the interface of Jitsi:
--> Jitsi-Tools-Options-Audio-Encodings
--> Jitsi-Tools-Options-Video-Encodings
+You can make these changes via the interface of Jitsi:
 
-It is recommended that all the participants of an audio/video call to use the same codecs. 
+  -> Jitsi-Tools-Options-Audio-Encodings
+  -> Jitsi-Tools-Options-Video-Encodings
+
+It is recommended that all the participants of an audio/video call to use
+the same codecs.
diff --git a/net-im/jitsi/pkg-plist b/net-im/jitsi/pkg-plist
index d8ee52537432..6e9bef32b79a 100644
--- a/net-im/jitsi/pkg-plist
+++ b/net-im/jitsi/pkg-plist
@@ -141,7 +141,7 @@ lib/jitsi/sc-bundles/util.jar
 lib/jitsi/sc-bundles/version-impl.jar
 lib/jitsi/sc-bundles/yahooaccregwizz.jar
 lib/jitsi/sc-bundles/zrtp4j.jar
-share/applications/jitsi.desktop
+man/man1/jitsi.1.gz
 share/pixmaps/jitsi.png
 @dirrm lib/jitsi/sc-bundles
 @dirrm lib/jitsi/lib/native