4 files changed, 97 insertions, 48 deletions

diff --git a/portuguese/irpf-pt_BR/Makefile b/portuguese/irpf-pt_BR/Makefile
index 677c6508acd7..4370a2244211 100644
--- a/portuguese/irpf-pt_BR/Makefile
+++ b/portuguese/irpf-pt_BR/Makefile
@@ -6,55 +6,101 @@
 #
 
 PORTNAME=	irpf
-PORTVERSION=	2008.1.0
-PORTREVISION=	3
+PORTVERSION=	2009.1.0
 CATEGORIES=	portuguese finance java
-MASTER_SITES=	http://www.receita.fazenda.gov.br/Publico/programas/irpf/2008/PGDIrpf2008/Java/ZIP/
+MASTER_SITES=	http://www.receita.fazenda.gov.br/Publico/programas/irpf/2009/PGDIrpf2009/Java/ZIP/
 PKGNAMEPREFIX?=	pt_BR-
-DISTNAME=	irpf2008v1.0
+DISTNAME=	IRPF2009v1.0
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	Programa do Imposto de Renda Pessoa Fisica 2007 versao Java
+COMMENT=	Programa do Imposto de Renda Pessoa Fisica 2009 versao Java
 
 USE_ZIP=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}2008
+WRKSRC=		${WRKDIR}/${PORTNAME}2009
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_OS=	native
 
 NO_BUILD=	yes
-SUB_FILES=	pkg-message
 PLIST_SUB=	JAR_DIR=${JAR_DIR}
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 JAVAVM=		${LOCALBASE}/bin/java
 
 JAR_DIR=	${JAVAJARDIR:S,^${PREFIX}/,,}/${PORTNAME}
 
+#
+## Files to install
+#
+
+# images
+IMAGE_FILES=	\
+		offline.png \
+		online.png
+# jar
 JAR_FILES=	\
 		irpf.jar \
-		jhall.jar
+		lib/commons-beanutils-1.7.jar \
+		lib/commons-collections-2.1.jar \
+		lib/commons-digester-1.8.jar \
+		lib/commons-logging-1.0.2.jar \
+		lib/forms-1.0.3.jar \
+		lib/foxtrot.jar \
+		lib/itext-1.02b.jar \
+		lib/jasperreports-2.0.3.jar \
+		lib/jdt-compiler-3.1.1.jar \
+		lib/jhall.jar \
+		lib/looks-1.3.1.jar \
+		lib/ppgd-formatosext-2.9.jar \
+		lib/ppgd-gui-2.9.jar \
+		lib/ppgd-gui-beans-2.9.jar \
+		lib/ppgd-infra-2.9.jar \
+		lib/ppgd-negocio-2.9.jar \
+		lib/ppgd-persistencia-2.9.jar \
+		lib/ppgd-swixml.jar \
+		lib/serpro.jar \
+		lib/swing-layout-0.7.jar \
+		lib/xalan.jar
+
+#
+## PLIST generation
+#
 
+# wrapper
 PLIST_FILES+=	bin/${PORTNAME}
 
+# jars
 .for jar in ${JAR_FILES}
-PLIST_FILES+=	%%JAR_DIR%%/${jar}
+PLIST_FILES+=	%%JAR_DIR%%/${jar:C/^lib\///}
 .endfor
 
+# jar dir
 PLIST_DIRS+=	\
 		%%JAR_DIR%%
 
+# DATADIR files
+PORTDATA=	*
+
 post-patch:
-	@${SED} -e  "s|%%JAR_DIR%%|${JAR_DIR}|; \
+	@${SED} -e  "s|%%DATADIR%%|${DATADIR}|; \
+		s|%%DATA_FILES%%|${IMAGE_FILES}|; \
+		s|%%JAR_DIR%%|${JAR_DIR}|; \
 		s|%%JAR_FILE%%|${JAR_FILE}|; \
-		s|%%JAR_FILES%%|${JAR_FILES}|; \
+		s|%%JAR_FILES%%|${JAR_FILES:C/^lib\///}|; \
 		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
 do-install:
+# jar dir
 	@${MKDIR} ${PREFIX}/${JAR_DIR}
+# data dir
+	@${MKDIR} ${DATADIR}
+# images
+.for file in ${IMAGE_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} \
+		${DATADIR}
+.endfor
 # jars
 .for jar in ${JAR_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${jar} \
@@ -64,9 +110,6 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
 		${PREFIX}/bin/${PORTNAME}
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.pre.mk>
 
 JAR_FILE=	${PORTNAME}.jar
diff --git a/portuguese/irpf-pt_BR/distinfo b/portuguese/irpf-pt_BR/distinfo
index e986ba635600..85ffb36bc536 100644
--- a/portuguese/irpf-pt_BR/distinfo
+++ b/portuguese/irpf-pt_BR/distinfo
@@ -1,3 +1,3 @@
-MD5 (irpf2008v1.0.zip) = 701b4f3ec42cb9e3cc02157cbbb36053
-SHA256 (irpf2008v1.0.zip) = d165600e15e6be2278aca9fb2b753557a9d411f64f3b330985c0799ef125c062
-SIZE (irpf2008v1.0.zip) = 9778350
+MD5 (IRPF2009v1.0.zip) = eff1210b99283c6b2ef0866cb0c0e34b
+SHA256 (IRPF2009v1.0.zip) = 458f2aacec76fc46abb310538d561237a270a90ba4e26ab432049b287dec7271
+SIZE (IRPF2009v1.0.zip) = 11964972
diff --git a/portuguese/irpf-pt_BR/files/pkg-message.in b/portuguese/irpf-pt_BR/files/pkg-message.in
deleted file mode 100644
index fc86cd559f87..000000000000
--- a/portuguese/irpf-pt_BR/files/pkg-message.in
+++ /dev/null
@@ -1,14 +0,0 @@
-1) E vedada apresentacao da declaracao gerada pelo programa IRPF2007
-   Java pela pessoa fisica que:
- a) obteve, em qualquer mes do ano-calendario de 2006, ganho de
-    capital na alienacao de bens ou direitos sujeito incidencia do
-    imposto;
- b) optou pela isencao do imposto de renda incidente sobre o ganho
-    de capital auferido na venda de imoveis residenciais, cujo
-    produto da venda seja destinado a aplicacao na aquisicao de
-    imoveis residenciais localizados no Pais, no prazo de 180 (cento
-    e oitenta) dias contado da celebracao do contrato de venda, nos
-    termos do art. 39 da Lei no 11.196, de 21 de novembro de 2005.
-2) Para efetuar a transmissao em qualquer sistema operacional,
-   e necessario que esteja instalado o programa Receitanet Java
-   2007.01 ou superior.
diff --git a/portuguese/irpf-pt_BR/files/wrapper.sh b/portuguese/irpf-pt_BR/files/wrapper.sh
index 2e750bb550b8..fb7a15dd8bfd 100644
--- a/portuguese/irpf-pt_BR/files/wrapper.sh
+++ b/portuguese/irpf-pt_BR/files/wrapper.sh
@@ -6,6 +6,9 @@
 export JAVA_VERSION
 
 PREFIX="%%PREFIX%%"
