*/*: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2015-06-29 07:38:50 +02:00
parent 1152639e1a
commit ec0a6fef5b
320 changed files with 2803 additions and 2225 deletions

View file

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= lz4
PORTVERSION= 129
PORTVERSION= 130
DISTVERSIONPREFIX= r
PORTREVISION= 1
CATEGORIES= archivers
PKGNAMEPREFIX= lib

View file

@ -1,2 +1,2 @@
SHA256 (Cyan4973-lz4-r129_GH0.tar.gz) = f681f5528a6d16b23246db499f30717cda354079a684298375c4d74c6f475a01
SIZE (Cyan4973-lz4-r129_GH0.tar.gz) = 126744
SHA256 (Cyan4973-lz4-r130_GH0.tar.gz) = c48450d27524c2e5856997133e059e3cf9909241110a6e21ad278890ac425afc
SIZE (Cyan4973-lz4-r130_GH0.tar.gz) = 129154

View file

@ -1,21 +0,0 @@
--- programs/Makefile.orig 2015-05-07 11:23:39 UTC
+++ programs/Makefile
@@ -150,7 +150,7 @@ test-all: test test32
test-travis: $(TRAVIS_TARGET)
test-lz4-sparse: lz4 datagen
- @echo ---- test sparse file support ----
+ @echo "\n ---- test sparse file support ----"
./datagen -g5M -P100 > tmpSrc
./lz4 -B4D tmpSrc | ./lz4 -dv --sparse > tmpB4
diff -s tmpSrc tmpB4
@@ -167,6 +167,9 @@ test-lz4-sparse: lz4 datagen
./datagen -s1 -g1200007 -P100 | diff -s - tmpOdd
ls -ls tmpOdd
@rm tmp*
+ @echo "\n Compatibility with Console :"
+ ./lz4 COPYING | ./lz4 -d -c
+ ./lz4 COPYING | ./lz4 -d | cat
test-lz4-contentSize: lz4 datagen
@echo ---- test original size support ----

View file

@ -1,11 +0,0 @@
--- programs/lz4cli.c.orig 2015-05-07 11:23:39 UTC
+++ programs/lz4cli.c
@@ -473,7 +473,7 @@ int main(int argc, char** argv)
if (multiple_inputs) input_filename = inFileNames[0], output_filename = (const char*)(inFileNames[0]);
if(!input_filename) { input_filename=stdinmark; }
- /* Check if input or output are defined as console; trigger an error in this case */
+ /* Check if input is defined as console; trigger an error in this case */
if (!strcmp(input_filename, stdinmark) && IS_CONSOLE(stdin) ) badusage();
/* Check if benchmark is selected */

View file

