From owner-svn-ports-head@FreeBSD.ORG  Sun Jan  5 19:17:04 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2EC60E18;
 Sun,  5 Jan 2014 19:17:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 008531B2E;
 Sun,  5 Jan 2014 19:17:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s05JH3xa034129;
 Sun, 5 Jan 2014 19:17:03 GMT (envelope-from danilo@svn.freebsd.org)
Received: (from danilo@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s05JH3Lh034128;
 Sun, 5 Jan 2014 19:17:03 GMT (envelope-from danilo@svn.freebsd.org)
Message-Id: <201401051917.s05JH3Lh034128@svn.freebsd.org>
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Sun, 5 Jan 2014 19:17:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338817 - head/editors/jedit
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jan 2014 19:17:04 -0000

Author: danilo
Date: Sun Jan  5 19:17:03 2014
New Revision: 338817
URL: http://svnweb.freebsd.org/changeset/ports/338817

Log:
  - Fix the man page installation. Install all files manually. The java installer seems not to respect the paths.

Modified:
  head/editors/jedit/Makefile

Modified: head/editors/jedit/Makefile
==============================================================================
--- head/editors/jedit/Makefile	Sun Jan  5 18:37:28 2014	(r338816)
+++ head/editors/jedit/Makefile	Sun Jan  5 19:17:03 2014	(r338817)
@@ -8,7 +8,6 @@ CATEGORIES=	editors java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}${PORTVERSION}install
 EXTRACT_SUFX=	.jar
-EXTRACT_ONLY=
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Powerful programmer\'s text editor written in Java
@@ -37,12 +36,22 @@ SUB_FILES=	jedit.sh
 DESKTOP_ENTRIES="jEdit" "${COMMENT}" "${PORTNAME}" \
 	"${PORTNAME}" "Development;" false
 
+post-extract:
+	@(cd ${WRKDIR}/installer ; ${TAR} -xjf jedit-api.tar.bz2 ;\
+		${TAR} -xjf jedit-macros.tar.bz2 ; \
+		${TAR} -xjf jedit-program.tar.bz2)
+
 do-install:
-	@${PRINTF} "${STAGEDIR}${DATADIR}\n${WRKDIR}\n${STAGEDIR}${PREFIX}/man/man1\nY\nY\nY" | \
-		${SETENV} CLASSPATH=${DISTDIR}/${DISTNAME}.jar \
-		${JAVA} installer.Install text
-	@${INSTALL_SCRIPT} ${WRKDIR}/jedit.sh ${STAGEDIR}${PREFIX}/bin/jedit
-	@${INSTALL_DATA} ${STAGEDIR}${DATADIR}/doc/jedit.png \
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/installer/${PORTNAME}.jar ${STAGEDIR}${DATADIR}/
+.for dir in doc jars keymaps modes properties startup
+	(cd ${WRKDIR}/installer ; ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR}/)
+.endfor
+	(cd ${WRKDIR}/installer ; ${TAR} --exclude 'modes' --exclude 'keymaps' \
+		-chf - macros | ${TAR}  -xf - -C ${STAGEDIR}${DATADIR}/)
+	${INSTALL_SCRIPT} ${WRKDIR}/jedit.sh ${STAGEDIR}${PREFIX}/bin/jedit
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/doc/jedit.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+	${INSTALL_MAN} ${WRKDIR}/jedit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>