Date: Thu, 25 May 2006 00:05:14 +0200 (CEST) From: Herve Quiroz <hq@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: greg@greg.rim.or.jp Subject: ports/97855: [PATCH] java/jce-aba: Update to bsd.java.mk 2.0 and other improvements Message-ID: <200605242205.k4OM5EE7030951@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200605242210.k4OMABEb087022@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97855
>Category: ports
>Synopsis: [PATCH] java/jce-aba: Update to bsd.java.mk 2.0 and other improvements
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 24 22:10:11 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Tue May 9 17:19:22 CEST
>Description:
- Update to bsd.java.mk 2.0
- Use a PKGNAMESUFFIX to tag package according to the JDK version used (-java11
or -java12)
- Honor NOPORTDOCS and install documentation in ${DOCSDIR}
- Use PORTDOCS to handle documentation plist differences between Java 1.1 and
1.2 implementations
- Use PLIST_FILES (and thus remove pkg-plist)
Removed file(s):
- pkg-plist
Port maintainer (greg@greg.rim.or.jp) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- jce-aba-java12-1.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jce-aba/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- Makefile 15 Apr 2004 22:38:09 -0000 1.8
+++ Makefile 24 May 2006 22:03:58 -0000
@@ -14,15 +14,32 @@
MAINTAINER= greg@greg.rim.or.jp
COMMENT= Clean room implementation of the Java Cryptograph Extension (JCE) API
-USE_JAVA= 1.1+
+USE_JAVA= yes
NO_BUILD= yes
+
+PLIST_FILES= %%JAVAJARDIR%%/jce.zip
+
+.if !defined(NOPORTDOCS)
+PORTDOCS= *
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.1"
JDKVERSION= 1.1
+PKGNAMESUFFIX= -java11
+.else
+JDKVERSION= 1.2
+PKGNAMESUFFIX= -java12
+.endif
do-install:
- ${INSTALL_DATA} ${WRKSRC}/lib-${JDKVERSION}/jce.zip ${PREFIX}/share/java/classes/
- ${MKDIR} ${PREFIX}/share/java/jce-aba
+ ${INSTALL_DATA} ${WRKSRC}/lib-${JDKVERSION}/jce.zip ${JAVAJARDIR}
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/docs-${JDKVERSION} && ${FIND} . \
- | ${CPIO} -pdmu -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/java/jce-aba
+ | ${CPIO} -pdmu -R ${DOCOWN}:${DOCGRP} ${DOCSDIR}
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist 8 Mar 2000 12:08:34 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,164 +0,0 @@
-share/java/classes/jce.zip
-share/java/jce-aba/au.net.aba.crypto.provider.DHPubKey.html
-share/java/jce-aba/javax.crypto.KeyAgreementSpi.html
-share/java/jce-aba/javax.crypto.SecretKey.html
-share/java/jce-aba/au.net.aba.crypto.provider.TwofishKeyFactory.html
-share/java/jce-aba/au.net.aba.security.interfaces.RSAPublicKey.html
-share/java/jce-aba/au.net.aba.crypto.provider.DHKeyFactory.html
-share/java/jce-aba/au.net.aba.crypto.provider.Blowfish.html
-share/java/jce-aba/au.net.aba.crypto.provider.DESedeKeyFactory.html
-share/java/jce-aba/Package-au.net.aba.pgp.html
-share/java/jce-aba/packages.html
-share/java/jce-aba/au.net.aba.security.AlgorithmParametersSpi.html
-share/java/jce-aba/javax.crypto.interfaces.DHPublicKey.html
-share/java/jce-aba/javax.crypto.CipherInputStream.html
-share/java/jce-aba/au.net.aba.crypto.provider.IDEAKeyGenerator.html
-share/java/jce-aba/au.net.aba.crypto.spec.RC4KeySpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.KeyStore.html
-share/java/jce-aba/au.net.aba.security.spec.RSAPrivateCrtKeySpec.html
-share/java/jce-aba/javax.crypto.spec.DHGenParameterSpec.html
-share/java/jce-aba/Package-au.net.aba.crypto.spec.html
-share/java/jce-aba/javax.crypto.SealedObject.html
-share/java/jce-aba/au.net.aba.crypto.spec.BlowfishKeySpec.html
-share/java/jce-aba/au.net.aba.security.KeyFactorySpi.html
-share/java/jce-aba/au.net.aba.security.spec.EncodedKeySpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.RC4KeyGenerator.html
-share/java/jce-aba/Package-au.net.aba.lang.html
-share/java/jce-aba/au.net.aba.crypto.provider.IDEA.html
-share/java/jce-aba/javax.crypto.spec.DHParameterSpec.html
-share/java/jce-aba/au.net.aba.crypto.spec.AsciiEncodedKeySpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.SHA1.html
-share/java/jce-aba/au.net.aba.crypto.provider.SHA0.html
-share/java/jce-aba/Package-au.net.aba.security.html
-share/java/jce-aba/au.net.aba.crypto.provider.PBEKey.html
-share/java/jce-aba/javax.crypto.NoSuchPaddingException.html
-share/java/jce-aba/javax.crypto.ShortBufferException.html
-share/java/jce-aba/au.net.aba.security.spec.AlgorithmParameterSpec.html
-share/java/jce-aba/au.net.aba.security.KeyFactory.html
-share/java/jce-aba/au.net.aba.crypto.provider.CRC16.html
-share/java/jce-aba/Package-javax.crypto.html
-share/java/jce-aba/Package-au.net.aba.security.interfaces.html
-share/java/jce-aba/au.net.aba.security.spec.RSAPrivateKeySpec.html
-share/java/jce-aba/tree.html
-share/java/jce-aba/au.net.aba.crypto.provider.PBEWithMD5AndDES.html
-share/java/jce-aba/javax.crypto.spec.DHPrivateKeySpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.DHPrivKey.html
-share/java/jce-aba/au.net.aba.crypto.provider.ABAProvider.html
-share/java/jce-aba/au.net.aba.crypto.spec.InlineIvParameterSpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.DESKeyFactory.html
-share/java/jce-aba/javax.crypto.spec.PBEParameterSpec.html
-share/java/jce-aba/javax.crypto.spec.RC5ParameterSpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.RSAKeyFactory.html
-share/java/jce-aba/javax.crypto.Mac.html
-share/java/jce-aba/au.net.aba.crypto.provider.RC4KeyFactory.html
-share/java/jce-aba/au.net.aba.crypto.provider.PBEKeyFactory.html
-share/java/jce-aba/au.net.aba.security.AlgorithmParameters.html
-share/java/jce-aba/au.net.aba.security.spec.InvalidKeySpecException.html
-share/java/jce-aba/Package-au.net.aba.security.spec.html
-share/java/jce-aba/javax.crypto.interfaces.DHPrivateKey.html
-share/java/jce-aba/au.net.aba.security.KeyStoreSpi.html
-share/java/jce-aba/javax.crypto.NullCipher.html
-share/java/jce-aba/au.net.aba.security.InvalidAlgorithmParameterException.html
-share/java/jce-aba/AllNames.html
-share/java/jce-aba/au.net.aba.security.spec.PKCS8EncodedKeySpec.html
-share/java/jce-aba/javax.crypto.KeyGenerator.html
-share/java/jce-aba/au.net.aba.security.spec.KeySpec.html
-share/java/jce-aba/au.net.aba.lang.UnsupportedOperationException.html
-share/java/jce-aba/Package-au.net.aba.crypto.provider.html
-share/java/jce-aba/au.net.aba.security.spec.X509EncodedKeySpec.html
-share/java/jce-aba/javax.crypto.CipherSpi.html
-share/java/jce-aba/javax.crypto.KeyGeneratorSpi.html
-share/java/jce-aba/au.net.aba.crypto.provider.DES.html
-share/java/jce-aba/au.net.aba.crypto.provider.MD5.html
-share/java/jce-aba/images/CVS/Tag
-share/java/jce-aba/images/CVS/Root
-share/java/jce-aba/images/CVS/Entries
-share/java/jce-aba/images/CVS/Repository
-share/java/jce-aba/images/class-index.gif
-share/java/jce-aba/images/yellow-ball-small.gif
-share/java/jce-aba/images/red-ball-small.gif
-share/java/jce-aba/images/OpenBookIcon.gif
-share/java/jce-aba/images/field-index.gif
-share/java/jce-aba/images/interface-index.gif
-share/java/jce-aba/images/package-index.gif
-share/java/jce-aba/images/yellow-ball.gif
-share/java/jce-aba/images/magenta-ball-small.gif
-share/java/jce-aba/images/magenta-ball.gif
-share/java/jce-aba/images/variable-index.gif
-share/java/jce-aba/images/fields.gif
-share/java/jce-aba/images/blue-ball.gif
-share/java/jce-aba/images/green-ball-small.gif
-share/java/jce-aba/images/blue-ball-small.gif
-share/java/jce-aba/images/constructors.gif
-share/java/jce-aba/images/exception-index.gif
-share/java/jce-aba/images/methods.gif
-share/java/jce-aba/images/method-index.gif
-share/java/jce-aba/images/constructor-index.gif
-share/java/jce-aba/images/variables.gif
-share/java/jce-aba/images/green-ball.gif
-share/java/jce-aba/images/cyan-ball-small.gif
-share/java/jce-aba/images/red-ball.gif
-share/java/jce-aba/images/cyan-ball.gif
-share/java/jce-aba/images/error-index.gif
-share/java/jce-aba/au.net.aba.crypto.provider.PBE.html
-share/java/jce-aba/au.net.aba.crypto.provider.RC4.html
-share/java/jce-aba/au.net.aba.crypto.provider.RSA.html
-share/java/jce-aba/au.net.aba.crypto.spec.IDEAKeySpec.html
-share/java/jce-aba/javax.crypto.spec.DHPublicKeySpec.html
-share/java/jce-aba/javax.crypto.Cipher.html
-share/java/jce-aba/au.net.aba.crypto.provider.Twofish.html
-share/java/jce-aba/au.net.aba.crypto.provider.RSAPrivKey.html
-share/java/jce-aba/au.net.aba.crypto.provider.RSAKeyPairGenerator.html
-share/java/jce-aba/au.net.aba.crypto.provider.BlowfishKeyGenerator.html
-share/java/jce-aba/au.net.aba.crypto.provider.DESKeyGenerator.html
-share/java/jce-aba/javax.crypto.spec.RC2ParameterSpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.TwofishKeyGenerator.html
-share/java/jce-aba/javax.crypto.MacSpi.html
-share/java/jce-aba/au.net.aba.pgp.Keyring.html
-share/java/jce-aba/au.net.aba.crypto.provider.BlowfishKey.html
-share/java/jce-aba/javax.crypto.interfaces.DHKey.html
-share/java/jce-aba/au.net.aba.crypto.provider.DESKey.html
-share/java/jce-aba/au.net.aba.crypto.provider.DESMac.html
-share/java/jce-aba/au.net.aba.crypto.provider.DESede.html
-share/java/jce-aba/au.net.aba.security.KeyStoreException.html
-share/java/jce-aba/au.net.aba.crypto.spec.TwofishKeySpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.DESedeKeyGenerator.html
-share/java/jce-aba/au.net.aba.crypto.provider.IDEAKey.html
-share/java/jce-aba/au.net.aba.security.SignedObject.html
-share/java/jce-aba/javax.crypto.spec.IvParameterSpec.html
-share/java/jce-aba/javax.crypto.CipherOutputStream.html
-share/java/jce-aba/au.net.aba.crypto.provider.MD5withRSA.html
-share/java/jce-aba/au.net.aba.crypto.provider.BlowfishKeyFactory.html
-share/java/jce-aba/javax.crypto.KeyAgreement.html
-share/java/jce-aba/au.net.aba.crypto.provider.TwofishKey.html
-share/java/jce-aba/javax.crypto.spec.DESedeKeySpec.html
-share/java/jce-aba/javax.crypto.spec.SecretKeySpec.html
-share/java/jce-aba/au.net.aba.crypto.PublicKeySecuredObject.html
-share/java/jce-aba/au.net.aba.security.spec.RSAPublicKeySpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.BlockCipher.html
-share/java/jce-aba/au.net.aba.crypto.SecuredObject.html
-share/java/jce-aba/au.net.aba.crypto.provider.RC4Key.html
-share/java/jce-aba/javax.crypto.SecretKeyFactorySpi.html
-share/java/jce-aba/au.net.aba.security.KeyStore.html
-share/java/jce-aba/au.net.aba.security.interfaces.RSAPrivateCrtKey.html
-share/java/jce-aba/au.net.aba.crypto.provider.PBEWithSHA1And128BitRC4.html
-share/java/jce-aba/au.net.aba.security.interfaces.RSAPrivateKey.html
-share/java/jce-aba/javax.crypto.spec.PBEKeySpec.html
-share/java/jce-aba/au.net.aba.security.spec.InvalidParameterSpecException.html
-share/java/jce-aba/au.net.aba.crypto.provider.IDEAKeyFactory.html
-share/java/jce-aba/javax.crypto.IllegalBlockSizeException.html
-share/java/jce-aba/au.net.aba.crypto.provider.DESedeKey.html
-share/java/jce-aba/Package-javax.crypto.spec.html
-share/java/jce-aba/javax.crypto.SecretKeyFactory.html
-share/java/jce-aba/au.net.aba.security.GeneralSecurityException.html
-share/java/jce-aba/javax.crypto.spec.DESKeySpec.html
-share/java/jce-aba/au.net.aba.crypto.provider.RSAPubKey.html
-share/java/jce-aba/Package-javax.crypto.interfaces.html
-share/java/jce-aba/au.net.aba.crypto.provider.RSAPrivKeyCrt.html
-share/java/jce-aba/javax.crypto.BadPaddingException.html
-share/java/jce-aba/au.net.aba.crypto.provider.DHKeyPairGenerator.html
-share/java/jce-aba/au.net.aba.security.UnrecoverableKeyException.html
-share/java/jce-aba/Package-au.net.aba.crypto.html
-@dirrm share/java/jce-aba/images/CVS
-@dirrm share/java/jce-aba/images
-@dirrm share/java/jce-aba
--- jce-aba-java12-1.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605242205.k4OM5EE7030951>