Index: head/devel/gnatcoll/Makefile =================================================================== --- head/devel/gnatcoll/Makefile (revision 354891) +++ head/devel/gnatcoll/Makefile (revision 354892) @@ -1,112 +1,113 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= gnatcoll PORTVERSION= 2014 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src MAINTAINER= marino@FreeBSD.org COMMENT= GNAT Component Collection from Adacore LICENSE= GPLv3 BUILD_DEPENDS= gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \ gnat_util>=20140422:${PORTSDIR}/lang/gnat_util LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp USES= ada gmake GNU_CONFIGURE= yes PORTDOCS= html gnatcoll.pdf PORTEXAMPLES= * OPTIONS_DEFINE= READLINE SYSLOG SQLITE PYTHON GTK PGSQL ICONV \ DOCS EXAMPLES OPTIONS_DEFAULT= READLINE SYSLOG SQLITE PYTHON GTK PGSQL ICONV OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx GTK_LIB_DEPENDS= libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 SYSLOG_CONFIGURE_ENABLE=syslog GTK_DESC= GTK3 toolkit support CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL} CONFIGURE_ARGS= --with-gmp=${PREFIX} \ --disable-shared \ --disable-pygtk MAKE_ARGS+= PROCESSORS=${MAKE_JOBS_NUMBER} MAKE_ARGS+= Gnatcoll_Build=Production .include .if ${PORT_OPTIONS:MREADLINE} USES+= readline:port CONFIGURE_ARGS+= --enable-gpl .else CONFIGURE_ARGS+= --disable-readline .endif .if ${PORT_OPTIONS:MSQLITE} CONFIGURE_ARGS+= --with-sqlite=embedded .else CONFIGURE_ARGS+= --without-sqlite .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+= --with-postgresql=${PREFIX} .else CONFIGURE_ARGS+= --without-postgresql .endif .if ${PORT_OPTIONS:MICONV} USES+= iconv CONFIGURE_ARGS+= --with-iconv=${ICONV_PREFIX} .else CONFIGURE_ARGS+= --without-iconv .endif .if ${PORT_OPTIONS:MPYTHON} CONFIGURE_ARGS+= --with-python=${PREFIX} \ --enable-pygobject USE_PYTHON= 2 USE_GNOME= pygobject3 PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py .else CONFIGURE_ARGS+= --without-python \ --disable-pygobject .endif .if ${PORT_OPTIONS:MGTK} USES+= pkgconfig CONFIGURE_ARGS+= --with-gtk=3.0 .else CONFIGURE_ARGS+= --without-gtk .endif post-patch: @${REINPLACE_CMD} -e "s|@PREFIX@|${PREFIX}|g" \ ${WRKSRC}/src/gnatcoll_readline.gpr.in .if ! ${PORT_OPTIONS:MDOCS} ${MV} ${WRKSRC}/docs/_build ${WRKSRC}/docs/_hide_build .endif do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} pre-install: .if ${PORT_OPTIONS:MPYTHON} ${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/plug-ins ${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/library .endif post-install: ${RM} -rf ${STAGEDIR}${DOCSDIR}/html/_sources .if ! ${PORT_OPTIONS:MEXAMPLES} ${RM} -rf ${STAGEDIR}${EXAMPLESDIR} .endif .include Index: head/devel/gnatcoll/files/patch-src_gnatcoll__tools.gpr =================================================================== --- head/devel/gnatcoll/files/patch-src_gnatcoll__tools.gpr (revision 354891) +++ head/devel/gnatcoll/files/patch-src_gnatcoll__tools.gpr (nonexistent) @@ -1,13 +0,0 @@ ---- src/gnatcoll_tools.gpr.orig 2014-04-10 13:47:58.000000000 +0000 -+++ src/gnatcoll_tools.gpr -@@ -33,6 +33,9 @@ project GnatColl_Tools is - package Compiler renames GnatColl_Shared.Compiler; - package Binder renames GnatColl_Shared.Binder; - package Ide renames GnatColl_Shared.Ide; -- package Linker renames GnatColl_Shared.Linker; -+ package Linker is -+ for Leading_Switches ("Ada") use ("gnatcoll/static/set_std_prefix.o", -+ "gnatcoll/static/update_path.o"); -+ end Linker; - - end GnatColl_Tools; Property changes on: head/devel/gnatcoll/files/patch-src_gnatcoll__tools.gpr ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/gnat_util/Makefile =================================================================== --- head/lang/gnat_util/Makefile (revision 354891) +++ head/lang/gnat_util/Makefile (revision 354892) @@ -1,43 +1,45 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= gnat_util PORTVERSION= ${SNAPSHOT} +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= ${MS_SUBDIR} DISTNAME= ${IDENTIFICATION} MAINTAINER= marino@FreeBSD.org COMMENT= Library used to build GNAT tools such as ASIS LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi USES= ada tar:bzip2 NO_MTREE= yes DISTINFO_FILE= ${.CURDIR}/../gcc-aux/distinfo WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ENV= MAKEOBJDIR=${WRKSRC}/obj .include "${.CURDIR}/Makefile.sources" .include "${.CURDIR}/../gcc-aux/Makefile.version" post-extract: @${MKDIR} ${WRKSRC}/obj -.for F in Makefile gnat_util.gpr sdefault_adb.gnat_util +.for F in Makefile gnat_util.gpr sdefault_adb.gnat_util \ + update_path.c set_std_prefix.c @${CP} ${FILESDIR}/${F} ${WRKSRC}/ .endfor .for F in ${GNAT_SRCS} @${CP} ${WRKDIR}/${DISTNAME}/gcc/ada/${F} ${WRKSRC}/ .endfor post-install: @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ ${SORT} >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | \ ${SORT} -r | ${SED} -e '/lib\/gnat$$/d' -e 's/^/@dirrm /g' \ >> ${TMPPLIST} @echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${TMPPLIST} .include Index: head/lang/gnat_util/files/Makefile =================================================================== --- head/lang/gnat_util/files/Makefile (revision 354891) +++ head/lang/gnat_util/files/Makefile (revision 354892) @@ -1,69 +1,70 @@ # To avoid a cirular dependency with GPRBuild, this custom BSD Makefile is # used instead of the provided asis.gpr file. # $FreeBSD$ CP=cp -p MKDIR=mkdir -p SRC=gen_src ADA_FLAGS= -O2 -gnatn -gnatws -gnat05 C_FLAGS= -O2 ADB_SRCS!= cd ${.CURDIR} && ls *.adb | sort -r GEN_SRCS= sdefault.adb snames.adb xsnamest.adb ADS_SRCS= rident.ads hostparm.ads err_vars.ads alloc.ads prj-com.ads -LIB_SRCS+= link.c ${GEN_SRCS} ${ADS_SRCS} ${ADB_SRCS:Nlib-*.adb} +C_SRCS= link.c update_path.c set_std_prefix.c +LIB_SRCS+= ${C_SRCS} ${GEN_SRCS} ${ADS_SRCS} ${ADB_SRCS:Nlib-*.adb} LIB_OBJS= ${LIB_SRCS:R:S/$/.o/} .PHONY: all .PHONY: generate_sources .PHONY: libgnat_util.a .PHONY: install .PHONY: clean all: libgnat_util.a generate_sources: (cd ${.CURDIR} && ${MKDIR} ${SRC} lib) ${CP} ${.CURDIR}/sdefault_adb.gnat_util ${.CURDIR}/${SRC}/sdefault.adb (cd ${.CURDIR} && ${CP} \ xsnamest.adb xutil.* snames.adb-tmpl snames.ads-tmpl \ snames.h-tmpl ${SRC}) (cd ${.CURDIR}/${SRC} && \ gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \ ./xsnamest && mv snames.ns snames.ads && mv snames.nb snames.adb) ${LIB_OBJS}: generate_sources install: ${MKDIR} ${DESTDIR}${PREFIX}/lib/gnat ${MKDIR} ${DESTDIR}${PREFIX}/lib/gnat_util ${MKDIR} ${DESTDIR}${PREFIX}/include/gnat_util ${BSD_INSTALL_DATA} ../gnat_util.gpr ${DESTDIR}${PREFIX}/lib/gnat find ../lib -type f -exec $(BSD_INSTALL_DATA) {} \ ${DESTDIR}${PREFIX}/lib/gnat_util \; find ../* -name \*\.ad\[bs\] -exec $(BSD_INSTALL_DATA) {} \ ${DESTDIR}${PREFIX}/include/gnat_util \; clean: rm -f ${.OBJDIR}/* rm -f ${.CURDIR}/lib/* rm -rf ${.CURDIR}/${SRC} .SUFFIXES: .adb .ads .c .o .adb.o: ada ${ADA_FLAGS} -I../ -I../${SRC} -c ../${.TARGET:R}.adb .c.o: ${CC} ${C_FLAGS} -c ../${.TARGET:R}.c ${ADS_SRCS:R:S/$/.o/}: ada ${ADA_FLAGS} -I../${SRC} -c ../${.TARGET:R}.ads ${GEN_SRCS:R:S/$/.o/}: ada ${ADA_FLAGS} -I../ -c ../${SRC}/${.TARGET:R}.adb libgnat_util.a: ${LIB_OBJS} ar cq ${.TARGET} `lorder ${LIB_OBJS} | tsort -q` ranlib ${.TARGET} mv ${.TARGET} *.ali ../lib Index: head/lang/gnat_util/files/set_std_prefix.c =================================================================== --- head/lang/gnat_util/files/set_std_prefix.c (nonexistent) +++ head/lang/gnat_util/files/set_std_prefix.c (revision 354892) @@ -0,0 +1,26 @@ +/********************************************************************* + * G P S * + * * + * Copyright (C) 2002-2004 * + * ACT-Europe * + * * + * GPS is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * General Public License for more details. You should have received * + * a copy of the GNU General Public License along with this program; * + * if not, write to the Free Software Foundation, Inc., 59 Temple * + * Place - Suite 330, Boston, MA 02111-1307, USA. * + *********************************************************************/ + +/* Dummy version of set_std_prefix (needed by osint.adb) */ + +void +set_std_prefix (char *path, int len) +{ +} Property changes on: head/lang/gnat_util/files/set_std_prefix.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ys \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/gnat_util/files/update_path.c =================================================================== --- head/lang/gnat_util/files/update_path.c (nonexistent) +++ head/lang/gnat_util/files/update_path.c (revision 354892) @@ -0,0 +1,27 @@ +/********************************************************************* + * G P S * + * * + * Copyright (C) 2002-2004 * + * ACT-Europe * + * * + * GPS is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * General Public License for more details. You should have received * + * a copy of the GNU General Public License along with this program; * + * if not, write to the Free Software Foundation, Inc., 59 Temple * + * Place - Suite 330, Boston, MA 02111-1307, USA. * + *********************************************************************/ + +/* Dummy version of update_path (needed by osint.adb) */ + +char * +update_path (char *path, char *key) +{ + return path; +} Property changes on: head/lang/gnat_util/files/update_path.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ys \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property