@ -1,61 +0,0 @@
--- programs/lz4io.c.orig 2015-05-07 11:23:39 UTC
+++ programs/lz4io.c
@@ -303,6 +303,12 @@ static int LZ4IO_getFiles(const char* in
if ( *pfoutput==0) EXM_THROW(13, "Pb opening %s", output_filename);
+ if (g_sparseFileSupport)
+ {
+ long int ftr = ftell(*pfoutput);
+ if (ftr==-1) g_sparseFileSupport = 0;
+ }
+
return 0;
}
@@ -639,7 +645,7 @@ static unsigned LZ4IO_fwriteSparse(FILE*
if (!g_sparseFileSupport) /* normal write */
{
size_t sizeCheck = fwrite(buffer, 1, bufferSize, file);
- if (sizeCheck != bufferSize) EXM_THROW(68, "Write error : cannot write decoded block");
+ if (sizeCheck != bufferSize) EXM_THROW(70, "Write error : cannot write decoded block");
return 0;
}
@@ -647,7 +653,7 @@ static unsigned LZ4IO_fwriteSparse(FILE*
if (storedSkips > 1 GB)
{
int seekResult = fseek(file, 1 GB, SEEK_CUR);
- if (seekResult != 0) EXM_THROW(68, "1 GB skip error (sparse file support)");
+ if (seekResult != 0) EXM_THROW(71, "1 GB skip error (sparse file support)");
storedSkips -= 1 GB;
}
@@ -667,12 +673,12 @@ static unsigned LZ4IO_fwriteSparse(FILE*
{
size_t sizeCheck;
seekResult = fseek(file, storedSkips, SEEK_CUR);
- if (seekResult) EXM_THROW(68, "Skip error (sparse file)");
+ if (seekResult) EXM_THROW(72, "Skip error (sparse file)");
storedSkips = 0;
seg0SizeT -= nb0T;
ptrT += nb0T;
sizeCheck = fwrite(ptrT, sizeT, seg0SizeT, file);
- if (sizeCheck != seg0SizeT) EXM_THROW(68, "Write error : cannot write decoded block");
+ if (sizeCheck != seg0SizeT) EXM_THROW(73, "Write error : cannot write decoded block");
}
ptrT += seg0SizeT;
}
@@ -689,10 +695,10 @@ static unsigned LZ4IO_fwriteSparse(FILE*
{
size_t sizeCheck;
int seekResult = fseek(file, storedSkips, SEEK_CUR);
- if (seekResult) EXM_THROW(68, "Skip error (end of block)");
+ if (seekResult) EXM_THROW(74, "Skip error (end of block)");
storedSkips = 0;
sizeCheck = fwrite(restPtr, 1, restEnd - restPtr, file);
- if (sizeCheck != (size_t)(restEnd - restPtr)) EXM_THROW(68, "Write error : cannot write decoded end of block");
+ if (sizeCheck != (size_t)(restEnd - restPtr)) EXM_THROW(75, "Write error : cannot write decoded end of block");
}
}

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Astro-satpass
PORTVERSION= 0.069
PORTVERSION= 0.070
CATEGORIES= astro perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-

View file

@ -1,2 +1,2 @@
SHA256 (Astro-satpass-0.069.tar.gz) = 9985c134724105b3481fd37047fa6a282d201a84bb68e0a5c34606a2e9990203
SIZE (Astro-satpass-0.069.tar.gz) = 522980
SHA256 (Astro-satpass-0.070.tar.gz) = c9e14ebff23b9fa09a495d5896810dfbd33c0d7c372cd1cc0489b4776d9d5017
SIZE (Astro-satpass-0.070.tar.gz) = 523019

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pd
DISTVERSION= 0.46-5
DISTVERSION= 0.46-6
DISTVERSIONSUFFIX= .src
CATEGORIES= audio
MASTER_SITES= http://msp.ucsd.edu/Software/
@ -52,8 +52,7 @@ post-patch:
@${REINPLACE_CMD} -e \
'/^pkgconfigdir/s|=.*|= $$(prefix)/libdata/pkgconfig| ; \
/^libpddir/s|=.*|= $$(pkglibdir)| ; \
s|make -C|$$(MAKE) -C| ; \
s|metro.pd|metro-help.pd|' ${WRKSRC}/Makefile.am
s|make -C|$$(MAKE) -C|' ${WRKSRC}/Makefile.am
@${REINPLACE_CMD} -e \
'/^pd_LDADD/s| =.*| = $$(LIBM)|' ${WRKSRC}/src/Makefile.am
@${REINPLACE_CMD} -e \

View file

@ -1,2 +1,2 @@
SHA256 (pd-0.46-5.src.tar.gz) = e2a61cdef72774f451de730a092d5010a0bd35cbeca6eb9cd4a1999fab2074dd
SIZE (pd-0.46-5.src.tar.gz) = 2245783
SHA256 (pd-0.46-6.src.tar.gz) = 721dd4048b7a225e5d7b4ff4a585781a56b7d32348ea4838f9db7805b07b8cec
SIZE (pd-0.46-6.src.tar.gz) = 2252980

View file

@ -11,6 +11,9 @@ include/pd/s_stuff.h
lib/pd/bin/pd
lib/pd/bin/pd-watchdog
%%PORTDOCS%%lib/pd/doc
lib/pd/extra/bob~/bob~-help.pd
lib/pd/extra/bob~/bob~.pd_linux
lib/pd/extra/bob~/output~.pd
lib/pd/extra/bonk~/bonk~-help.pd
lib/pd/extra/bonk~/bonk~.pd_linux
lib/pd/extra/bonk~/templates.txt

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= migrate
PORTVERSION= 3.6.9
PORTVERSION= 3.6.11
CATEGORIES= biology
MASTER_SITES= http://popgen.sc.fsu.edu/currentversions/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
@ -22,20 +22,9 @@ PORTDOCS= HISTORY README README_PARALLEL_GENERAL ${PORTNAME}.html
PORTEXAMPLES= *
EXTRACT_AFTER_ARGS=--exclude zlib
# XXX should be converted to OptionsNG
.if defined(WITH_THREAD_PRETTY)
ALL_TARGET= thread-pretty
.elif defined(WITH_PRETTY)
ALL_TARGET= pretty
.elif defined(WITH_THREAD)
ALL_TARGET= thread
.else
ALL_TARGET= all
.endif
OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.port.options.mk>
OPTIONS_DEFINE= DOCS EXAMPLES THREAD
THREAD_DESC= Build with THREAD support
THREAD_ALL_TARGET= thread
post-patch:
@${REINPLACE_CMD} -e 's|="-O "|="$$CFLAGS"|g' ${WRKSRC}/configure

View file

@ -1,2 +1,2 @@
SHA256 (migrate-3.6.9.src.tar.gz) = 8dc06315a35c6db222f04f3b205a5e644037f2e476c270c921c3f77744447a5f
SIZE (migrate-3.6.9.src.tar.gz) = 27811528
SHA256 (migrate-3.6.11.src.tar.gz) = a9ba06a4e995a45b8d04037f5f2da23e1fe64a2f3565189bdd50c62c6fe01fb8
SIZE (migrate-3.6.11.src.tar.gz) = 27809896

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= opencc
PORTVERSION= 11.1
PORTVERSION= 11.3
CATEGORIES= chinese converters
PKGNAMEPREFIX= bsdconv-
@ -15,8 +15,18 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/bsdconv-mktable:${PORTSDIR}/converters/bsdconv
LIB_DEPENDS= libbsdconv.so:${PORTSDIR}/converters/bsdconv \
libopencc.so:${PORTSDIR}/chinese/opencc
PLIST_FILES= share/bsdconv/inter/OPENCC \
share/bsdconv/inter/OPENCC.man \
share/bsdconv/inter/OPENCC.so
USE_GITHUB= yes
GH_ACCOUNT= buganini
GH_PROJECT= ${PKGNAMEPREFIX}${PORTNAME}
pre-install:
${MKDIR} ${STAGEDIR}${PREFIX}/share/bsdconv/inter/
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/bsdconv/inter/OPENCC.so
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (buganini-bsdconv-opencc-11.1_GH0.tar.gz) = 5110067f8e3540bcb93afe5d87b6146c029a00fbbf69efb7dd07e4753ef93fad
SIZE (buganini-bsdconv-opencc-11.1_GH0.tar.gz) = 2826
SHA256 (buganini-bsdconv-opencc-11.3_GH0.tar.gz) = d4520a1c49b367cacee1aa4c370271f9dadd34705ccf822fdf00db9e96eb50e2
SIZE (buganini-bsdconv-opencc-11.3_GH0.tar.gz) = 2973

View file

@ -1,17 +0,0 @@
--- Makefile.orig 2013-09-20 02:35:00.000000000 +0800
+++ Makefile 2014-01-07 14:26:54.000000000 +0800
@@ -35,9 +35,10 @@ clean:
rm -rf OPENCC OPENCC.so OPENCC-*
install:
+ mkdir -p $(DESTDIR)${PREFIX}/share/bsdconv/inter
for item in ${CONFIGS} ; do \
- install -m 444 OPENCC ${PREFIX}/share/bsdconv/inter/OPENCC-$${item} ; \
- install -m 444 OPENCC-$${item}.so ${PREFIX}/share/bsdconv/inter/OPENCC-$${item}.so ; \
+ install -m 444 OPENCC $(DESTDIR)${PREFIX}/share/bsdconv/inter/OPENCC-$${item} ; \
+ install -m 444 OPENCC-$${item}.so $(DESTDIR)${PREFIX}/share/bsdconv/inter/OPENCC-$${item}.so ; \
done
- install -m 444 OPENCC ${PREFIX}/share/bsdconv/inter/OPENCC
- install -m 444 OPENCC.so ${PREFIX}/share/bsdconv/inter/OPENCC.so
+ install -m 444 OPENCC $(DESTDIR)${PREFIX}/share/bsdconv/inter/OPENCC
+ install -m 444 OPENCC.so $(DESTDIR)${PREFIX}/share/bsdconv/inter/OPENCC.so

View file

@ -1,30 +0,0 @@
share/bsdconv/inter/OPENCC
share/bsdconv/inter/OPENCC-MIX2ZHS
share/bsdconv/inter/OPENCC-MIX2ZHS.so
share/bsdconv/inter/OPENCC-MIX2ZHT
share/bsdconv/inter/OPENCC-MIX2ZHT.so
share/bsdconv/inter/OPENCC-ZHS2ZHT
share/bsdconv/inter/OPENCC-ZHS2ZHT.so
share/bsdconv/inter/OPENCC-ZHS2ZHTW_P
share/bsdconv/inter/OPENCC-ZHS2ZHTW_P.so
share/bsdconv/inter/OPENCC-ZHS2ZHTW_V
share/bsdconv/inter/OPENCC-ZHS2ZHTW_V.so
share/bsdconv/inter/OPENCC-ZHS2ZHTW_VP
share/bsdconv/inter/OPENCC-ZHS2ZHTW_VP.so
share/bsdconv/inter/OPENCC-ZHT2ZHS
share/bsdconv/inter/OPENCC-ZHT2ZHS.so
share/bsdconv/inter/OPENCC-ZHT2ZHTW_P
share/bsdconv/inter/OPENCC-ZHT2ZHTW_P.so
share/bsdconv/inter/OPENCC-ZHT2ZHTW_V
share/bsdconv/inter/OPENCC-ZHT2ZHTW_V.so
share/bsdconv/inter/OPENCC-ZHT2ZHTW_VP
share/bsdconv/inter/OPENCC-ZHT2ZHTW_VP.so
share/bsdconv/inter/OPENCC-ZHTW2ZHCN_S
share/bsdconv/inter/OPENCC-ZHTW2ZHCN_S.so
share/bsdconv/inter/OPENCC-ZHTW2ZHCN_T
share/bsdconv/inter/OPENCC-ZHTW2ZHCN_T.so
share/bsdconv/inter/OPENCC-ZHTW2ZHS
share/bsdconv/inter/OPENCC-ZHTW2ZHS.so
share/bsdconv/inter/OPENCC-ZHTW2ZHT
share/bsdconv/inter/OPENCC-ZHTW2ZHT.so
share/bsdconv/inter/OPENCC.so

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bug5
PORTVERSION= 1.17
PORTVERSION= 1.18
CATEGORIES= chinese converters
MAINTAINER= buganini@gmail.com
@ -20,4 +20,7 @@ MAKE_ARGS= PREFIX=${PREFIX}
PLIST_FILES= bin/bug5
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bug5
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (buganini-bug5-1.17_GH0.tar.gz) = 0f78feed638073b6398267c585bafbc4e85f9d6e4dfa3046e6a497d54fdc228c
SIZE (buganini-bug5-1.17_GH0.tar.gz) = 5104
SHA256 (buganini-bug5-1.18_GH0.tar.gz) = cbda17a43c97d8a260a9d58106b4e755205aac1fc74411d3084b782b42f9ac0a
SIZE (buganini-bug5-1.18_GH0.tar.gz) = 5132

View file

@ -1,11 +0,0 @@
--- Makefile.orig 2014-01-07 14:46:08.000000000 +0800
+++ Makefile 2014-01-07 14:46:17.000000000 +0800
@@ -6,7 +6,7 @@ all:
$(CC) ${CFLAGS} bug5.c -o bug5 ${LDFLAGS}
install:
- install -m 555 bug5 ${PREFIX}/bin
+ install -m 555 bug5 $(DESTDIR)${PREFIX}/bin
clean:
rm -f bug5

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= chiconv
PORTVERSION= 11.1
PORTVERSION= 11.3
CATEGORIES= chinese converters
MAINTAINER= buganini@gmail.com
@ -19,4 +19,7 @@ MAKE_ARGS= PREFIX=${PREFIX}
PLIST_FILES= bin/chiconv
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chiconv
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (buganini-chiconv-11.1_GH0.tar.gz) = a4eb45c2f030f37ef2b9af372a66780dc48cdee674f9eaec23b13ed5f3dbcf2a
SIZE (buganini-chiconv-11.1_GH0.tar.gz) = 2948
SHA256 (buganini-chiconv-11.3_GH0.tar.gz) = 8f878ddff86b5ea1c03cdcbe245e710f97e068918531998a074d6b5abfb6d891
SIZE (buganini-chiconv-11.3_GH0.tar.gz) = 3746

View file

@ -1,11 +0,0 @@
--- Makefile.orig 2014-01-07 14:47:56.000000000 +0800
+++ Makefile 2014-01-07 14:48:06.000000000 +0800
@@ -9,7 +9,7 @@ chiconv: chiconv.c
$(CC) ${CFLAGS} -o chiconv chiconv.c ${LIBS}
install:
- install -m 555 chiconv ${PREFIX}/bin
+ install -m 555 chiconv $(DESTDIR)${PREFIX}/bin
clean:
rm -f chiconv

View file

@ -2,12 +2,12 @@
# $FreeBSD$
PORTNAME= wordpress
PORTVERSION= 4.2
PORTVERSION= 4.2.2
DISTVERSIONSUFFIX= -zh_CN
CATEGORIES= chinese www
MASTER_SITES= http://cn.wordpress.org/ \
http://mirror.joehorn.idv.tw/wordpress/
PKGNAMESUFFIX= -zh_CN
DISTNAME= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
MAINTAINER= joehorn@gmail.com
COMMENT= State-of-the-art semantic personal publishing platform

View file

@ -1,2 +1,2 @@
SHA256 (wordpress-4.2-zh_CN.tar.gz) = 5bb241c869cb7ae6aa09a7a5beecb8b118aebedcb682ab14023cfb4fb4686fb7
SIZE (wordpress-4.2-zh_CN.tar.gz) = 6736556
SHA256 (wordpress-4.2.2-zh_CN.tar.gz) = b63d96520922b2e3f0e5dfe409a1a05b682f43729f8f75e641d35d10b51c509b
SIZE (wordpress-4.2.2-zh_CN.tar.gz) = 6722406

View file

@ -3,11 +3,11 @@
PORTNAME= wordpress
PORTVERSION= 4.2.2
DISTVERSIONSUFFIX= -zh_TW
CATEGORIES= chinese www
MASTER_SITES= http://tw.wordpress.org/ \
http://mirror.joehorn.idv.tw/wordpress/
PKGNAMESUFFIX= -zh_TW
DISTNAME= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
MAINTAINER= joehorn@gmail.com
COMMENT= State-of-the-art semantic personal publishing platform

View file

@ -21,7 +21,7 @@ LIB_DEPENDS= libhamlib.so:${PORTSDIR}/comms/hamlib \
libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
libportaudio.so:${PORTSDIR}/audio/portaudio
DISABLE_MAKE_JOBS= yes
MAKE_JOBS_UNSAFE= yes
USE_AUTOTOOLS= autoconf
USES= fortran gmake libtool tar:bzip2 python:3.3 dos2unix
GNU_CONFIGURE= yes

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bsdconv
PORTVERSION= 11.1
PORTVERSION= 11.3.1
CATEGORIES= converters
MAINTAINER= buganini@gmail.com
@ -14,35 +14,18 @@ USE_GITHUB= yes
GH_ACCOUNT= buganini
OPTIONS_DEFINE= CHINESE EBCDIC
OPTIONS_SUB= yes
CHINESE_DESC= Extra Chinese codecs
EBCDIC_DESC= EBCDIC codecs
ALL_TARGET= libbsdconv bsdconv-mktable meta bsdconv-man bsdconv-completion bsdconv filters scorers codecs_basic
INSTALL_TARGET= installdir install_main install_filters install_scorers install_basic
MAKE_ARGS= PREFIX=${PREFIX} STRIP=${STRIP}
USE_LDCONFIG= yes
MAKE_ARGS= PREFIX=${PREFIX}
ALL_TARGET= libbsdconv bsdconv-mktable meta bsdconv-man bsdconv-completion bsdconv codecs_basic
INSTALL_TARGET= installdir install_main install_basic
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCHINESE}
ALL_TARGET+= codecs_chinese
INSTALL_TARGET+=install_chinese
PLIST_SUB+= CHINESE=""
.else
PLIST_SUB+= CHINESE="@comment "
.endif
.if ${PORT_OPTIONS:MEBCDIC}
ALL_TARGET+= codecs_ebcdic
INSTALL_TARGET+=install_ebcdic
PLIST_SUB+= EBCDIC=""
.else
PLIST_SUB+= EBCDIC="@comment "
.endif
pre-install:
${MKDIR} ${STAGEDIR}${DATADIR}/ ${STAGEDIR}${DATADIR}/from/ ${STAGEDIR}${DATADIR}/inter/ ${STAGEDIR}${DATADIR}/to/
CHINESE_ALL_TARGET= codecs_chinese
CHINESE_INSTALL_TARGET= install_chinese
EBCDIC_ALL_TARGET= codecs_ebcdic
EBCDIC_INSTALL_TARGET= install_ebcdic
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (buganini-bsdconv-11.1_GH0.tar.gz) = afd3e5f512d8e87b852000134644bc98263c1b5fdd818af9f5d19a16359a3934
SIZE (buganini-bsdconv-11.1_GH0.tar.gz) = 5811769
SHA256 (buganini-bsdconv-11.3.1_GH0.tar.gz) = b0656011fd40ec440e9966bba44d330a6213fdd198c487c87bc61869ef7fea9e
SIZE (buganini-bsdconv-11.3.1_GH0.tar.gz) = 6194052

View file

@ -1,7 +1,7 @@
--- Makefile.orig 2013-09-16 12:15:40.000000000 +0800
+++ Makefile 2014-05-15 23:43:23.541980613 +0800
@@ -3,17 +3,9 @@ BSDCONV_PATH?=${PREFIX}
CFLAGS+=-Wall -DPREFIX='"${PREFIX}"' -DBSDCONV_PATH='"${BSDCONV_PATH}"'
--- Makefile.orig 2014-05-13 13:09:10 UTC
+++ Makefile
@@ -5,17 +5,9 @@ BSDCONV_PATH?=${PREFIX}
CFLAGS+=-O2 -Wall -D_BSDCONV_INTERNAL -DPREFIX='"${PREFIX}"' -DBSDCONV_PATH='"${BSDCONV_PATH}"'
SHLIBVER=11
-UNAME_S=$(shell uname -s)
@ -16,86 +16,81 @@
-LIBS+=-ldl
-endif
TODO_CODECS_BASIC=
TODO_CODECS_BASIC+=from/00
@@ -174,12 +166,12 @@ builddir:
mkdir -p build/share/bsdconv/to
TODO_FILTERS=
TODO_FILTERS+=ANSI
@@ -237,14 +229,14 @@ bsdconv-completion: builddir libbsdconv
bsdconv-dbg: builddir libbsdconv src/libbsdconv.c src/bsdconv.h src/bsdconv-dbg.c
$(CC) ${CFLAGS} src/libbsdconv.c src/bsdconv-dbg.c -o build/bin/bsdconv-dbg ${LIBS}
installdir:
- mkdir -p ${PREFIX}/bin
- mkdir -p ${PREFIX}/lib
- mkdir -p ${PREFIX}/include
- mkdir -p ${PREFIX}/share/bsdconv/from
- mkdir -p ${PREFIX}/share/bsdconv/inter
- mkdir -p ${PREFIX}/share/bsdconv/to
+ mkdir -p ${DESTDIR}${PREFIX}/bin
+ mkdir -p ${DESTDIR}${PREFIX}/lib
+ mkdir -p ${DESTDIR}${PREFIX}/include
+ mkdir -p ${DESTDIR}${PREFIX}/share/bsdconv/from
+ mkdir -p ${DESTDIR}${PREFIX}/share/bsdconv/inter
+ mkdir -p ${DESTDIR}${PREFIX}/share/bsdconv/to
-filters: builddir
+filters: builddir meta
for item in ${TODO_FILTERS} ; do \
echo Build filter $${item}.so ; \
$(CC) ${CFLAGS} modules/filter/$${item}.c -L./build/lib/ -fPIC -shared -o ./build/share/bsdconv/filter/$${item}.so -lbsdconv ${LIBS} ; \
if [ -e modules/filter/$${item}.man ]; then cp modules/filter/$${item}.man ./build/share/bsdconv/filter/$${item}.man ; fi ; \
done
libbsdconv: builddir src/libbsdconv.c src/bsdconv.h
$(CC) ${CFLAGS} src/libbsdconv.c -fPIC -shared -o build/lib/${SHLIBNAME} ${LIBS}
@@ -238,41 +230,41 @@ clean:
install: installdir install_main install_basic install_chinese install_ebcdic
-scorers: builddir
+scorers: builddir meta
for item in ${TODO_SCORERS} ; do \
echo Build scorer $${item}.so ; \
$(CC) ${CFLAGS} modules/scorer/$${item}.c -L./build/lib/ -fPIC -shared -o ./build/share/bsdconv/scorer/$${item}.so -lbsdconv ${LIBS} ; \
@@ -291,12 +283,12 @@ clean:
install: installdir install_main install_filters install_scorers install_basic install_chinese install_ebcdic
install_main:
- install -m 555 build/bin/bsdconv ${PREFIX}/bin
- install -m 555 build/bin/bsdconv-man ${PREFIX}/bin
- install -m 555 build/bin/bsdconv-mktable ${PREFIX}/bin
- install -m 555 build/bin/bsdconv-completion ${PREFIX}/bin
- install -m 444 build/include/bsdconv.h ${PREFIX}/include
- install -m 444 build/lib/${SHLIBNAME} ${PREFIX}/lib
- install -m 444 build/share/bsdconv/from/alias ${PREFIX}/share/bsdconv/from/alias
- install -m 444 build/share/bsdconv/inter/alias ${PREFIX}/share/bsdconv/inter/alias
- install -m 444 build/share/bsdconv/to/alias ${PREFIX}/share/bsdconv/to/alias
+ install -m 555 build/bin/bsdconv ${DESTDIR}${PREFIX}/bin
+ install -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
+ install -m 555 build/bin/bsdconv-mktable ${DESTDIR}${PREFIX}/bin
+ install -m 555 build/bin/bsdconv-completion ${DESTDIR}${PREFIX}/bin
+ install -m 444 build/include/bsdconv.h ${DESTDIR}${PREFIX}/include
+ install -m 444 build/lib/${SHLIBNAME} ${DESTDIR}${PREFIX}/lib
+ install -m 444 build/share/bsdconv/from/alias ${DESTDIR}${PREFIX}/share/bsdconv/from/alias
+ install -m 444 build/share/bsdconv/inter/alias ${DESTDIR}${PREFIX}/share/bsdconv/inter/alias
+ install -m 444 build/share/bsdconv/to/alias ${DESTDIR}${PREFIX}/share/bsdconv/to/alias
if [ ${SHLIBNAME} != libbsdconv.so ]; then \
- ln -sf libbsdconv.so.${SHLIBVER} ${PREFIX}/lib/libbsdconv.so ; \
+ ln -sf libbsdconv.so.${SHLIBVER} ${DESTDIR}${PREFIX}/lib/libbsdconv.so ; \
fi
- install -m 555 build/bin/bsdconv ${DESTDIR}${PREFIX}/bin
- install -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
- install -m 555 build/bin/bsdconv-mktable ${DESTDIR}${PREFIX}/bin
- install -m 555 build/bin/bsdconv-completion ${DESTDIR}${PREFIX}/bin
+ install ${STRIP} -m 555 build/bin/bsdconv ${DESTDIR}${PREFIX}/bin
+ install ${STRIP} -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
+ install ${STRIP} -m 555 build/bin/bsdconv-mktable ${DESTDIR}${PREFIX}/bin
+ install ${STRIP} -m 555 build/bin/bsdconv-completion ${DESTDIR}${PREFIX}/bin
install -m 444 build/include/bsdconv.h ${DESTDIR}${PREFIX}/include
- install -m 444 build/lib/${SHLIBNAME} ${DESTDIR}${PREFIX}/lib
+ install ${STRIP} -m 444 build/lib/${SHLIBNAME} ${DESTDIR}${PREFIX}/lib
install -m 444 build/share/bsdconv/from/alias ${DESTDIR}${PREFIX}/share/bsdconv/from/alias
install -m 444 build/share/bsdconv/inter/alias ${DESTDIR}${PREFIX}/share/bsdconv/inter/alias
install -m 444 build/share/bsdconv/to/alias ${DESTDIR}${PREFIX}/share/bsdconv/to/alias
@@ -307,13 +299,13 @@ install_main:
install_doc:
- install -m 555 build/bin/bsdconv-man ${PREFIX}/bin
+ install -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
install_filters:
for item in ${TODO_FILTERS} ; do \
- install -m 444 build/share/bsdconv/filter/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/filter/$${item}.so ; \
+ install ${STRIP} -m 444 build/share/bsdconv/filter/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/filter/$${item}.so ; \
if [ -e build/share/bsdconv/filter/$${item}.man ]; then install -m 444 build/share/bsdconv/filter/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/filter/$${item}.man ; fi ; \
done
install_basic:
install_scorers:
for item in ${TODO_SCORERS} ; do \
- install -m 444 build/share/bsdconv/scorer/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/scorer/$${item}.so ; \
+ install ${STRIP} -m 444 build/share/bsdconv/scorer/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/scorer/$${item}.so ; \
if [ -e build/share/bsdconv/scorer/$${item}.man ]; then install -m 444 build/share/bsdconv/scorer/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/scorer/$${item}.man ; fi ; \
done
@@ -321,21 +313,21 @@ install_basic:
for item in ${TODO_CODECS_BASIC} ; do \
- install -m 444 build/share/bsdconv/$${item} ${PREFIX}/share/bsdconv/$${item} ; \
- if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
- if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
+ if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
+ if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
- if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ if [ -e build/share/bsdconv/$${item}.so ]; then install ${STRIP} -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
done
install_chinese:
for item in ${TODO_CODECS_CHINESE} ; do \
- install -m 444 build/share/bsdconv/$${item} ${PREFIX}/share/bsdconv/$${item} ; \
- if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
- if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
+ if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
+ if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
- if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ if [ -e build/share/bsdconv/$${item}.so ]; then install ${STRIP} -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
done
install_ebcdic:
for item in ${TODO_CODECS_EBCDIC} ; do \
- install -m 444 build/share/bsdconv/$${item} ${PREFIX}/share/bsdconv/$${item} ; \
- if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
- if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
+ if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
+ if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
- if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ if [ -e build/share/bsdconv/$${item}.so ]; then install ${STRIP} -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
done
plist:
build_doc: build_doc_tex build_doc_sphinx

View file

@ -5,6 +5,23 @@ bin/bsdconv-mktable
include/bsdconv.h
lib/libbsdconv.so
lib/libbsdconv.so.11
%%DATADIR%%/filter/ANSI.so
%%DATADIR%%/filter/BYTE.so
%%DATADIR%%/filter/CJK.man
%%DATADIR%%/filter/CJK.so
%%DATADIR%%/filter/CNS11643.so
%%DATADIR%%/filter/CYRILLIC.so
%%DATADIR%%/filter/HANGUL.so
%%DATADIR%%/filter/HIRAGANA.so
%%DATADIR%%/filter/KATAKANA.so
%%DATADIR%%/filter/KHMER.so
%%DATADIR%%/filter/LATIN1.so
%%DATADIR%%/filter/MAHJONG.so
%%DATADIR%%/filter/PRINT.so
%%DATADIR%%/filter/ROMAN.so
%%DATADIR%%/filter/THAI.so
%%DATADIR%%/filter/UNICODE.so
%%DATADIR%%/filter/alias
%%DATADIR%%/from/00
%%DATADIR%%/from/00.man
%%DATADIR%%/from/ANSI-CONTROL
@ -15,9 +32,13 @@ lib/libbsdconv.so.11
%%DATADIR%%/from/ANY.so
%%DATADIR%%/from/ASCII
%%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY
%%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY.man
%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY
%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.man
%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.so
%%DATADIR%%/from/ASCII.man
%%DATADIR%%/from/BIG5-5C
%%DATADIR%%/from/BIG5-5C.man
%%DATADIR%%/from/BSDCONV
%%DATADIR%%/from/BSDCONV-KEYWORD
%%DATADIR%%/from/BSDCONV-KEYWORD.man
@ -27,6 +48,7 @@ lib/libbsdconv.so.11
%%DATADIR%%/from/BSDCONV.man
%%DATADIR%%/from/BSDCONV.so
%%DATADIR%%/from/BYTE
%%DATADIR%%/from/BYTE.man
%%DATADIR%%/from/ESCAPE
%%DATADIR%%/from/ESCAPE.man
%%DATADIR%%/from/ESCAPE.so
@ -34,33 +56,51 @@ lib/libbsdconv.so.11
%%DATADIR%%/from/PASS.man
%%DATADIR%%/from/PASS.so
%%DATADIR%%/from/UTF-16BE
%%DATADIR%%/from/UTF-16BE.man
%%DATADIR%%/from/UTF-16BE.so
%%DATADIR%%/from/UTF-16LE
%%DATADIR%%/from/UTF-16LE.man
%%DATADIR%%/from/UTF-16LE.so
%%DATADIR%%/from/UTF-32BE
%%DATADIR%%/from/UTF-32BE.man
%%DATADIR%%/from/UTF-32BE.so
%%DATADIR%%/from/UTF-32LE
%%DATADIR%%/from/UTF-32LE.man
%%DATADIR%%/from/UTF-32LE.so
%%DATADIR%%/from/_CP1251
%%DATADIR%%/from/_CP1251.man
%%DATADIR%%/from/_CP1252
%%DATADIR%%/from/_CP1252.man
%%DATADIR%%/from/_CP1253
%%DATADIR%%/from/_CP1253.man
%%DATADIR%%/from/_CP874
%%DATADIR%%/from/_CP874.man
%%DATADIR%%/from/_CP949
%%DATADIR%%/from/_CP949.man
%%DATADIR%%/from/_GB18030
%%DATADIR%%/from/_GB18030.man
%%DATADIR%%/from/_GB18030.so
%%DATADIR%%/from/_GBK
%%DATADIR%%/from/_GBK.man
%%DATADIR%%/from/_HKSCS2004
%%DATADIR%%/from/_ISO-8859-1
%%DATADIR%%/from/_ISO-8859-1.man
%%DATADIR%%/from/_JIS0212
%%DATADIR%%/from/_SHIFT-JIS
%%DATADIR%%/from/_SHIFT-JIS.man
%%DATADIR%%/from/_UAO250
%%DATADIR%%/from/_UAO250.man
%%DATADIR%%/from/_UTF-8
%%DATADIR%%/from/_UTF-8.man
%%DATADIR%%/from/_UTF-8.so
%%DATADIR%%/from/alias
%%DATADIR%%/inter/ALIAS-FILTER
%%DATADIR%%/inter/ALIAS-FROM
%%DATADIR%%/inter/ALIAS-FROM.man
%%DATADIR%%/inter/ALIAS-FROM.so
%%DATADIR%%/inter/ALIAS-INTER
%%DATADIR%%/inter/ALIAS-TO
%%DATADIR%%/inter/ALIAS-TO.man
%%DATADIR%%/inter/ALIAS-TO.so
%%DATADIR%%/inter/AMBIGUOUS-PAD
%%DATADIR%%/inter/AMBIGUOUS-PAD.man
@ -69,48 +109,70 @@ lib/libbsdconv.so.11
%%DATADIR%%/inter/AMBIGUOUS-UNPAD.man
%%DATADIR%%/inter/AMBIGUOUS-UNPAD.so
%%DATADIR%%/inter/BIG5-DEFRAG
%%DATADIR%%/inter/BIG5-DEFRAG.man
%%DATADIR%%/inter/BIG5-DEFRAG.so
%%DATADIR%%/inter/CASEFOLD
%%DATADIR%%/inter/COUNT
%%DATADIR%%/inter/COUNT.man
%%DATADIR%%/inter/COUNT.so
%%DATADIR%%/inter/FULL
%%DATADIR%%/inter/FULL.man
%%DATADIR%%/inter/HALF
%%DATADIR%%/inter/HALF.man
%%DATADIR%%/inter/INSERT
%%DATADIR%%/inter/INSERT.man
%%DATADIR%%/inter/INSERT.so
%%DATADIR%%/inter/KANA-PHONETIC
%%DATADIR%%/inter/KANA-PHONETIC.man
%%DATADIR%%/inter/LOWER
%%DATADIR%%/inter/LOWER.man
%%DATADIR%%/inter/MAC
%%DATADIR%%/inter/MAC.man
%%DATADIR%%/inter/NL2BR
%%DATADIR%%/inter/NOBOM
%%DATADIR%%/inter/NL2BR.man
%%DATADIR%%/inter/PASS
%%DATADIR%%/inter/PASS.man
%%DATADIR%%/inter/PASS.so
%%DATADIR%%/inter/REPLACE
%%DATADIR%%/inter/REPLACE.man
%%DATADIR%%/inter/REPLACE.so
%%DATADIR%%/inter/SCORE
%%DATADIR%%/inter/SCORE-TRAIN
%%DATADIR%%/inter/SCORE-TRAIN.man
%%DATADIR%%/inter/SCORE-TRAIN.so
%%DATADIR%%/inter/SCORE.man
%%DATADIR%%/inter/SCORE.so
%%DATADIR%%/inter/STRINGS
%%DATADIR%%/inter/STRINGS.man
%%DATADIR%%/inter/STRINGS.so
%%DATADIR%%/inter/TRIM-WIDTH
%%DATADIR%%/inter/TRIM-WIDTH.man
%%DATADIR%%/inter/TRIM-WIDTH.so
%%DATADIR%%/inter/UNIX
%%DATADIR%%/inter/UNIX.man
%%DATADIR%%/inter/UPPER
%%DATADIR%%/inter/UPPER.man
%%DATADIR%%/inter/UPSIDEDOWN
%%DATADIR%%/inter/UPSIDEDOWN.man
%%DATADIR%%/inter/WHITESPACE-DERAIL
%%DATADIR%%/inter/WHITESPACE-DERAIL.man
%%DATADIR%%/inter/WHITESPACE-DERAIL.so
%%DATADIR%%/inter/WHITESPACE-RERAIL
%%DATADIR%%/inter/WHITESPACE-RERAIL.man
%%DATADIR%%/inter/WHITESPACE-RERAIL.so
%%DATADIR%%/inter/WIDTH
%%DATADIR%%/inter/WIDTH.man
%%DATADIR%%/inter/WIDTH.so
%%DATADIR%%/inter/WIN
%%DATADIR%%/inter/WIN.man
%%DATADIR%%/inter/ZH-FUZZY-CN
%%DATADIR%%/inter/ZH-FUZZY-TW
%%DATADIR%%/inter/ZH-STRINGS
%%DATADIR%%/inter/ZH-STRINGS.man
%%DATADIR%%/inter/ZH-STRINGS.so
%%DATADIR%%/inter/ZHCN
%%DATADIR%%/inter/ZHCN.man
%%DATADIR%%/inter/ZHTW
%%DATADIR%%/inter/ZHTW-WORDS
%%DATADIR%%/inter/ZHTW-WORDS.man
%%DATADIR%%/inter/ZHTW.man
%%DATADIR%%/inter/_NF-HANGUL-COMPOSITION
%%DATADIR%%/inter/_NF-HANGUL-COMPOSITION.so
%%DATADIR%%/inter/_NF-HANGUL-DECOMPOSITION
@ -123,34 +185,49 @@ lib/libbsdconv.so.11
%%DATADIR%%/inter/_NFD
%%DATADIR%%/inter/_NFKD
%%DATADIR%%/inter/alias
%%DATADIR%%/scorer/CJK.so
%%DATADIR%%/scorer/LATIN1.so
%%DATADIR%%/to/00
%%DATADIR%%/to/ANY
%%DATADIR%%/to/ANY.man
%%DATADIR%%/to/ANY.so
%%DATADIR%%/to/ASCII
%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG
%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.man
%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
%%DATADIR%%/to/ASCII-HTML-INFO
%%DATADIR%%/to/ASCII-HTML-INFO.man
%%DATADIR%%/to/ASCII-HTML-INFO.so
%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG
%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.man
%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so
%%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY
%%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY.man
%%DATADIR%%/to/ASCII.man
%%DATADIR%%/to/BIG5-5C
%%DATADIR%%/to/BIG5-5C.man
%%DATADIR%%/to/BSDCONV
%%DATADIR%%/to/BSDCONV-KEYWORD
%%DATADIR%%/to/BSDCONV-KEYWORD.man
%%DATADIR%%/to/BSDCONV-LOG
%%DATADIR%%/to/BSDCONV-LOG.man
%%DATADIR%%/to/BSDCONV-LOG.so
%%DATADIR%%/to/BSDCONV-STDOUT
%%DATADIR%%/to/BSDCONV-STDOUT.so
%%DATADIR%%/to/BSDCONV-OUTPUT
%%DATADIR%%/to/BSDCONV-OUTPUT.man
%%DATADIR%%/to/BSDCONV-OUTPUT.so
%%DATADIR%%/to/BSDCONV.man
%%DATADIR%%/to/BSDCONV.so
%%DATADIR%%/to/BYTE
%%DATADIR%%/to/BYTE.man
%%DATADIR%%/to/CP936-TRANS
%%DATADIR%%/to/CP936-TRANS.man
%%DATADIR%%/to/CP950-TRANS
%%DATADIR%%/to/CP950-TRANS.man
%%DATADIR%%/to/ESCAPE
%%DATADIR%%/to/ESCAPE.man
%%DATADIR%%/to/ESCAPE.so
%%DATADIR%%/to/NULL
%%DATADIR%%/to/NULL.man
%%DATADIR%%/to/NULL.so
%%DATADIR%%/to/PASS
%%DATADIR%%/to/PASS.man
@ -159,72 +236,130 @@ lib/libbsdconv.so.11
%%DATADIR%%/to/RAW.man
%%DATADIR%%/to/RAW.so
%%DATADIR%%/to/UCS-2BE
%%DATADIR%%/to/UCS-2BE.man
%%DATADIR%%/to/UCS-2BE.so
%%DATADIR%%/to/UCS-2LE
%%DATADIR%%/to/UCS-2LE.man
%%DATADIR%%/to/UCS-2LE.so
%%DATADIR%%/to/UTF-16BE
%%DATADIR%%/to/UTF-16BE.man
%%DATADIR%%/to/UTF-16BE.so
%%DATADIR%%/to/UTF-16LE
%%DATADIR%%/to/UTF-16LE.man
%%DATADIR%%/to/UTF-16LE.so
%%DATADIR%%/to/UTF-32BE
%%DATADIR%%/to/UTF-32BE.man
%%DATADIR%%/to/UTF-32BE.so
%%DATADIR%%/to/UTF-32LE
%%DATADIR%%/to/UTF-32LE.man
%%DATADIR%%/to/UTF-32LE.so
%%DATADIR%%/to/_CP1251
%%DATADIR%%/to/_CP1251.man
%%DATADIR%%/to/_CP1252
%%DATADIR%%/to/_CP1252.man
%%DATADIR%%/to/_CP1253
%%DATADIR%%/to/_CP1253.man
%%DATADIR%%/to/_CP874
%%DATADIR%%/to/_CP874.man
%%DATADIR%%/to/_CP936
%%DATADIR%%/to/_CP936.man
%%DATADIR%%/to/_CP949
%%DATADIR%%/to/_CP949.man
%%DATADIR%%/to/_CP950
%%DATADIR%%/to/_CP950.man
%%DATADIR%%/to/_GB18030
%%DATADIR%%/to/_GB18030.man
%%DATADIR%%/to/_GB18030.so
%%DATADIR%%/to/_GBK
%%DATADIR%%/to/_GBK.man
%%DATADIR%%/to/_ISO-8859-1
%%DATADIR%%/to/_ISO-8859-1.man
%%DATADIR%%/to/_JIS0212
%%DATADIR%%/to/_SHIFT-JIS
%%DATADIR%%/to/_SHIFT-JIS.man
%%DATADIR%%/to/_UAO250
%%DATADIR%%/to/_UAO250.man
%%DATADIR%%/to/_UTF-8
%%DATADIR%%/to/_UTF-8.man
%%DATADIR%%/to/_UTF-8.so
%%DATADIR%%/to/alias
%%CHINESE%%%%DATADIR%%/from/CCCII
%%CHINESE%%%%DATADIR%%/from/CCCII.man
%%CHINESE%%%%DATADIR%%/from/_BIG5-2003
%%CHINESE%%%%DATADIR%%/from/_BIG5-2003.man
%%CHINESE%%%%DATADIR%%/from/_BIG5-ETEN
%%CHINESE%%%%DATADIR%%/from/_BIG5-ETEN.man
%%CHINESE%%%%DATADIR%%/from/_BIG5E
%%CHINESE%%%%DATADIR%%/from/_BIG5E.man
%%CHINESE%%%%DATADIR%%/from/_CNS11643
%%CHINESE%%%%DATADIR%%/from/_CNS11643.man
%%CHINESE%%%%DATADIR%%/from/_CNS11643.so
%%CHINESE%%%%DATADIR%%/from/_CP936
%%CHINESE%%%%DATADIR%%/from/_CP936.man
%%CHINESE%%%%DATADIR%%/from/_CP950
%%CHINESE%%%%DATADIR%%/from/_CP950.man
%%CHINESE%%%%DATADIR%%/from/_GB2312
%%CHINESE%%%%DATADIR%%/from/_GB2312.man
%%CHINESE%%%%DATADIR%%/from/_HKSCS1999
%%CHINESE%%%%DATADIR%%/from/_HKSCS2001
%%CHINESE%%%%DATADIR%%/from/_UAO241
%%CHINESE%%%%DATADIR%%/from/_UAO241.man
%%CHINESE%%%%DATADIR%%/inter/CHEWING
%%CHINESE%%%%DATADIR%%/inter/CHEWING.man
%%CHINESE%%%%DATADIR%%/inter/CNS11643
%%CHINESE%%%%DATADIR%%/inter/CNS11643.man
%%CHINESE%%%%DATADIR%%/inter/HAN-PINYIN
%%CHINESE%%%%DATADIR%%/inter/HAN-PINYIN.man
%%CHINESE%%%%DATADIR%%/inter/UNICODE
%%CHINESE%%%%DATADIR%%/inter/UNICODE.man
%%CHINESE%%%%DATADIR%%/inter/ZH-BONUS
%%CHINESE%%%%DATADIR%%/inter/ZH-BONUS-PHRASE
%%CHINESE%%%%DATADIR%%/inter/ZH-BONUS-PHRASE.so
%%CHINESE%%%%DATADIR%%/inter/ZH-BONUS.so
%%CHINESE%%%%DATADIR%%/inter/ZH-COMP
%%CHINESE%%%%DATADIR%%/inter/ZH-COMP.man
%%CHINESE%%%%DATADIR%%/inter/ZH-DECOMP
%%CHINESE%%%%DATADIR%%/inter/ZH-DECOMP.man
%%CHINESE%%%%DATADIR%%/to/CCCII
%%CHINESE%%%%DATADIR%%/to/CCCII.man
%%CHINESE%%%%DATADIR%%/to/_CNS11643
%%CHINESE%%%%DATADIR%%/to/_CNS11643.man
%%CHINESE%%%%DATADIR%%/to/_CNS11643.so
%%CHINESE%%%%DATADIR%%/to/_GB2312
%%CHINESE%%%%DATADIR%%/to/_GB2312.man
%%CHINESE%%%%DATADIR%%/to/_UAO241
%%CHINESE%%%%DATADIR%%/to/_UAO241.man
%%EBCDIC%%%%DATADIR%%/from/IBM-37
%%EBCDIC%%%%DATADIR%%/from/IBM-37.man
%%EBCDIC%%%%DATADIR%%/from/IBM-930
%%EBCDIC%%%%DATADIR%%/from/IBM-930.man
%%EBCDIC%%%%DATADIR%%/from/IBM-930.so
%%EBCDIC%%%%DATADIR%%/from/IBM-933
%%EBCDIC%%%%DATADIR%%/from/IBM-933.man
%%EBCDIC%%%%DATADIR%%/from/IBM-933.so
%%EBCDIC%%%%DATADIR%%/from/IBM-935
%%EBCDIC%%%%DATADIR%%/from/IBM-935.man
%%EBCDIC%%%%DATADIR%%/from/IBM-935.so
%%EBCDIC%%%%DATADIR%%/from/IBM-937
%%EBCDIC%%%%DATADIR%%/from/IBM-937.man
%%EBCDIC%%%%DATADIR%%/from/IBM-937.so
%%EBCDIC%%%%DATADIR%%/from/IBM-939
%%EBCDIC%%%%DATADIR%%/from/IBM-939.man
%%EBCDIC%%%%DATADIR%%/from/IBM-939.so
%%EBCDIC%%%%DATADIR%%/to/IBM-37
%%EBCDIC%%%%DATADIR%%/to/IBM-37.man
%%EBCDIC%%%%DATADIR%%/to/IBM-930
%%EBCDIC%%%%DATADIR%%/to/IBM-930.man
%%EBCDIC%%%%DATADIR%%/to/IBM-930.so
%%EBCDIC%%%%DATADIR%%/to/IBM-933
%%EBCDIC%%%%DATADIR%%/to/IBM-933.man
%%EBCDIC%%%%DATADIR%%/to/IBM-933.so
%%EBCDIC%%%%DATADIR%%/to/IBM-935
%%EBCDIC%%%%DATADIR%%/to/IBM-935.man
%%EBCDIC%%%%DATADIR%%/to/IBM-935.so
%%EBCDIC%%%%DATADIR%%/to/IBM-937
%%EBCDIC%%%%DATADIR%%/to/IBM-937.man
%%EBCDIC%%%%DATADIR%%/to/IBM-937.so
%%EBCDIC%%%%DATADIR%%/to/IBM-939
%%EBCDIC%%%%DATADIR%%/to/IBM-939.man
%%EBCDIC%%%%DATADIR%%/to/IBM-939.so

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gbsdconv
PORTVERSION= 11.1
PORTVERSION= 11.3
CATEGORIES= converters python
MAINTAINER= buganini@gmail.com
@ -27,4 +27,7 @@ PLIST_FILES= bin/gbsdconv \
%%DATADIR%%/gbsdconv.xml \
%%DATADIR%%/gbsdconv2.png
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gbsdconv_taglib.so
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (buganini-gbsdconv-11.1_GH0.tar.gz) = 34f13dd5d242002fc1577508f067c6878466d4d20191cfb9dead513b9af36903
SIZE (buganini-gbsdconv-11.1_GH0.tar.gz) = 19728
SHA256 (buganini-gbsdconv-11.3_GH0.tar.gz) = 4ab852cbcb3b6f9b16fccb7cb3dd0a9c6c2736a0b7e369afe26a55a08809cc6e
SIZE (buganini-gbsdconv-11.3_GH0.tar.gz) = 19915

View file

@ -1,26 +0,0 @@
--- Makefile.orig 2013-09-09 09:56:10.000000000 +0400
+++ Makefile 2014-01-28 04:02:41.281082541 +0400
@@ -1,17 +1,17 @@
PREFIX?=/usr/local
-LIBS=-L${PREFIX}/lib -ltag
+LIBS=-L${LOCALBASE}/lib -ltag
all: gbsdconv_taglib
gbsdconv_taglib: taglib/tag_c.cpp
- $(CXX) -I${PREFIX}/include/taglib -fPIC -shared -o gbsdconv_taglib.so taglib/tag_c.cpp ${LIBS}
+ $(CXX) -I${LOCALBASE}/include/taglib -fPIC -shared -o gbsdconv_taglib.so taglib/tag_c.cpp ${LIBS}
install:
- install -m 755 gbsdconv ${PREFIX}/bin
- install -m 444 gbsdconv_taglib.so ${PREFIX}/lib
- mkdir -p ${PREFIX}/share/gbsdconv
- install -m 444 gbsdconv.png gbsdconv.xml gbsdconv2.png ${PREFIX}/share/gbsdconv
+ install -m 755 gbsdconv ${DESTDIR}${PREFIX}/bin
+ install -m 444 gbsdconv_taglib.so ${DESTDIR}${PREFIX}/lib
+ mkdir -p ${DESTDIR}${PREFIX}/share/gbsdconv
+ install -m 444 gbsdconv.png gbsdconv.xml gbsdconv2.png ${DESTDIR}${PREFIX}/share/gbsdconv
clean:
rm -f gbsdconv_taglib.so

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Encode
PORTVERSION= 2.73
PORTVERSION= 2.74
CATEGORIES= converters perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DANKOGAI
@ -19,13 +19,15 @@ USES= perl5
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 502101
PLIST_FILES+= bin/encguess man/man1/encguess.1.gz
.if ${PERL_LEVEL} < 502200
PLIST_SUB+= OLD_PERL=""
.else
PLIST_SUB+= OLD_PERL="@comment "
.endif
post-patch:
@${REINPLACE_CMD} -e 's|bin/enc2xs||; s|bin/piconv||' ${WRKSRC}/Makefile.PL
.if ${PERL_LEVEL} >= 502101
.if ${PERL_LEVEL} >= 502200
@${REINPLACE_CMD} -e 's|bin/encguess||' ${WRKSRC}/Makefile.PL
.endif

View file

@ -1,2 +1,2 @@
SHA256 (Encode-2.73.tar.gz) = 6b6c7b58bf5cdd8163ca6c9d161a7b986e14ddef973ba342b3e07ab11afea0fb
SIZE (Encode-2.73.tar.gz) = 2013300
SHA256 (Encode-2.74.tar.gz) = aa3c832a0478dae1da4e4ac8b12de0d2460c95964ae5d600f6af12f5c9afa6c0
SIZE (Encode-2.74.tar.gz) = 2014125

View file

@ -1,3 +1,4 @@
%%OLD_PERL%%bin/encguess
%%SITE_ARCH%%/Encode.pm
%%SITE_ARCH%%/Encode/Alias.pm
%%SITE_ARCH%%/Encode/Byte.pm
@ -59,3 +60,4 @@
%%PERL5_MAN3%%/Encode::Supported.3.gz
%%PERL5_MAN3%%/Encode::Unicode::UTF7.3.gz
%%PERL5_MAN3%%/encoding.3.gz
%%OLD_PERL%%man/man1/encguess.1.gz

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= bsdconv
PORTVERSION= 11.1.0
PORTREVISION= 1
PORTVERSION= 11.3.0
CATEGORIES= converters perl5
PKGNAMEPREFIX= p5-
@ -24,4 +23,7 @@ USE_PERL5= configure
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Makefile.PL
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/bsdconv/bsdconv.so
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (buganini-perl-bsdconv-11.1.0_GH0.tar.gz) = f1f85b02af5ceb23268b75bd8d7a1e2dc1a74c0dca11884739addd691b9073a0
SIZE (buganini-perl-bsdconv-11.1.0_GH0.tar.gz) = 44137
SHA256 (buganini-perl-bsdconv-11.3.0_GH0.tar.gz) = a3631d519a0ae7056eb9aa62afa54e28f68c464bb73bf1602f2a0134c5b594d8
SIZE (buganini-perl-bsdconv-11.3.0_GH0.tar.gz) = 43904

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bsdconv
PORTVERSION= 11.1.0
PORTVERSION= 11.3.0
CATEGORIES= converters
PKGNAMEPREFIX= php5-

View file

@ -1,2 +1,2 @@
SHA256 (buganini-php-bsdconv-11.1.0_GH0.tar.gz) = 15a8d49b1b79ff7cea7b63ab3c2daf71474f6ee2ee4ca2528b7fbe0c54960d1f
SIZE (buganini-php-bsdconv-11.1.0_GH0.tar.gz) = 7649
SHA256 (buganini-php-bsdconv-11.3.0_GH0.tar.gz) = de803e48cb40b130cf46003052104a5b8c7ab8d783034a06ea097c6617bbb20d
SIZE (buganini-php-bsdconv-11.3.0_GH0.tar.gz) = 8356

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bsdconv
PORTVERSION= 11.1.0
PORTVERSION= 11.3.0
CATEGORIES= converters python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -25,4 +25,7 @@ PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/setup.py
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/bsdconv.so
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (buganini-python-bsdconv-11.1.0_GH0.tar.gz) = 54b9a00d2235f0539007c187c0a7280062bdaaead3ebb88dccfe70f72c90daee
SIZE (buganini-python-bsdconv-11.1.0_GH0.tar.gz) = 5172
SHA256 (buganini-python-bsdconv-11.3.0_GH0.tar.gz) = d097a398c194a927e75ff03a4905fd4abaef0f9b22f69a302586625a8e62eefb
SIZE (buganini-python-bsdconv-11.3.0_GH0.tar.gz) = 5819

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bsdconv
PORTVERSION= 11.1.0
PORTVERSION= 11.3.1
CATEGORIES= converters rubygems
MASTER_SITES= RG
DISTNAME= ruby-${PORTNAME}-${PORTVERSION}

View file

@ -1,2 +1,2 @@
SHA256 (rubygem/ruby-bsdconv-11.1.0.gem) = 139c51ede9c6a93df789d472100b978dd475a12d9dc279d19a293d075be34996
SIZE (rubygem/ruby-bsdconv-11.1.0.gem) = 10240
SHA256 (rubygem/ruby-bsdconv-11.3.1.gem) = 51cf5030e638ec9678980d4390390a233bae99fe04b1dc28786cba974d0c23d0
SIZE (rubygem/ruby-bsdconv-11.3.1.gem) = 11776

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hamsterdb
PORTVERSION= 2.1.9
PORTVERSION= 2.1.11
CATEGORIES= databases
MASTER_SITES= http://files.hamsterdb.com/dl/

View file

@ -1,2 +1,2 @@
SHA256 (hamsterdb-2.1.9.tar.gz) = 76b5889e6147649f07d8def23e93f9844573ec572fe95cee6849b117139ba57f
SIZE (hamsterdb-2.1.9.tar.gz) = 1643455
SHA256 (hamsterdb-2.1.11.tar.gz) = 800e9140d806db9d836c1f5dc0a01e0b03ee2c9a3a7e28a4bf4b4a8f68218e15
SIZE (hamsterdb-2.1.11.tar.gz) = 1712981

View file

@ -1,11 +0,0 @@
--- src/1base/abi.h.orig 2015-01-13 21:23:05.548499482 +0800
+++ src/1base/abi.h 2015-01-13 21:23:29.098504301 +0800
@@ -31,7 +31,7 @@
#endif
#include <string>
-
+#include <stdlib.h>
// Always verify that a file of level N does not include headers > N!
#ifndef HAM_ROOT_H

View file

@ -1,11 +0,0 @@
--- src/1mem/mem.cc.orig 2015-01-13 21:18:27.778765410 +0800
+++ src/1mem/mem.cc 2015-01-13 21:19:17.118392234 +0800
@@ -67,6 +67,8 @@
// TODO
#elif __APPLE__
// TODO
+#elif __FreeBSD__
+ // TODO
#elif __GNUC__
::malloc_trim(File::get_granularity());
#endif

View file

@ -1,20 +0,0 @@
--- src/1os/os_posix.cc.orig 2015-01-23 22:50:40.837448364 +0800
+++ src/1os/os_posix.cc 2015-01-23 22:51:34.327606541 +0800
@@ -277,7 +277,7 @@
throw Exception(HAM_IO_ERROR);
}
-uint64_t
+size_t
File::tell()
{
uint64_t offset = lseek(m_fd, 0, SEEK_CUR);
@@ -287,7 +287,7 @@
return (offset);
}
-uint64_t
+size_t
File::get_file_size()
{
seek(0, kSeekEnd);

View file

@ -17,7 +17,7 @@ BUILD_DEPENDS= p5-DBI>=1.08:${PORTSDIR}/databases/p5-DBI
RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
CONFLICTS_INSTALL?= p5-Mysql-modules-[0-9]* p5-DBD-mysql[45][0-9]-[0-9]*
CONFLICTS_INSTALL?= p5-DBD-mysql[45][0-9]-[0-9]*
USE_MYSQL= yes
USE_PERL5= configure

View file

@ -5,7 +5,7 @@ PKGNAMESUFFIX= 51
COMMENT= MySQL 5.1 driver for the Perl5 Database Interface (DBI)
CONFLICTS= p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[02-9]-[0-9]*
CONFLICTS_INSTALL= p5-DBD-mysql-[0-9]* p5-DBD-mysql5[02-9]-[0-9]*
WANT_MYSQL_VER= 51

View file

@ -11,7 +11,7 @@ MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Database abstraction layer for PHP5
USE_PHP= yes
DEFAULT_VERSIONS+=php=5
PHP_DEFAULT= 5.4
NO_BUILD= yes
do-install:

View file

@ -23,7 +23,7 @@ USES= pkgconfig
USE_PHP_BUILD= yes
USE_PHP= pdo
USE_PHPEXT= yes
DEFAULT_PHP_VER=5
PHP_DEFAULT= 5.4
IGNORE_WITH_PHP=52
USE_GCC= yes

View file

@ -11,7 +11,7 @@ MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Full-service object persistence and query toolkit for PHP
USE_PHP= yes
DEFAULT_VERSIONS+= php=5
PHP_DEFAULT= 5.4
WRKSRC= ${WRKDIR}
do-build:

View file

@ -14,7 +14,7 @@ LICENSE= PHP301
USE_PHP= session
USE_PHP_BUILD= yes
USE_PHPEXT= yes
DEFAULT_VERSIONS+=php=5
PHP_DEFAULT= 5.4
USE_GITHUB= yes
GH_ACCOUNT= phpredis

View file

@ -13,7 +13,7 @@ USE_GITHUB= yes
USE_PHP= yes
USE_PHPEXT= yes
USE_PHPIZE= yes
DEFAULT_PHP_VER=5
PHP_DEFAULT= 5.4
PHP_MODNAME= ${PORTNAME}
GH_PROJECT= ${PORTNAME}-php

View file

@ -18,7 +18,7 @@ GH_PROJECT= phpredis
USE_PHP= session
USE_PHP_BUILD= yes
USE_PHPEXT= yes
DEFAULT_PHP_VER=55
PHP_DEFAULT= 5.5
PHP_MODNAME= redis

View file

@ -16,7 +16,7 @@ GITVERSION= 0f0661e
USE_PHP= session
USE_PHP_BUILD= yes
USE_PHPEXT= yes
DEFAULT_VERSIONS+= php=56
PHP_DEFAULT= 5.6
USE_GITHUB= yes
GH_ACCOUNT= nicolasff

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= activemodel
PORTVERSION= 4.2.2
PORTVERSION= 4.2.3
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 4
@ -15,6 +15,7 @@ LICENSE= MIT
RUN_DEPENDS= rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
rubygem-builder32>=3.2.2:${PORTSDIR}/devel/rubygem-builder32
NO_ARCH= yes
USE_RUBY= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes

View file

@ -1,2 +1,2 @@
SHA256 (rubygem/activemodel-4.2.2.gem) = 8cbe92434a9220ceccf467c053b3af625943ea3dac5320b81ba7171f0830d420
SIZE (rubygem/activemodel-4.2.2.gem) = 45568
SHA256 (rubygem/activemodel-4.2.3.gem) = aa059959ea21515e05ad1f1768822d7056adecb1978b6868411c2603a9293c32
SIZE (rubygem/activemodel-4.2.3.gem) = 45568

View file

@ -14,6 +14,7 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= jruby:${PORTSDIR}/lang/jruby \
rubygem-activerecord4>=2.2:${PORTSDIR}/databases/rubygem-activerecord4
NO_ARCH= yes
USE_RUBY= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= activerecord
PORTVERSION= 4.2.2
PORTVERSION= 4.2.3
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 4
@ -16,6 +16,7 @@ RUN_DEPENDS= rubygem-activemodel4>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-
rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
rubygem-arel6>=6.0.0:${PORTSDIR}/databases/rubygem-arel6
NO_ARCH= yes
USE_RUBY= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes

View file

@ -1,2 +1,2 @@
SHA256 (rubygem/activerecord-4.2.2.gem) = a5652058adf8e1896e8e7510e2aa16375903bae06253f2697fd8987a6854c873
SIZE (rubygem/activerecord-4.2.2.gem) = 326144
SHA256 (rubygem/activerecord-4.2.3.gem) = 74e64271950702aa870689532ce2173348760a00c6a54760c5625c7b9734cefe
SIZE (rubygem/activerecord-4.2.3.gem) = 327680

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= couchrest
PORTVERSION= 1.2.0
PORTREVISION= 1
PORTVERSION= 1.2.1
CATEGORIES= databases rubygems
MASTER_SITES= RG
@ -13,8 +12,8 @@ COMMENT= Provides a simple interface on top of CouchDBs RESTful HTTP API
LICENSE= APACHE20
RUN_DEPENDS= rubygem-mime-types>=1.15:${PORTSDIR}/misc/rubygem-mime-types \
rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
rubygem-rest-client>=1.6.1:${PORTSDIR}/www/rubygem-rest-client
rubygem-multi_json>=1.7:${PORTSDIR}/devel/rubygem-multi_json \
rubygem-rest-client>=1.8.0:${PORTSDIR}/www/rubygem-rest-client
NO_ARCH= yes
USE_RUBY= yes

View file

@ -1,2 +1,2 @@
SHA256 (rubygem/couchrest-1.2.0.gem) = f3da9527af3090d3ef8f76352b8b825c9c576a7dd6ee0452678a8002fea25394
SIZE (rubygem/couchrest-1.2.0.gem) = 51712
SHA256 (rubygem/couchrest-1.2.1.gem) = 4f92ff903b75f3cbf509e04e716bd51360785b1b3ca0bb1e73aba90f61513462
SIZE (rubygem/couchrest-1.2.1.gem) = 52224

View file

@ -1,11 +0,0 @@
--- couchrest.gemspec.orig 2015-05-31 17:14:31 UTC
+++ couchrest.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.specification_version = 3
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.1"])
+ s.add_runtime_dependency(%q<rest-client>, [">= 1.6.1"])
s.add_runtime_dependency(%q<mime-types>, ["~> 1.15"])
s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
s.add_development_dependency(%q<json>, [">= 1.7.0"])

View file

@ -13,6 +13,7 @@ LICENSE= MIT
RUN_DEPENDS= rubygem-activerecord4>=3.1:${PORTSDIR}/databases/rubygem-activerecord4 \
rubygem-activesupport4>=3.1:${PORTSDIR}/devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes

View file

@ -252,6 +252,7 @@
SUBDIR += cloudabi-libc++
SUBDIR += cloudabi-libc++abi
SUBDIR += cloudabi-libunwind
SUBDIR += cloudabi-toolchain
SUBDIR += cmake
SUBDIR += cmake-fedora
SUBDIR += cmake-gui

View file

@ -0,0 +1,28 @@
# Created by: Ed Schouten <ed@FreeBSD.org>
# $FreeBSD$
PORTNAME= cloudabi-toolchain
PORTVERSION= 1.0
CATEGORIES= devel
MAINTAINER= ed@FreeBSD.org
COMMENT= C and C++ toolchain for CloudABI
USES= metaport
LIBDIR= ${LOCALBASE}/x86_64-unknown-cloudabi/lib
# C and C++ compiler to be run on the development system.
RUN_DEPENDS+= x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \
x86_64-unknown-cloudabi-cc:${PORTSDIR}/lang/cloudabi-clang
# Libraries for C language support.
RUN_DEPENDS+= ${LIBDIR}/libc.a:${PORTSDIR}/devel/cloudabi-cloudlibc \
${LIBDIR}/libcompiler_rt.a:${PORTSDIR}/devel/cloudabi-compiler-rt
# Libraries for C++ language support.
RUN_DEPENDS+= ${LIBDIR}/libc++.a:${PORTSDIR}/devel/cloudabi-libc++ \
${LIBDIR}/libc++abi.a:${PORTSDIR}/devel/cloudabi-libc++abi \
${LIBDIR}/libunwind.a:${PORTSDIR}/devel/cloudabi-libunwind
.include <bsd.port.mk>

View file

@ -0,0 +1,10 @@
Nuxi CloudABI is an application binary interface for UNIX-like operating
systems built around the concept of capability-based security. In a
nutshell, it means that you can run processes directly on top of a UNIX
kernel while keeping complete control over the actions the process is
allowed to perform.
This port installs a full toolchain that can be used to compile C and
C++ software against CloudABI.
WWW: https://github.com/NuxiNL/cloudlibc

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bbmustache
PORTVERSION= 1.0.2
PORTVERSION= 1.0.3
DISTVERSIONPREFIX=v
CATEGORIES= devel
PKGNAMEPREFIX= erlang-

View file

@ -1,2 +1,2 @@
SHA256 (soranoba-bbmustache-v1.0.2_GH0.tar.gz) = c706ce99839cdcf982ae001925d1a55276037092e3fbec17bfe864f88420b9c5
SIZE (soranoba-bbmustache-v1.0.2_GH0.tar.gz) = 351487
SHA256 (soranoba-bbmustache-v1.0.3_GH0.tar.gz) = d393759e4b060adc82b5e8e63f6b0238eb1bd7bf2ed4cd2030e5269a21af76b0
SIZE (soranoba-bbmustache-v1.0.3_GH0.tar.gz) = 351423

View file

@ -1,11 +1,11 @@
--- rebar.config.orig 2015-06-21 04:13:38 UTC
--- rebar.config.orig 2015-06-28 16:44:38 UTC
+++ rebar.config
@@ -42,8 +42,6 @@
]},
{dev, [{deps,
[
- {reloader, ".*", {git, "git://github.com/sile/reloader.git", {branch, "master"}}},
- {edown, ".*", {git, "git://github.com/dwango/edown.git", {branch, "master"}}}
- {reloader, ".*", {git, "git://github.com/mykook/reloader.git", {branch, "master"}}},
- {edown, ".*", {git, "git://github.com/uwiger/edown.git", {branch, "master"}}}
]}
]}
]}.

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gb
PORTVERSION= 0.0.0.2015050101
PORTVERSION= 0.0.0.2015062801
CATEGORIES= devel
MAINTAINER= swills@FreeBSD.org
@ -11,46 +11,38 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
USE_GITHUB= yes
GH_ACCOUNT= constabulary
GH_TAGNAME= 400dce5e5172bcbaf609e6a1107988bb5571dc90
GH_TAGNAME= d14e213
PLIST_FILES= bin/gb bin/gb-env bin/gb-vendor
PLIST_FILES= bin/gb bin/gb-vendor
PORTDOCS= README.md
PORTDOCS= README.md LICENSE
STRIP= # stripping can break go binaries
.include <bsd.port.options.mk>
post-patch:
post-extract:
@cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
${CP} -R LICENSE README.md build.go build_test.go cgo.go cmd \
context.go gb.go gc.go getting-started.md gotest_go11.go \
install.go log.go package.go package_test.go project.go \
stdlib.go target.go test.go test_test.go testdata toolchain.go \
util.go wercker.yml \
${MV} .gitignore LICENSE README.md build.go build_test.go \
cgo.go cgo14.go cgo15.go cmd context.go context_test.go \
defaultcc.go defaultcc_bsd.go gb.go gb_test.go gc.go gc14.go \
gc15.go install.go log.go package.go package_test.go project.go \
src.go stdlib.go target.go testdata wercker.yml \
src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
do-build:
cd ${WRKSRC} ; \
${SETENV} GOPATH=${WRKSRC} go build -o gb-env \
src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/gb-env/main.go ; \
${SETENV} GOPATH=${WRKSRC} go build -o gb \
src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/gb/main.go \
src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/gb/plugin.go \
src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/gb/build.go \
src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/gb/test.go ; \
${SETENV} GOPATH=${WRKSRC} go build -o gb-vendor \
src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/gb-vendor/main.go
@cd ${WRKSRC} ; \
${SETENV} GOPATH=${WRKSRC} go install ./...
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gb \
${INSTALL_PROGRAM} ${WRKSRC}/bin/gb \
${STAGEDIR}${PREFIX}/bin/
${INSTALL_PROGRAM} ${WRKSRC}/gb-env \
${STAGEDIR}${PREFIX}/bin/
${INSTALL_PROGRAM} ${WRKSRC}/gb-vendor \
${INSTALL_PROGRAM} ${WRKSRC}/bin/gb-vendor \
${STAGEDIR}${PREFIX}/bin/
${MKDIR} ${STAGEDIR}${DOCSDIR}
${CP} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/README.md \
${STAGEDIR}${DOCSDIR}
${CP} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/LICENSE \
${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (constabulary-gb-0.0.0.2015050101-400dce5e5172bcbaf609e6a1107988bb5571dc90_GH0.tar.gz) = daff70f492a566e98347e9d68b898c6896a7d4adf954c8788a020aa4764bf486
SIZE (constabulary-gb-0.0.0.2015050101-400dce5e5172bcbaf609e6a1107988bb5571dc90_GH0.tar.gz) = 21774
SHA256 (constabulary-gb-0.0.0.2015062801-d14e213_GH0.tar.gz) = 8add1642467bcc1964619ddf29ef815b656bd1d0627a3ad98b75fd499264d20b
SIZE (constabulary-gb-0.0.0.2015062801-d14e213_GH0.tar.gz) = 53439

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= go-bindata
PORTVERSION= 3.0.5
PORTVERSION= 3.0.7
DISTVERSIONPREFIX= v
CATEGORIES= devel
@ -25,22 +25,22 @@ OPTIONS_DEFINE= DOCS
post-patch:
@cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
${CP} -R CONTRIBUTING.md LICENSE README.md asset.go bytewriter.go \
${MV} CONTRIBUTING.md LICENSE README.md asset.go bytewriter.go \
config.go convert.go debug.go doc.go go-bindata release.go \
stringwriter.go testdata toc.go \
src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
do-build:
cd ${WRKSRC} ; \
${SETENV} GOPATH=${WRKSRC} go build -o ${PORTNAME}/${PORTNAME} ${PORTNAME}/main.go ${PORTNAME}/version.go
${SETENV} GOPATH=${WRKSRC} go install ./...
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${PORTNAME} \
${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \
${STAGEDIR}${PREFIX}/bin/
${MKDIR} ${STAGEDIR}${DOCSDIR}
.if ${PORT_OPTIONS:MDOCS}
.for x in ${PORTDOCS}
${INSTALL_MAN} ${WRKSRC}/${x} \
${INSTALL_MAN} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${x} \
${STAGEDIR}${DOCSDIR}
.endfor
.endif

View file

@ -1,2 +1,2 @@
SHA256 (jteeuwen-go-bindata-v3.0.5_GH0.tar.gz) = 8cdeda986e457e079d8d241906fc824688f51e33be21b793f34f3025322bdb61
SIZE (jteeuwen-go-bindata-v3.0.5_GH0.tar.gz) = 11604
SHA256 (jteeuwen-go-bindata-v3.0.7_GH0.tar.gz) = 77a7214479e5ce9004e4afa6d0eb8ce14289030fadc55a3444249ab1fe2c7980
SIZE (jteeuwen-go-bindata-v3.0.7_GH0.tar.gz) = 13855

View file

@ -13,67 +13,28 @@ COMMENT= Adacore multi-language software build tool
LICENSE= GPLv3
BUILD_DEPENDS+= xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
gnat_util>=20140422:${PORTSDIR}/lang/gnat_util
BUILD_DEPENDS= xmlada>=4.4:${PORTSDIR}/textproc/xmlada
YEAR= 2014
SNAPSHOT= 20140417
GNU_CONFIGURE= yes
USES= ada gmake
MAKE_ARGS+= BUILD=production
MAKE_ARGS+= PROCESSORS=${MAKE_JOBS_NUMBER}
PORTDOCS= html txt pdf info
PORTEXAMPLES= *
YEAR= 2015
SNAPSHOT= 20150506
USES= ada
MAKE_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER}
PORTDOCS= html txt pdf
CONHOST= ${CONFIGURE_TARGET}
INSTALL_TARGET= install
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_DEFINE= DOCS
DOCS_INSTALL_TARGET= install-docs
.include <bsd.port.pre.mk>
.if ${ADAXX:Mgcc}
EXTRA_PATCHES= ${FILESDIR}/extrapatch-protocol.adb \
${FILESDIR}/extrapatch-src_gprbuild-main.adb \
${FILESDIR}/extrapatch-src_gprslave.adb \
${FILESDIR}/extrapatch-src_rewrite__data.ada
.else
EXTRA_PATCHES= ${FILESDIR}/extrapatch-5-gprbuild-main.adb \
${FILESDIR}/extrapatch-5-gprbuild-slave.adb \
${FILESDIR}/extrapatch-5-gprbuild-post.adb \
${FILESDIR}/extrapatch-5-gprlib.adb
.endif
do-build:
# Recreate the do-build target without -j parameter
# It interferes with PROCESSORS make argument
(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET})
.include <bsd.port.options.mk>
post-patch:
@${REINPLACE_CMD} -e "s,@AUXPREFIX@,${PREFIX}/gcc-aux," \
${CP} ${FILESDIR}/Makefile.BSD ${WRKSRC}/Makefile
@${REINPLACE_CMD} -i "" -e "s,@AUXPREFIX@,${PREFIX}/gcc5-aux," \
${WRKSRC}/share/gprconfig/compilers.xml
# OpenVMS was removed from GCC 5, and it obviously isn't used
# here so replace boolean check to False so it builds on both
.if ${ADAXX:Mgcc}
# Try_Help is part of GNAT Pro, but it's not in GCC 4.9 yet
# It's not strictly needed. Before it just repeated usage.
# There are other messages; just suppress Try_Help on 4 files
${REINPLACE_CMD} -e '/Try_Help;/d' \
-e 's|Hostparm.OpenVMS|False|' ${WRKSRC}/src/*-main.adb \
${WRKSRC}/src/gprbind.adb ${WRKSRC}/src/gprlib.adb
.else # gcc5-aux
${REINPLACE_CMD} -e 's|Hostparm.OpenVMS|False|' \
${WRKSRC}/src/*-main.adb \
${WRKSRC}/src/gprbind.adb \
${WRKSRC}/src/gprlib.adb
.endif
${SED} -e 's|@host@|${CONHOST}|' \
${WRKSRC}/src/gprconfig-sdefault.ads.in > \
${WRKSRC}/src/gprconfig-sdefault.ads
${MV} ${WRKSRC}/share/gprconfig/*.orig ${WRKSRC}/obj-cov
post-install:
.if !${PORT_OPTIONS:MDOCS}
${RM} -rf ${STAGEDIR}${DOCSDIR}
.endif
.if !${PORT_OPTIONS:MEXAMPLES}
${RM} -rf ${STAGEDIR}${EXAMPLESDIR}
.endif
(cd ${STAGEDIR}${PREFIX} && ${FIND} share/examples -type d -empty | \
${SORT} -dr | ${XARGS} ${RMDIR})
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (gprbuild-gpl-2014-src.tar.gz) = 3c8986ff5f83cc0d3ee69f6e71d9f69a7eb1a7e2656493c829b18fb55c4ad5ac
SIZE (gprbuild-gpl-2014-src.tar.gz) = 2384695
SHA256 (gprbuild-gpl-2015-src.tar.gz) = 5d5bbc8c57075250c264e2f15d9949383450ac696eb8a90803c2a36b55ecd0e2
SIZE (gprbuild-gpl-2015-src.tar.gz) = 3424715

View file

@ -0,0 +1,97 @@
.PHONY: all
.PHONY: generate_sources
AFLAGS= -gnat12 -gnaty -gnatQ -O2 -gnatpn -gnatws -g1 -j${PROCESSORS}
COBJS= obj/link.o obj/gprbuild_dummies.o
LOOK= -aI${.CURDIR}/gnat -aI${.CURDIR}/gen_src \
-aL${PREFIX}/lib/xmlada/static -aI${PREFIX}/include/xmlada
LARGS= -largs ${.CURDIR}/obj/link.o \
-largs ${.CURDIR}/obj/gprbuild_dummies.o \
-largs ${PREFIX}/lib/xmlada/static/libxmlada_dom.a \
-largs ${PREFIX}/lib/xmlada/static/libxmlada_input_sources.a \
-largs ${PREFIX}/lib/xmlada/static/libxmlada_sax.a \
-largs ${PREFIX}/lib/xmlada/static/libxmlada_schema.a \
-largs ${PREFIX}/lib/xmlada/static/libxmlada_unicode.a
GENDIR= gen_src
GEN_SRCS= ${GENDIR}/snames.adb ${GENDIR}/snames.ads
DOCSDIR= ${PREFIX}/share/doc/gprbuild
all: gprbuild
install:
mkdir -p ${DESTDIR}${PREFIX}/bin \
${DESTDIR}${PREFIX}/libexec/gprbuild \
${DESTDIR}${PREFIX}/share/gpr \
${DESTDIR}${PREFIX}/share/gprconfig
${BSD_INSTALL_PROGRAM} ${.CURDIR}/obj/gprclean \
${.CURDIR}/obj/gprinstall \
${.CURDIR}/obj/gprconfig \
${.CURDIR}/obj/gprslave \
${.CURDIR}/obj/gprbuild ${DESTDIR}${PREFIX}/bin
${BSD_INSTALL_PROGRAM} ${.CURDIR}/obj/gprbind \
${.CURDIR}/obj/gprlib ${DESTDIR}${PREFIX}/libexec/gprbuild
${BSD_INSTALL_DATA} ${.CURDIR}/share/_default.gpr \
${DESTDIR}${PREFIX}/share/gpr
${BSD_INSTALL_DATA} ${.CURDIR}/share/gprconfig/* \
${DESTDIR}${PREFIX}/share/gprconfig
install-docs:
mkdir -p ${DESTDIR}${DOCSDIR}/html ${DESTDIR}${DOCSDIR}/txt \
${DESTDIR}${DOCSDIR}/pdf
${BSD_INSTALL_DATA} ${.CURDIR}/doc/txt/gprbuild_ug.txt \
${DESTDIR}${DOCSDIR}/txt
${BSD_INSTALL_DATA} ${.CURDIR}/doc/pdf/gprbuild_ug.pdf \
${DESTDIR}${DOCSDIR}/pdf
cp -r ${.CURDIR}/doc/html/* ${DESTDIR}${DOCSDIR}/html
rm -rf ${DESTDIR}${DOCSDIR}/html/_sources
${BSD_INSTALL_DATA} ${.CURDIR}/doc/*.png \
${DESTDIR}${DOCSDIR}/html
gprclean: src/gprclean-main.adb ${GEN_SRCS} ${COBJS}
gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \
${.CURDIR}/src/gprclean-main.adb ${LARGS}
gprbind: gprclean src/gprslave.adb ${GEN_SRCS} ${COBJS}
gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \
${.CURDIR}/src/gprbind.adb ${LARGS}
gprlib: gprbind src/gprslave.adb ${GEN_SRCS} ${COBJS}
gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \
${.CURDIR}/src/gprlib.adb ${LARGS}
gprslave: gprlib src/gprslave.adb ${GEN_SRCS} ${COBJS}
gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \
${.CURDIR}/src/gprslave.adb ${LARGS}
gprinstall: gprslave src/gprinstall-main.adb ${GEN_SRCS} ${COBJS}
gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \
${.CURDIR}/src/gprinstall-main.adb ${LARGS}
gprconfig: gprinstall src/gprconfig-main.adb ${GEN_SRCS} ${COBJS}
gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \
${.CURDIR}/src/gprconfig-main.adb ${LARGS}
gprbuild: gprconfig src/gprbuild-main.adb ${GEN_SRCS} ${COBJS}
gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \
${.CURDIR}/src/gprbuild-main.adb ${LARGS}
obj/link.o: gnat/link.c
gcc -c -o ${.CURDIR}/${.TARGET} ${.ALLSRC}
obj/gprbuild_dummies.o: src/gprbuild_dummies.c
gcc -c -o ${.CURDIR}/${.TARGET} ${.ALLSRC}
generate_sources:
mkdir -p ${.CURDIR}/${GENDIR}
(cd ${.CURDIR}/gnat && cp xsnamest.adb xutil.* snames.adb-tmpl \
snames.ads-tmpl snames.h-tmpl ../${GENDIR})
(cd ${.CURDIR}/${GENDIR} && \
gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
./xsnamest && \
mv snames.ns snames.ads && \
mv snames.nb snames.adb)
${GEN_SRCS}: generate_sources

View file

@ -1,30 +0,0 @@
--- src/gprbuild-main.adb.orig 2014-04-17 09:50:17 UTC
+++ src/gprbuild-main.adb
@@ -182,11 +182,22 @@ procedure Gprbuild.Main is
end if;
if Is_Allowed_Language (Main_Id.Source.Language.Name) then
- Queue.Insert
- (Source => (Format => Format_Gprbuild,
- Tree => Main_Id.Tree,
- Id => Main_Id.Source),
- With_Roots => Builder_Data (Main_Id.Tree).Closure_Needed);
+ declare
+ Closure : Boolean :=
+ Builder_Data (Main_Id.Tree).Closure_Needed;
+ begin
+ if Main_Id.Source.Language.Config.Kind /= Unit_Based
+ and then Main_Id.Source.Roots = null
+ then
+ Closure := False;
+ end if;
+ Queue.Insert
+ (Source => (Format => Format_Gprbuild,
+ Tree => Main_Id.Tree,
+ Id => Main_Id.Source,
+ Closure => Closure),
+ With_Roots => Builder_Data (Main_Id.Tree).Closure_Needed);
+ end;
-- If a non Ada main has no roots, then all sources need to be
-- compiled, so no need to check for closure.

View file

@ -1,26 +0,0 @@
--- src/gprbuild-post_compile.adb.orig 2014-04-17 09:50:17 UTC
+++ src/gprbuild-post_compile.adb
@@ -2558,6 +2558,7 @@ package body Gprbuild.Post_Compile is
if Main_Source.Language.Name = B_Data.Language.Name then
Queue.Insert
(Source => (Format => Format_Gprbuild,
+ Closure => False,
Tree => Main_File.Tree,
Id => Main_File.Source));
end if;
@@ -2567,6 +2568,7 @@ package body Gprbuild.Post_Compile is
while Roots /= null loop
Queue.Insert
(Source => (Format => Format_Gprbuild,
+ Closure => False,
Tree => Main_File.Tree,
Id => Roots.Root));
Roots := Roots.Next;
@@ -2627,6 +2629,7 @@ package body Gprbuild.Post_Compile is
Queue.Insert
(Source => (Format => Format_Gprbuild,
+ Closure => False,
Tree => Main_File.Tree,
Id => Source));
end if;

View file

@ -1,11 +0,0 @@
--- src/gprbuild-compilation-slave.adb.orig 2014-04-17 09:50:17 UTC
+++ src/gprbuild-compilation-slave.adb
@@ -817,7 +817,7 @@ package body Gprbuild.Compilation.Slave
S : Slave := Slave_S.Element (C);
begin
Proc (S);
- Pool (C) := S;
+ Pool.Replace_Element (Position => C, New_Item => S);
end;
end loop;
end Iterate;

View file

@ -1,17 +0,0 @@
--- src/gprlib.adb.orig 2014-04-17 09:50:17 UTC
+++ src/gprlib.adb
@@ -1185,12 +1185,12 @@ begin
new String'
("-lgnat" &
Shared_Libgnat_Separator &
- Line (6 .. Last));
+ Line (6));
Libgnarl :=
new String'
("-lgnarl" &
Shared_Libgnat_Separator &
- Line (6 .. Last));
+ Line (6));
end if;
else

View file

@ -1,33 +0,0 @@
The GNAT.Rewrite_Data package in not in FSF GNAT yet. Use the local 2013
version which does not have the Link method. This essentially changes
this file back to the GPRBuild 2013 version, so it should be ok.
--- src/gprbuild-compilation-protocol.adb.orig 2014-04-17 09:50:17.000000000 +0000
+++ src/gprbuild-compilation-protocol.adb
@@ -24,7 +24,7 @@ with Ada.Streams.Stream_IO;
with Ada.Strings.Fixed; use Ada.Strings.Fixed;
with Ada.Strings.Maps.Constants; use Ada.Strings.Maps;
-with GNAT.Rewrite_Data;
+with Rewrite_Data;
with GNAT.String_Split; use GNAT.String_Split;
with Gnatvsn; use Gnatvsn;
@@ -180,8 +180,6 @@ package body Gprbuild.Compilation.Protoc
end Output;
begin
- Rewrite_Data.Link (Rewriter, Rewriter_CD'Unchecked_Access);
-
if Dir /= "" and then not Exists (Dir) then
Create_Directory (Dir);
end if;
@@ -666,8 +664,6 @@ package body Gprbuild.Compilation.Protoc
end Output;
begin
- Rewrite_Data.Link (Rewriter, Rewriter_CD'Unchecked_Access);
-
if Exists (Path_Name) then
Open (File, In_File, Path_Name);

View file

@ -1,14 +0,0 @@
It seems GNAT Pro makeutl.adb renamed an argument which hasn't trickled
back to FSF GCC yet.
--- src/gprbuild-main.adb.orig 2014-04-17 09:50:17.000000000 +0000
+++ src/gprbuild-main.adb
@@ -2099,7 +2099,7 @@ begin
Do_Compute_Builder_Switches
(Project_Tree => Project_Tree,
- Env => Root_Environment,
+ Root_Environment => Root_Environment,
Main_Project => Main_Project);
Queue.Initialize (Opt.One_Compilation_Per_Obj_Dir);

View file

@ -1,25 +0,0 @@
Set_File_Last_Modify_Time_Stamp has been added to GNAT.OS_Lib on GNAT Pro
but that hasn't made it to gcc 4.9 yet. For the moment, just disable the
set file timestamp functionality that it serves here.
--- src/gprslave.adb.orig 2014-04-17 09:50:17.000000000 +0000
+++ src/gprslave.adb
@@ -1261,17 +1261,8 @@ procedure Gprslave is
procedure Set_Stamp
(Path_Name : String; Time_Stamp : Time_Stamp_Type)
is
- TS : constant String := String (Time_Stamp);
begin
- Set_File_Last_Modify_Time_Stamp
- (Path_Name,
- GM_Time_Of
- (Year => Year_Type'Value (TS (1 .. 4)),
- Month => Month_Type'Value (TS (5 .. 6)),
- Day => Day_Type'Value (TS (7 .. 8)),
- Hour => Hour_Type'Value (TS (9 .. 10)),
- Minute => Minute_Type'Value (TS (11 .. 12)),
- Second => Second_Type'Value (TS (13 .. 14))));
+ pragma Unreferenced (Path_Name, Time_Stamp);
end Set_Stamp;
------------------

View file

@ -1,288 +0,0 @@
This functionality was part of GPRBuild 2013, but it has since moved to
GNAT itself. Unfortunately, that's only happened for GNAT Pro so GCC 4.9
doesn't have this GNAT.Rewrite_Data. Moveover, the GNAT Pro version has
been extended since 2013.
Bring in the GNAT 2013 local Rewrite_Data package to build GPRBuild 2014.
--- src/rewrite_data.ads.orig 2014-05-16 07:42:27.000000000 +0000
+++ src/rewrite_data.ads
@@ -0,0 +1,86 @@
+------------------------------------------------------------------------------
+-- GNAT COMPILER COMPONENTS --
+-- --
+-- R E W R I T E _ D A T A --
+-- --
+-- S p e c --
+-- --
+-- Copyright (C) 2012, Free Software Foundation, Inc. --
+-- --
+-- This is free software; you can redistribute it and/or modify it under --
+-- terms of the GNU General Public License as published by the Free Soft- --
+-- ware Foundation; either version 3, or (at your option) any later ver- --
+-- sion. This software is distributed in the hope that it will be useful, --
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- --
+-- TABILITY 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 distributed with this software; see file --
+-- COPYING3. If not, go to http://www.gnu.org/licenses for a complete copy --
+-- of the license. --
+------------------------------------------------------------------------------
+
+with Ada.Streams; use Ada.Streams;
+
+package Rewrite_Data is
+
+ type Buffer
+ (Size, Size_Pattern, Size_Value : Stream_Element_Offset) is
+ limited private;
+
+ function Create
+ (Pattern, Value : String;
+ Size : Stream_Element_Offset := 1_024) return Buffer;
+ -- Create and return a buffer
+
+ procedure Write
+ (B : in out Buffer;
+ Data : Stream_Element_Array;
+ Output : not null access procedure (Data : Stream_Element_Array));
+ -- Write Data into the buffer, call Output for any prepared data
+
+ function Size (B : Buffer) return Natural;
+ -- Returns the current size of the buffer (count of Stream_Array_Element)
+
+ procedure Flush
+ (B : in out Buffer;
+ Output : not null access procedure (Data : Stream_Element_Array));
+ -- Call Output for all remaining data in the buffer. The buffer is
+ -- reset and ready for another use after this call.
+
+ procedure Reset (B : in out Buffer);
+ pragma Inline (Reset);
+ -- Clear all data in buffer, B is ready for another use. Note that this is
+ -- not needed after a Flush.
+
+ procedure Rewrite
+ (B : in out Buffer;
+ Input : not null access procedure
+ (Buffer : out Stream_Element_Array;
+ Last : out Stream_Element_Offset);
+ Output : not null access procedure (Data : Stream_Element_Array));
+ -- Read data from Input, rewrite them and then call Output
+
+private
+
+ type Buffer
+ (Size, Size_Pattern, Size_Value : Stream_Element_Offset) is
+ limited record
+ -- Fully prepared/rewritten data waiting to be output
+ Buffer : Stream_Element_Array (1 .. Size);
+
+ -- Current data checked, this buffer contains every piece of data
+ -- starting with the pattern. It means that at any point:
+ -- Current (1 .. Pos_C) = Pattern (1 .. Pos_C)
+ Current : Stream_Element_Array (1 .. Size_Pattern);
+
+ -- The pattern to look for
+ Pattern : Stream_Element_Array (1 .. Size_Pattern);
+
+ -- The value the pattern is replaced by
+ Value : Stream_Element_Array (1 .. Size_Value);
+
+ Pos_C : Stream_Element_Offset; -- last valid element in Current
+ Pos_B : Stream_Element_Offset; -- last valid element in Buffer
+ end record;
+
+end Rewrite_Data;
--- src/rewrite_data.adb.orig 2014-05-16 07:42:21.000000000 +0000
+++ src/rewrite_data.adb
@@ -0,0 +1,189 @@
+------------------------------------------------------------------------------
+-- GNAT COMPILER COMPONENTS --
+-- --
+-- R E W R I T E _ D A T A --
+-- --
+-- B o d y --
+-- --
+-- Copyright (C) 2012, Free Software Foundation, Inc. --
+-- --
+-- This is free software; you can redistribute it and/or modify it under --
+-- terms of the GNU General Public License as published by the Free Soft- --
+-- ware Foundation; either version 3, or (at your option) any later ver- --
+-- sion. This software is distributed in the hope that it will be useful, --
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- --
+-- TABILITY 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 distributed with this software; see file --
+-- COPYING3. If not, go to http://www.gnu.org/licenses for a complete copy --
+-- of the license. --
+------------------------------------------------------------------------------
+
+with Ada.Unchecked_Conversion;
+
+package body Rewrite_Data is
+
+ use Ada;
+
+ subtype SEO is Stream_Element_Offset;
+
+ ------------
+ -- Create --
+ ------------
+
+ function Create
+ (Pattern, Value : String;
+ Size : Stream_Element_Offset := 1_024) return Buffer
+ is
+
+ subtype SP is String (1 .. Pattern'Length);
+ subtype SEAP is Stream_Element_Array (1 .. Pattern'Length);
+
+ subtype SV is String (1 .. Value'Length);
+ subtype SEAV is Stream_Element_Array (1 .. Value'Length);
+
+ function To_SEAP is new Unchecked_Conversion (SP, SEAP);
+ function To_SEAV is new Unchecked_Conversion (SV, SEAV);
+
+ begin
+ return B : Buffer
+ (SEO'Max (Size, SEO (Pattern'Length)), -- can't be smaller than pattern
+ SEO (Pattern'Length),
+ SEO (Value'Length))
+ do
+ B.Pattern := To_SEAP (Pattern);
+ B.Value := To_SEAV (Value);
+ B.Pos_C := 0;
+ B.Pos_B := 0;
+ end return;
+ end Create;
+
+ -----------
+ -- Flush --
+ -----------
+
+ procedure Flush
+ (B : in out Buffer;
+ Output : not null access procedure (Data : Stream_Element_Array)) is
+ begin
+ if B.Pos_B > 0 then
+ Output (B.Buffer (1 .. B.Pos_B));
+ end if;
+
+ if B.Pos_C > 0 then
+ Output (B.Current (1 .. B.Pos_C));
+ end if;
+
+ Reset (B);
+ end Flush;
+
+ -----------
+ -- Reset --
+ -----------
+
+ procedure Reset (B : in out Buffer) is
+ begin
+ B.Pos_B := 0;
+ B.Pos_C := 0;
+ end Reset;
+
+ -------------
+ -- Rewrite --
+ -------------
+
+ procedure Rewrite
+ (B : in out Buffer;
+ Input : not null access procedure
+ (Buffer : out Stream_Element_Array;
+ Last : out Stream_Element_Offset);
+ Output : not null access procedure (Data : Stream_Element_Array))
+ is
+ Buffer : Stream_Element_Array (1 .. B.Size);
+ Last : Stream_Element_Offset;
+ begin
+ Rewrite_All : loop
+ Input (Buffer, Last);
+ exit Rewrite_All when Last = 0;
+ Write (B, Buffer (1 .. Last), Output);
+ end loop Rewrite_All;
+
+ Flush (B, Output);
+ end Rewrite;
+
+ ----------
+ -- Size --
+ ----------
+
+ function Size (B : Buffer) return Natural is
+ begin
+ return Natural (B.Pos_B + B.Pos_C);
+ end Size;
+
+ -----------
+ -- Write --
+ -----------
+
+ procedure Write
+ (B : in out Buffer;
+ Data : Stream_Element_Array;
+ Output : not null access procedure (Data : Stream_Element_Array))
+ is
+
+ procedure Need_Space (Size : Stream_Element_Offset);
+ pragma Inline (Need_Space);
+
+ ----------------
+ -- Need_Space --
+ ----------------
+
+ procedure Need_Space (Size : Stream_Element_Offset) is
+ begin
+ if B.Pos_B + Size > B.Size then
+ Output (B.Buffer (1 .. B.Pos_B));
+ B.Pos_B := 0;
+ end if;
+ end Need_Space;
+
+ begin
+ if B.Size_Pattern = 0 then
+ Output (Data);
+
+ else
+ for K in Data'Range loop
+ if Data (K) = B.Pattern (B.Pos_C + 1) then
+ -- Store possible start of a macth
+ B.Pos_C := B.Pos_C + 1;
+ B.Current (B.Pos_C) := Data (K);
+
+ else
+ -- Not part of pattern, if a start of a match was found,
+ -- remove it.
+
+ if B.Pos_C /= 0 then
+ Need_Space (B.Pos_C);
+
+ B.Buffer (B.Pos_B + 1 .. B.Pos_B + B.Pos_C) :=
+ B.Current (1 .. B.Pos_C);
+ B.Pos_B := B.Pos_B + B.Pos_C;
+ B.Pos_C := 0;
+ end if;
+
+ Need_Space (1);
+ B.Pos_B := B.Pos_B + 1;
+ B.Buffer (B.Pos_B) := Data (K);
+ end if;
+
+ if B.Pos_C = B.Size_Pattern then
+ -- The pattern is found
+
+ Need_Space (B.Size_Value);
+
+ B.Buffer (B.Pos_B + 1 .. B.Pos_B + B.Size_Value) := B.Value;
+ B.Pos_C := 0;
+ B.Pos_B := B.Pos_B + B.Size_Value;
+ end if;
+ end loop;
+ end if;
+ end Write;
+
+end Rewrite_Data;

View file

@ -1,75 +0,0 @@
--- Makefile.in.orig 2013-12-21 15:45:27.000000000 +0000
+++ Makefile.in
@@ -64,7 +64,7 @@ ADA_GEN_SUBDIR=gnat
.PHONY: all distall gprbuild gprconfig gprclean gprinstall \
copy_gnat_src complete bootstrap
-all: $(xmlada_build_target) $(ADA_GEN_SUBDIR)/stamp-snames
+all: $(xmlada_build_target)
${GNATMAKE} $(xmlada_prj_flags) -Pgprbuild -XBUILD=${BUILD}
distall:
@@ -124,45 +124,35 @@ bootstrap-clean:
-XBUILD_TOOL=gprbuild
install: install.data install.bin
- -${MKDIR} ${datadir}/gpr
- $(RM) -r ${datadir}/examples/gprbuild
- -${MKDIR} ${datadir}/examples/gprbuild
- ${CP} -r examples/* ${datadir}/examples/gprbuild
- ${RM} -r ${datadir}/doc/gprbuild
- -${MKDIR} ${datadir}/doc/gprbuild
+ -${MKDIR} ${DESTDIR}${datadir}/gpr \
+ ${DESTDIR}${datadir}/examples/gprbuild \
+ ${DESTDIR}${datadir}/doc/gprbuild
+ ${CP} -r examples/* ${DESTDIR}${datadir}/examples/gprbuild
for format in html txt pdf info; do \
if [ -d doc/$$format ] ; then \
- ${MKDIR} ${datadir}/doc/gprbuild/$$format; \
- ${CP} doc/$$format/* ${datadir}/doc/gprbuild/$$format; \
+ ${MKDIR} ${DESTDIR}${datadir}/doc/gprbuild/$$format; \
+ ${CP} doc/$$format/* ${DESTDIR}${datadir}/doc/gprbuild/$$format; \
if [ $$format = html ] ; then \
- ${CP} doc/*.png ${datadir}/doc/gprbuild/html; \
+ ${CP} doc/*.png ${DESTDIR}${datadir}/doc/gprbuild/html; \
sed -e "s/<doc_path>.*//" doc/gprbuild_gps.xml \
- > ${datadir}/doc/gprbuild/html/gps_index.xml; \
+ > ${DESTDIR}${datadir}/doc/gprbuild/html/gps_index.xml; \
fi; \
fi; \
done
install.data: force
- -${MKDIR} ${datadir}/gprconfig
- ${CP} share/gprconfig/*.xml ${datadir}/gprconfig
- ${CP} share/gprconfig/gprconfig.xsd ${datadir}/gprconfig
- -${MKDIR} ${datadir}/gpr
- ${CP} share/_default.gpr ${datadir}/gpr
+ -${MKDIR} ${DESTDIR}${datadir}/gprconfig ${DESTDIR}${datadir}/gpr
+ ${BSD_INSTALL_DATA} share/gprconfig/*.xml \
+ share/gprconfig/gprconfig.xsd ${DESTDIR}${datadir}/gprconfig
+ ${BSD_INSTALL_DATA} share/_default.gpr ${DESTDIR}${datadir}/gpr
install.bin: force
- -${MKDIR} ${bindir}
- ${INSTALL_PROGRAM} gprconfig${EXEXT} ${bindir}
- ${INSTALL_PROGRAM} gprbuild${EXEXT} ${bindir}
- ${INSTALL_PROGRAM} gprclean${EXEXT} ${bindir}
- ${INSTALL_PROGRAM} gprinstall${EXEXT} ${bindir}
-ifeq ($(IS_WINDOWS),true)
- ${CP} src/gprinstall.exe.manifest ${bindir}
- chmod +x ${bindir}/gprinstall.exe.manifest
-endif
- ${INSTALL_PROGRAM} gprslave${EXEXT} ${bindir}
- -${MKDIR} ${libexecdir}/gprbuild
- ${INSTALL_PROGRAM} gprbind${EXEXT} ${libexecdir}/gprbuild/
- ${INSTALL_PROGRAM} gprlib${EXEXT} ${libexecdir}/gprbuild/
+ ${MKDIR} ${DESTDIR}${libexecdir}/gprbuild
+ ${BSD_INSTALL_PROGRAM} gprconfig${EXEXT} gprbuild${EXEXT} \
+ gprclean${EXEXT} gprinstall${EXEXT} gprslave${EXEXT} \
+ ${DESTDIR}${bindir}
+ ${BSD_INSTALL_PROGRAM} gprbind${EXEXT} gprlib${EXEXT} \
+ ${DESTDIR}${libexecdir}/gprbuild
$(objdir)/gprbuild_dummies.o: src/gprbuild_dummies.c
gcc -c -o $@ $<

View file

@ -0,0 +1,302 @@
These restriction pragmas are not yet supported on FSF GNAT 5:
No_Specification_Of_Aspect
No_Use_Of_Attribute
No_Use_Of_Pragma
--- gnat/targparm.ads.orig 2015-05-06 11:08:38 UTC
+++ gnat/targparm.ads
@@ -615,53 +615,28 @@ package Targparm is
-- selected component with Sloc value System_Location and given Prefix
-- (Pre) and Selector (Sel) values.
- type Set_NOD_Type is access procedure (Unit : Node_Id);
+ type Set_RND_Type is access procedure (Unit : Node_Id);
-- Parameter type for Get_Target_Parameters that records a Restriction
-- No_Dependence for the given unit (identifier or selected component).
- type Set_NSA_Type is access procedure (Asp : Name_Id; OK : out Boolean);
- -- Parameter type for Get_Target_Parameters that records a Restriction
- -- No_Specification_Of_Aspect. Asp is the aspect name. OK is set True
- -- if this is an OK aspect name, and False if it is not an aspect name.
-
- type Set_NUA_Type is access procedure (Attr : Name_Id; OK : out Boolean);
- -- Parameter type for Get_Target_Parameters that records a Restriction
- -- No_Use_Of_Attribute. Attr is the attribute name. OK is set True if
- -- this is an OK attribute name, and False if it is not an attribute name.
-
- type Set_NUP_Type is access procedure (Prag : Name_Id; OK : out Boolean);
- -- Parameter type for Get_Target_Parameters that records a Restriction
- -- No_Use_Of_Pragma. Prag is the pragma name. OK is set True if this is
- -- an OK pragma name, and False if it is not a recognized pragma name.
-
procedure Get_Target_Parameters
(System_Text : Source_Buffer_Ptr;
Source_First : Source_Ptr;
Source_Last : Source_Ptr;
Make_Id : Make_Id_Type := null;
Make_SC : Make_SC_Type := null;
- Set_NOD : Set_NOD_Type := null;
- Set_NSA : Set_NSA_Type := null;
- Set_NUA : Set_NUA_Type := null;
- Set_NUP : Set_NUP_Type := null);
- -- Called at the start of execution to obtain target parameters from the
- -- source of package System. The parameters provide the source text to be
- -- scanned (in System_Text (Source_First .. Source_Last)). If the three
- -- subprograms Make_Id, Make_SC, and Set_NOD are left at their default
- -- value of null, Get_Target_Parameters will ignore pragma Restrictions
- -- (No_Dependence) lines; otherwise it will use these three subprograms to
- -- record them. Similarly, if Set_NUP is left at its default value of null,
- -- then any occurrences of pragma Restrictions (No_Use_Of_Pragma => XXX)
- -- will be ignored; otherwise it will use this procedure to record the
- -- pragma. Similarly for the NSA and NUA cases.
+ Set_RND : Set_RND_Type := null);
+ -- Called at the start of execution to obtain target parameters from
+ -- the source of package System. The parameters provide the source
+ -- text to be scanned (in System_Text (Source_First .. Source_Last)).
+ -- if the three subprograms are left at their default value of null,
+ -- Get_Target_Parameters will ignore pragma Restrictions No_Dependence
+ -- lines, otherwise it will use these three subprograms to record them.
procedure Get_Target_Parameters
(Make_Id : Make_Id_Type := null;
Make_SC : Make_SC_Type := null;
- Set_NOD : Set_NOD_Type := null;
- Set_NSA : Set_NSA_Type := null;
- Set_NUA : Set_NUA_Type := null;
- Set_NUP : Set_NUP_Type := null);
+ Set_RND : Set_RND_Type := null);
-- This version reads in system.ads using Osint. The idea is that the
-- caller uses the first version if they have to read system.ads anyway
-- (e.g. the compiler) and uses this simpler interface if system.ads is
--- gnat/targparm.adb.orig 2015-05-06 11:08:38 UTC
+++ gnat/targparm.adb
@@ -154,10 +154,7 @@ package body Targparm is
procedure Get_Target_Parameters
(Make_Id : Make_Id_Type := null;
Make_SC : Make_SC_Type := null;
- Set_NOD : Set_NOD_Type := null;
- Set_NSA : Set_NSA_Type := null;
- Set_NUA : Set_NUA_Type := null;
- Set_NUP : Set_NUP_Type := null)
+ Set_RND : Set_RND_Type := null)
is
Text : Source_Buffer_Ptr;
Hi : Source_Ptr;
@@ -184,10 +181,7 @@ package body Targparm is
Source_Last => Hi,
Make_Id => Make_Id,
Make_SC => Make_SC,
- Set_NOD => Set_NOD,
- Set_NSA => Set_NSA,
- Set_NUA => Set_NUA,
- Set_NUP => Set_NUP);
+ Set_RND => Set_RND);
end Get_Target_Parameters;
-- Version where caller supplies system.ads text
@@ -198,10 +192,7 @@ package body Targparm is
Source_Last : Source_Ptr;
Make_Id : Make_Id_Type := null;
Make_SC : Make_SC_Type := null;
- Set_NOD : Set_NOD_Type := null;
- Set_NSA : Set_NSA_Type := null;
- Set_NUA : Set_NUA_Type := null;
- Set_NUP : Set_NUP_Type := null)
+ Set_RND : Set_RND_Type := null)
is
P : Source_Ptr;
-- Scans source buffer containing source of system.ads
@@ -212,48 +203,6 @@ package body Targparm is
Result : Boolean;
-- Records boolean from system line
- OK : Boolean;
- -- Status result from Set_NUP/NSA/NUA call
-
- PR_Start : Source_Ptr;
- -- Pointer to ( following pragma Restrictions
-
- procedure Collect_Name;
- -- Scan a name starting at System_Text (P), and put Name in Name_Buffer,
- -- with Name_Len being length, folded to lower case. On return, P points
- -- just past the last character (which should be a right paren).
-
- ------------------
- -- Collect_Name --
- ------------------
-
- procedure Collect_Name is
- begin
- Name_Len := 0;
- loop
- if System_Text (P) in 'a' .. 'z'
- or else
- System_Text (P) = '_'
- or else
- System_Text (P) in '0' .. '9'
- then
- Name_Buffer (Name_Len + 1) := System_Text (P);
-
- elsif System_Text (P) in 'A' .. 'Z' then
- Name_Buffer (Name_Len + 1) :=
- Character'Val (Character'Pos (System_Text (P)) + 32);
-
- else
- exit;
- end if;
-
- P := P + 1;
- Name_Len := Name_Len + 1;
- end loop;
- end Collect_Name;
-
- -- Start of processing for Get_Target_Parameters
-
begin
if Parameters_Obtained then
return;
@@ -312,9 +261,6 @@ package body Targparm is
elsif System_Text (P .. P + 20) = "pragma Restrictions (" then
P := P + 21;
- PR_Start := P - 1;
-
- -- Boolean restrictions
Rloop : for K in All_Boolean_Restrictions loop
declare
@@ -339,9 +285,7 @@ package body Targparm is
null;
end loop Rloop;
- -- Restrictions taking integer parameter
-
- Ploop : for K in Integer_Parameter_Restrictions loop
+ Ploop : for K in All_Parameter_Restrictions loop
declare
Rname : constant String :=
All_Parameter_Restrictions'Image (K);
@@ -456,119 +400,23 @@ package body Targparm is
P := P + 1;
end loop;
- Set_NOD (Unit);
+ Set_RND (Unit);
goto Line_Loop_Continue;
end;
-
- -- No_Specification_Of_Aspect case
-
- elsif System_Text (P .. P + 29) = "No_Specification_Of_Aspect => "
- then
- P := P + 30;
-
- -- Skip this processing (and simply ignore the pragma), if
- -- caller did not supply the subprogram we need to process
- -- such lines.
-
- if Set_NSA = null then
- goto Line_Loop_Continue;
- end if;
-
- -- We have scanned
- -- "pragma Restrictions (No_Specification_Of_Aspect =>"
-
- Collect_Name;
-
- if System_Text (P) /= ')' then
- goto Bad_Restrictions_Pragma;
-
- else
- Set_NSA (Name_Find, OK);
-
- if OK then
- goto Line_Loop_Continue;
- else
- goto Bad_Restrictions_Pragma;
- end if;
- end if;
-
- -- No_Use_Of_Attribute case
-
- elsif System_Text (P .. P + 22) = "No_Use_Of_Attribute => " then
- P := P + 23;
-
- -- Skip this processing (and simply ignore No_Use_Of_Attribute
- -- lines) if caller did not supply the subprogram we need to
- -- process such lines.
-
- if Set_NUA = null then
- goto Line_Loop_Continue;
- end if;
-
- -- We have scanned
- -- "pragma Restrictions (No_Use_Of_Attribute =>"
-
- Collect_Name;
-
- if System_Text (P) /= ')' then
- goto Bad_Restrictions_Pragma;
-
- else
- Set_NUA (Name_Find, OK);
-
- if OK then
- goto Line_Loop_Continue;
- else
- goto Bad_Restrictions_Pragma;
- end if;
- end if;
-
- -- No_Use_Of_Pragma case
-
- elsif System_Text (P .. P + 19) = "No_Use_Of_Pragma => " then
- P := P + 20;
-
- -- Skip this processing (and simply ignore No_Use_Of_Pragma
- -- lines) if caller did not supply the subprogram we need to
- -- process such lines.
-
- if Set_NUP = null then
- goto Line_Loop_Continue;
- end if;
-
- -- We have scanned
- -- "pragma Restrictions (No_Use_Of_Pragma =>"
-
- Collect_Name;
-
- if System_Text (P) /= ')' then
- goto Bad_Restrictions_Pragma;
-
- else
- Set_NUP (Name_Find, OK);
-
- if OK then
- goto Line_Loop_Continue;
- else
- goto Bad_Restrictions_Pragma;
- end if;
- end if;
end if;
-- Here if unrecognizable restrictions pragma form
- <<Bad_Restrictions_Pragma>>
-
Set_Standard_Error;
Write_Line
("fatal error: system.ads is incorrectly formatted");
Write_Str ("unrecognized or incorrect restrictions pragma: ");
- P := PR_Start;
+ while System_Text (P) /= ')'
+ and then
+ System_Text (P) /= ASCII.LF
loop
- exit when System_Text (P) = ASCII.LF;
Write_Char (System_Text (P));
- exit when System_Text (P) = ')';
P := P + 1;
end loop;

View file

@ -1,26 +0,0 @@
--- gprbuild.gpr.orig 2014-04-17 09:50:17.000000000 +0000
+++ gprbuild.gpr
@@ -1,4 +1,5 @@
with "xmlada";
+with "gnat_util";
project Gprbuild is
type OS_Type is ("unix", "avms", "ivms", "Windows_NT");
@@ -24,7 +25,7 @@ project Gprbuild is
"gprinstall-main.adb",
"gprslave.adb");
- for Source_Dirs use ("src", "gnat");
+ for Source_Dirs use ("src");
case Build_Tool is
when "gprbuild" =>
@@ -173,8 +174,6 @@ project Gprbuild is
when "unix" | "Windows_NT" =>
for Body ("gprlib.build_shared_lib")
use "gprlib-build_shared_lib-nosymbols.adb";
- for Body ("mlib.tgt.specific")
- use "mlib-tgt-specific.adb";
when "avms" =>
for Body ("gprlib.build_shared_lib")
use "gprlib-build_shared_lib-vms.adb";

View file

@ -1,6 +1,6 @@
--- share/gprconfig/compilers.xml.orig 2014-03-21 10:41:06.000000000 +0000
--- share/gprconfig/compilers.xml.orig 2015-04-28 15:02:41 UTC
+++ share/gprconfig/compilers.xml
@@ -657,16 +657,15 @@
@@ -693,17 +693,15 @@
</version>
<languages>Ada</languages>
<variable name="gcc_version">
@ -12,8 +12,9 @@
- <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
- <directory group="default" contents="^rts-">\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory>
- <directory group="2" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory>
- <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
+ <directory group="default">\.\./lib/gcc/$TARGET/$gcc_version/adalib</directory>
+ <directory group="0">@AUXPREFIX@/lib/gcc/$TARGET/$gcc_version/adalib</directory>
+ <directory group="0">/usr/local/gcc5-aux/lib/gcc/$TARGET/$gcc_version/adalib</directory>
</runtimes>
<target>
- <external>${PREFIX}gcc -dumpmachine</external>

View file

@ -1,11 +1,11 @@
--- share/gprconfig/gnat.xml.orig 2013-09-16 15:29:28.000000000 +0000
--- share/gprconfig/gnat.xml.orig 2014-10-13 22:03:37 UTC
+++ share/gprconfig/gnat.xml
@@ -63,7 +63,7 @@
</config>
</configuration>
- <!-- GNAT -->
+ <!-- GNAT (tailored to lang/gcc-aux) -->
+ <!-- GNAT (tailored to lang/gcc5-aux) -->
<configuration>
&filter_gnat;
<config>

View file

@ -1,6 +1,6 @@
--- share/gprconfig/linker.xml.orig 2014-02-13 04:59:56.000000000 +0000
--- share/gprconfig/linker.xml.orig 2015-04-28 14:21:56 UTC
+++ share/gprconfig/linker.xml
@@ -599,11 +599,14 @@
@@ -687,11 +687,14 @@
</config>
</configuration>
@ -16,7 +16,7 @@
<target name="^.*irix.*$" />
</targets>
<config>
@@ -675,10 +678,13 @@
@@ -763,10 +766,13 @@
</config>
</configuration>
@ -31,7 +31,7 @@
</targets>
<config>
for Run_Path_Option use ("-Wl,-rpath,");
@@ -1181,6 +1187,12 @@
@@ -1308,6 +1314,12 @@
<target name="^.*mingw.*$" />
<target name="^.*linux.*$" />
<target name="^.*freebsd.*$" />
@ -44,7 +44,7 @@
</targets>
<compilers negate="true">
<compiler language="C++" />
@@ -1265,6 +1277,9 @@
@@ -1392,6 +1404,9 @@
<target name="^.*mingw.*$" />
<target name="^.*linux.*$" />
<target name="^.*freebsd.*$" />

View file

@ -1,4 +1,4 @@
--- share/gprconfig/targetset.xml.orig 2014-02-13 04:59:56.000000000 +0000
--- share/gprconfig/targetset.xml.orig 2014-09-11 13:36:47 UTC
+++ share/gprconfig/targetset.xml
@@ -66,8 +66,8 @@
@ -11,7 +11,7 @@
</targetset>
<!-- x86-windows (mingw) -->
@@ -156,19 +156,34 @@
@@ -162,19 +162,34 @@
<target>pent.*-cygwin.*</target>
</targetset>

View file

@ -1,4 +1,4 @@
--- src/gpr_version.adb.orig 2014-04-17 09:50:17.000000000 +0000
--- src/gpr_version.adb.orig 2015-05-06 11:08:38 UTC
+++ src/gpr_version.adb
@@ -65,14 +65,7 @@ package body GPR_Version is
end if;

View file

@ -1,14 +0,0 @@
FSF GNAT 4.9 doesn't have the mode setting capability in Set_Executable
procedure. At least GPRBuild 2012 didn't use it.
--- src/gprinstall-install.adb.orig 2014-04-17 09:50:17.000000000 +0000
+++ src/gprinstall-install.adb
@@ -723,7 +723,7 @@ package body Gprinstall.Install is
if Executable then
Set_Executable
- (Dest_Filename, Mode => S_Owner + S_Group + S_Others);
+ (Dest_Filename);
end if;
-- Add file to manifest

View file

@ -1,9 +1,6 @@
The brain-dead handling of Rpath continues in GPRBuild 2014
Bring in the GPRBuild 2012/2013 fix again
--- src/gprlib.adb.orig 2014-04-17 09:50:17.000000000 +0000
--- src/gprlib.adb.orig 2015-05-06 11:08:38 UTC
+++ src/gprlib.adb
@@ -408,6 +408,11 @@ procedure Gprlib is
@@ -393,6 +393,11 @@ procedure Gprlib is
Separate_Run_Path_Options : Boolean := False;
@ -15,7 +12,7 @@ Bring in the GPRBuild 2012/2013 fix again
Rpath : String_List_Access := null;
-- Allocated only if Path Option is supported
@@ -1040,7 +1045,12 @@ begin
@@ -1011,7 +1016,12 @@ begin
Use_GNAT_Lib := False;
end if;
@ -29,7 +26,20 @@ Bring in the GPRBuild 2012/2013 fix again
when Gprexch.Library_Rpath_Options =>
Library_Rpath_Options_Table.Append
@@ -2166,7 +2176,7 @@ begin
@@ -1143,10 +1153,10 @@ begin
Libgnat :=
new String'
- ("-lgnat-" & Line (6 .. Last));
+ ("-lgnat-" & Line (6));
Libgnarl :=
new String'
- ("-lgnarl-" & Line (6 .. Last));
+ ("-lgnarl-" & Line (6));
end if;
else
@@ -2113,7 +2123,7 @@ begin
Library_Switches_Table.Append
(new String'("-L" & Imported_Library_Directories.Table (J).all));

View file

@ -14,6 +14,7 @@ share/gprconfig/cpp.xml
share/gprconfig/cross.xml
share/gprconfig/fortran.xml
share/gprconfig/gnat.xml
share/gprconfig/gnat_runtime.mapping
share/gprconfig/gprconfig.xsd
share/gprconfig/linker.xml
share/gprconfig/nocompiler.xml

View file

@ -3,7 +3,7 @@
PORTNAME= libsigscan
# If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
DISTVERSION= experimental-20150125
DISTVERSION= experimental-20150627
CATEGORIES= devel
MASTER_SITES= https://github.com/libyal/libsigscan/releases/download/${PORTVERSION:E}/ \
LOCAL/antoine

Some files were not shown because too many files have changed in this diff Show more