+# data
+DATADIR="%%DATADIR%%"
+DATA_FILES="%%DATA_FILES%%"
 # java
 JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM="%%JAVAVM%%"
@@ -15,26 +18,31 @@ JAR_FILE="%%JAR_FILE%%"
 # home
 HOME_DIR=${HOME}/.irpf
 
-configure_java_classpath () {
-  if [ -z "${CLASSPATH}" ]
-  then
-        CLASSPATH=./irpf.jar:./jhall.jar
-  else
-        CLASSPATH=./irpf.jar:./jhall.jar:${CLASSPATH}
-  fi
-}
-
 prepare_home_dir () {
   # create home dir staging area
   if [ ! -d ${HOME_DIR}/aplicacao/dados ]
   then
 	mkdir -p ${HOME_DIR}/aplicacao/dados
   fi
+  # create the lib dir
+  if [ ! -d ${HOME_DIR}/lib ]
+  then
+	mkdir -p ${HOME_DIR}/lib 2>/dev/null
+  fi
+  # link the data files
+  for data in ${DATA_FILES}
+  do
+	rm -f ${HOME_DIR}/${data} 2>/dev/null
+	cp -f ${DATADIR}/${data} ${HOME_DIR}/${data} 2>/dev/null
+  done
+  # link the jar file
+  rm -f ${HOME_DIR}/${JAR_FILE} 2>/dev/null
+  cp -f ${PREFIX}/${JAR_DIR}/${JAR_FILE} ${HOME_DIR}/${JAR_FILE} 2>/dev/null
   # link the jar files
   for jar in ${JAR_FILES}
   do
-	rm -f ${HOME_DIR}/${jar} 2>/dev/null
-	cp -f ${PREFIX}/${JAR_DIR}/${jar} ${HOME_DIR}/${jar} 2>/dev/null
+	rm -f ${HOME_DIR}/lib/${jar} 2>/dev/null
+	cp -f ${PREFIX}/${JAR_DIR}/${jar} ${HOME_DIR}/lib/${jar} 2>/dev/null
   done
 }
 
@@ -44,22 +52,34 @@ start_irpf () {
 }
 
 clean_home_dir () {
+  # remove the data files
+  for data in ${DATA_FILES}
+  do
+	if [ -f ${HOME_DIR}/${data} ]
+	then
+		rm -f ${HOME_DIR}/${data} 2>/dev/null
+	fi
+  done
+  # remove the jar file
+  rm -f ${HOME_DIR}/${JAR_FILE} 2>/dev/null
   # remove the jar files
   for jar in ${JAR_FILES}
   do
-	if [ -f ${HOME_DIR}/${jar} ]
+	if [ -f ${HOME_DIR}/lib/${jar} ]
 	then
-		rm -f ${HOME_DIR}/${jar} 2>/dev/null
+		rm -f ${HOME_DIR}/lib/${jar} 2>/dev/null
 	fi
   done
+  # remove the lib dir
+  if [ -d ${HOME_DIR}/lib ]
+  then
+	rmdir ${HOME_DIR}/lib 2>/dev/null
+  fi
 }
 
 # always verify that home dir staging area is pristine
 prepare_home_dir
 
-# prepare java CLASSPATH
-configure_java_classpath
-
 start_irpf
 
 # remove jars