Index: head/lang/erlang/Makefile =================================================================== --- head/lang/erlang/Makefile (revision 81912) +++ head/lang/erlang/Makefile (revision 81913) @@ -1,161 +1,162 @@ # New ports collection makefile for: erlang # Date created: 11 Dec 1998 # Whom: ruslan@shevchenko.kiev.ua # # $FreeBSD$ # PORTNAME= erlang PORTVERSION= 9.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \ http://www.erlang.org/download/ \ http://erlang.stacken.kth.se/download/ \ http://www.csd.uu.se/ftp/mirror/erlang/download/ DISTNAME= otp_src_R9B-1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= http://www.erlang.org/download/patches/ PATCHFILES= PATCH_DIST_STRIP= -p1 MAINTAINER= olgeni@FreeBSD.org COMMENT= A functional programming language from Ericsson # Set JAVABINDIR to where you have javac, if different from below JAVABINDIR?= ${LOCALBASE}/jdk1.3.1/bin JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk13 .if !exists(${JAVABINDIR}/java) WITHOUT_JAVA= yes .endif CONFIGURE_TARGET= # Empty # Don't clutter up /usr/ports/distfiles with all distfiles (including patches) DIST_SUBDIR= erlang ERLANG_MAN= otp_man_R9B-1.tar.gz .if !defined(NOPORTDOCS) ERLANG_DOCS= otp_html_R9B-1.tar.gz .endif .if !defined(WITHOUT_X11) RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 .endif USE_GMAKE= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-threads --enable-hipe .if !defined(WITHOUT_JAVA) # The Java applications that are part of the Erlang distribution are # not strictly necessary - it is included for completeness sake. A # problem with the Erlang build procedure is that it only checks if # javac is in the regular path - and then assumes that all of the jdk # utilities is in the path as well. The only way to make sure that # this is the case (that I could think of at least) was to make sure # JAVABINDIR is added to the PATH, using the *_ENV macros. BUILD_DEPENDS+= ${JAVAPORT} # Make sure JAVABINDIR is in the path CONFIGURE_ENV+= PATH=${PATH}:${JAVABINDIR} MAKE_ENV+= PATH=${PATH}:${JAVABINDIR} SCRIPT_ENV+= PATH=${PATH}:${JAVABINDIR} .endif # Workaround for a ./configure recursion bug which leads to INSTALL being # set to "../../../../[...]" post-patch: @cd ${WRKSRC} && ${CAT} ${FILESDIR}/post-patch-configure | ${PATCH} pre-configure: # Check if javac is really in ${JAVABINDIR}. .if !defined(WITHOUT_JAVA) @if [ ! -x ${JAVABINDIR}/javac ]; then \ ${ECHO_MSG} ">> Error: cannot find javac in JAVABINDIR."; \ ${ECHO_MSG} ">> Please configure JAVABINDIR, or use the WITHOUT_JAVA option"; \ exit 1; \ fi .endif # If X11 is not used, skip the gs application. .if defined(WITHOUT_X11) @${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP .endif # Install documentation. (HTML docs need to be in same dir as the # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. post-install: @${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ -C ${PREFIX}/lib/erlang @${RM} -rf ${PREFIX}/lib/erlang/man/cat? .if !defined(NOPORTDOCS) @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${PREFIX}/lib/erlang .endif @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/erlang @${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/erlang @sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \ cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock # All non-library files. @cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \ | ${GREP} -v "^lib/erlang/man" \ | ${GREP} -v "^lib/erlang/lib" \ | sort \ > ${WRKDIR}/PLIST.lib-erlang # Stock OTP libraries. @for LIBRARY in ${OTP_LIBS}; do \ cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type f -o -type l; \ done | sort >> ${WRKDIR}/PLIST.lib-erlang # Stock OTP library directories. @for LIBRARY in ${OTP_LIBS}; do \ cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type d \ | ${SED} -e 's/^/@dirrm /g'; \ done | sort -r >> ${WRKDIR}/PLIST.lib-erlang # Other directories. @cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \ | ${GREP} -v "^lib/erlang/man" \ | ${GREP} -v "^lib/erlang/lib" \ | ${SED} -e 's/^/@dirrm /g' \ >> ${WRKDIR}/PLIST.lib-erlang @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script @${ECHO_CMD} "/Insert PLIST.lib-erlang" >> ${WRKDIR}/ex.script @${ECHO_CMD} "d" >> ${WRKDIR}/ex.script @${ECHO_CMD} "r ${WRKDIR}/PLIST.lib-erlang" >> ${WRKDIR}/ex.script @${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script @${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-erlang @cd ${WRKDIR} ; ex < ex.script # The man-pages are put (in spite of FreeBSD's port convention) in a # private subdir. This is to avoid cluttering up the man page name # space. Also the Erlang man pages are more of internal documentation # using the man format than actual system man pages. (The erl.1 and # epmd.1 perhaps being the exception). NOMANCOMPRESS= yes MAN1PREFIX= ${PREFIX}/lib/erlang MAN3PREFIX= ${PREFIX}/lib/erlang MAN4PREFIX= ${PREFIX}/lib/erlang MAN6PREFIX= ${PREFIX}/lib/erlang .include "Makefile.lib" .include "Makefile.man" .include Property changes on: head/lang/erlang/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.36 \ No newline at end of property +1.37 \ No newline at end of property Index: head/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in =================================================================== --- head/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in (nonexistent) +++ head/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in (revision 81913) @@ -0,0 +1,35 @@ + +$FreeBSD$ + +--- lib/crypto/c_src/Makefile.in.orig Sun Jun 1 17:57:42 2003 ++++ lib/crypto/c_src/Makefile.in Sun Jun 1 17:59:06 2003 +@@ -97,6 +97,21 @@ + -u _des_ncbc_encrypt \ + -u _des_ede3_cbc_encrypt + else ++ifeq ($(findstring freebsd,$(TARGET)),freebsd) ++ELIBCRYPTO_UNDEFS = \ ++ -u CRYPTO_set_mem_functions \ ++ -u MD5 \ ++ -u MD5_Init \ ++ -u MD5_Update \ ++ -u MD5_Final \ ++ -u SHA1 \ ++ -u SHA1_Init \ ++ -u SHA1_Update \ ++ -u SHA1_Final \ ++ -u _ossl_old_des_set_key \ ++ -u _ossl_old_des_ncbc_encrypt \ ++ -u _ossl_old_des_ede3_cbc_encrypt ++else + ELIBCRYPTO_UNDEFS = \ + -u CRYPTO_set_mem_functions \ + -u MD5 \ +@@ -110,6 +125,7 @@ + -u des_set_key \ + -u des_ncbc_encrypt \ + -u des_ede3_cbc_encrypt ++endif + endif + + # ---------------------------------------------------- Property changes on: head/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/lang/erlang/files/patch-lib_crypto_c__src_crypto__drv.c =================================================================== --- head/lang/erlang/files/patch-lib_crypto_c__src_crypto__drv.c (revision 81912) +++ head/lang/erlang/files/patch-lib_crypto_c__src_crypto__drv.c (revision 81913) @@ -1,13 +1,26 @@ $FreeBSD$ ---- lib/crypto/c_src/crypto_drv.c.orig Thu Oct 21 15:37:08 1999 -+++ lib/crypto/c_src/crypto_drv.c Mon Mar 3 15:12:27 2003 +--- lib/crypto/c_src/crypto_drv.c.orig Sun Jun 1 18:15:54 2003 ++++ lib/crypto/c_src/crypto_drv.c Sun Jun 1 18:15:50 2003 @@ -29,6 +29,7 @@ #include #include "erl_driver.h" +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include "des.h" #include "md5.h" #include "sha.h" +@@ -207,9 +208,9 @@ + cfs.SHA1_Init = driver_dl_sym(lib_handle, "SHA1_Init"); + cfs.SHA1_Update = driver_dl_sym(lib_handle, "SHA1_Update"); + cfs.SHA1_Final = driver_dl_sym(lib_handle, "SHA1_Final"); +- cfs.des_set_key = driver_dl_sym(lib_handle, "des_set_key"); +- cfs.des_ncbc_encrypt = driver_dl_sym(lib_handle, "des_ncbc_encrypt"); +- cfs.des_ede3_cbc_encrypt = driver_dl_sym(lib_handle, "des_ede3_cbc_encrypt"); ++ cfs.des_set_key = driver_dl_sym(lib_handle, "_ossl_old_des_set_key"); ++ cfs.des_ncbc_encrypt = driver_dl_sym(lib_handle, "_ossl_old_des_ncbc_encrypt"); ++ cfs.des_ede3_cbc_encrypt = driver_dl_sym(lib_handle, "_ossl_old_des_ede3_cbc_encrypt"); + + /* Check that all pointer where initialized */ + for (i = 0; i < sizeof(crypto_funcs)/sizeof(void*); i++) { Property changes on: head/lang/erlang/files/patch-lib_crypto_c__src_crypto__drv.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/lang/erlang14/Makefile =================================================================== --- head/lang/erlang14/Makefile (revision 81912) +++ head/lang/erlang14/Makefile (revision 81913) @@ -1,161 +1,162 @@ # New ports collection makefile for: erlang # Date created: 11 Dec 1998 # Whom: ruslan@shevchenko.kiev.ua # # $FreeBSD$ # PORTNAME= erlang PORTVERSION= 9.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \ http://www.erlang.org/download/ \ http://erlang.stacken.kth.se/download/ \ http://www.csd.uu.se/ftp/mirror/erlang/download/ DISTNAME= otp_src_R9B-1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= http://www.erlang.org/download/patches/ PATCHFILES= PATCH_DIST_STRIP= -p1 MAINTAINER= olgeni@FreeBSD.org COMMENT= A functional programming language from Ericsson # Set JAVABINDIR to where you have javac, if different from below JAVABINDIR?= ${LOCALBASE}/jdk1.3.1/bin JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk13 .if !exists(${JAVABINDIR}/java) WITHOUT_JAVA= yes .endif CONFIGURE_TARGET= # Empty # Don't clutter up /usr/ports/distfiles with all distfiles (including patches) DIST_SUBDIR= erlang ERLANG_MAN= otp_man_R9B-1.tar.gz .if !defined(NOPORTDOCS) ERLANG_DOCS= otp_html_R9B-1.tar.gz .endif .if !defined(WITHOUT_X11) RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 .endif USE_GMAKE= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-threads --enable-hipe .if !defined(WITHOUT_JAVA) # The Java applications that are part of the Erlang distribution are # not strictly necessary - it is included for completeness sake. A # problem with the Erlang build procedure is that it only checks if # javac is in the regular path - and then assumes that all of the jdk # utilities is in the path as well. The only way to make sure that # this is the case (that I could think of at least) was to make sure # JAVABINDIR is added to the PATH, using the *_ENV macros. BUILD_DEPENDS+= ${JAVAPORT} # Make sure JAVABINDIR is in the path CONFIGURE_ENV+= PATH=${PATH}:${JAVABINDIR} MAKE_ENV+= PATH=${PATH}:${JAVABINDIR} SCRIPT_ENV+= PATH=${PATH}:${JAVABINDIR} .endif # Workaround for a ./configure recursion bug which leads to INSTALL being # set to "../../../../[...]" post-patch: @cd ${WRKSRC} && ${CAT} ${FILESDIR}/post-patch-configure | ${PATCH} pre-configure: # Check if javac is really in ${JAVABINDIR}. .if !defined(WITHOUT_JAVA) @if [ ! -x ${JAVABINDIR}/javac ]; then \ ${ECHO_MSG} ">> Error: cannot find javac in JAVABINDIR."; \ ${ECHO_MSG} ">> Please configure JAVABINDIR, or use the WITHOUT_JAVA option"; \ exit 1; \ fi .endif # If X11 is not used, skip the gs application. .if defined(WITHOUT_X11) @${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP .endif # Install documentation. (HTML docs need to be in same dir as the # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. post-install: @${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ -C ${PREFIX}/lib/erlang @${RM} -rf ${PREFIX}/lib/erlang/man/cat? .if !defined(NOPORTDOCS) @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${PREFIX}/lib/erlang .endif @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/erlang @${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/erlang @sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \ cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock # All non-library files. @cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \ | ${GREP} -v "^lib/erlang/man" \ | ${GREP} -v "^lib/erlang/lib" \ | sort \ > ${WRKDIR}/PLIST.lib-erlang # Stock OTP libraries. @for LIBRARY in ${OTP_LIBS}; do \ cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type f -o -type l; \ done | sort >> ${WRKDIR}/PLIST.lib-erlang # Stock OTP library directories. @for LIBRARY in ${OTP_LIBS}; do \ cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type d \ | ${SED} -e 's/^/@dirrm /g'; \ done | sort -r >> ${WRKDIR}/PLIST.lib-erlang # Other directories. @cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \ | ${GREP} -v "^lib/erlang/man" \ | ${GREP} -v "^lib/erlang/lib" \ | ${SED} -e 's/^/@dirrm /g' \ >> ${WRKDIR}/PLIST.lib-erlang @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script @${ECHO_CMD} "/Insert PLIST.lib-erlang" >> ${WRKDIR}/ex.script @${ECHO_CMD} "d" >> ${WRKDIR}/ex.script @${ECHO_CMD} "r ${WRKDIR}/PLIST.lib-erlang" >> ${WRKDIR}/ex.script @${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script @${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-erlang @cd ${WRKDIR} ; ex < ex.script # The man-pages are put (in spite of FreeBSD's port convention) in a # private subdir. This is to avoid cluttering up the man page name # space. Also the Erlang man pages are more of internal documentation # using the man format than actual system man pages. (The erl.1 and # epmd.1 perhaps being the exception). NOMANCOMPRESS= yes MAN1PREFIX= ${PREFIX}/lib/erlang MAN3PREFIX= ${PREFIX}/lib/erlang MAN4PREFIX= ${PREFIX}/lib/erlang MAN6PREFIX= ${PREFIX}/lib/erlang .include "Makefile.lib" .include "Makefile.man" .include Property changes on: head/lang/erlang14/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.36 \ No newline at end of property +1.37 \ No newline at end of property Index: head/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in =================================================================== --- head/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in (nonexistent) +++ head/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in (revision 81913) @@ -0,0 +1,35 @@ + +$FreeBSD$ + +--- lib/crypto/c_src/Makefile.in.orig Sun Jun 1 17:57:42 2003 ++++ lib/crypto/c_src/Makefile.in Sun Jun 1 17:59:06 2003 +@@ -97,6 +97,21 @@ + -u _des_ncbc_encrypt \ + -u _des_ede3_cbc_encrypt + else ++ifeq ($(findstring freebsd,$(TARGET)),freebsd) ++ELIBCRYPTO_UNDEFS = \ ++ -u CRYPTO_set_mem_functions \ ++ -u MD5 \ ++ -u MD5_Init \ ++ -u MD5_Update \ ++ -u MD5_Final \ ++ -u SHA1 \ ++ -u SHA1_Init \ ++ -u SHA1_Update \ ++ -u SHA1_Final \ ++ -u _ossl_old_des_set_key \ ++ -u _ossl_old_des_ncbc_encrypt \ ++ -u _ossl_old_des_ede3_cbc_encrypt ++else + ELIBCRYPTO_UNDEFS = \ + -u CRYPTO_set_mem_functions \ + -u MD5 \ +@@ -110,6 +125,7 @@ + -u des_set_key \ + -u des_ncbc_encrypt \ + -u des_ede3_cbc_encrypt ++endif + endif + + # ---------------------------------------------------- Property changes on: head/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/lang/erlang14/files/patch-lib_crypto_c__src_crypto__drv.c =================================================================== --- head/lang/erlang14/files/patch-lib_crypto_c__src_crypto__drv.c (revision 81912) +++ head/lang/erlang14/files/patch-lib_crypto_c__src_crypto__drv.c (revision 81913) @@ -1,13 +1,26 @@ $FreeBSD$ ---- lib/crypto/c_src/crypto_drv.c.orig Thu Oct 21 15:37:08 1999 -+++ lib/crypto/c_src/crypto_drv.c Mon Mar 3 15:12:27 2003 +--- lib/crypto/c_src/crypto_drv.c.orig Sun Jun 1 18:15:54 2003 ++++ lib/crypto/c_src/crypto_drv.c Sun Jun 1 18:15:50 2003 @@ -29,6 +29,7 @@ #include #include "erl_driver.h" +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include "des.h" #include "md5.h" #include "sha.h" +@@ -207,9 +208,9 @@ + cfs.SHA1_Init = driver_dl_sym(lib_handle, "SHA1_Init"); + cfs.SHA1_Update = driver_dl_sym(lib_handle, "SHA1_Update"); + cfs.SHA1_Final = driver_dl_sym(lib_handle, "SHA1_Final"); +- cfs.des_set_key = driver_dl_sym(lib_handle, "des_set_key"); +- cfs.des_ncbc_encrypt = driver_dl_sym(lib_handle, "des_ncbc_encrypt"); +- cfs.des_ede3_cbc_encrypt = driver_dl_sym(lib_handle, "des_ede3_cbc_encrypt"); ++ cfs.des_set_key = driver_dl_sym(lib_handle, "_ossl_old_des_set_key"); ++ cfs.des_ncbc_encrypt = driver_dl_sym(lib_handle, "_ossl_old_des_ncbc_encrypt"); ++ cfs.des_ede3_cbc_encrypt = driver_dl_sym(lib_handle, "_ossl_old_des_ede3_cbc_encrypt"); + + /* Check that all pointer where initialized */ + for (i = 0; i < sizeof(crypto_funcs)/sizeof(void*); i++) { Property changes on: head/lang/erlang14/files/patch-lib_crypto_c__src_crypto__drv.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property