From 109269205e521bb1d2d87678a391e5adefff88d6 Mon Sep 17 00:00:00 2001 From: Gabor Pali Date: Tue, 4 Jun 2013 18:53:40 +0000 Subject: - Update The Glorious Glasgow Haskell Compiler to version 7.6.3 - Update Haskell Platform to version 2013.2.0.0 Please note that port revisions for all the Haskell ports without version changes are bumped. Some highlights of the update: - Fix PDF generation for pandoc [1] - From now on, PREFIX/{lib,share,share/doc}/cabal/ghc-GHC_VERSION are used for hs- ports (Cabal packages) as prefixes to avoid problems when upgrading with portmaster(8) [2] - Experimental support for LLVM-based code generation (disabled by default) - Many simplifications, refactoring in bsd.cabal.mk New ports (11): devel/hs-asn1-types 0.1.3 devel/hs-data-default-class 0.0.1 devel/hs-data-default-instances-base 0.0.1 devel/hs-data-default-instances-containers 0.0.1 devel/hs-data-default-instances-dlist 0.0.1 devel/hs-data-default-instances-old-locale 0.0.1 devel/hs-extensible-exceptions 0.1.1.4 devel/hs-mmorph 1.0.0 devel/hs-quickcheck-io 0.1.0 x11-toolkits/hs-GLURaw 1.3.0.0 x11-toolkits/hs-OpenGLRaw 1.3.0.0 Updated ports (104): archivers/hs-zlib 0.5.4.0_1 --> 0.5.4.1 databases/hs-persistent 1.1.5.1 --> 1.2.0.1 databases/hs-persistent-sqlite 1.1.5 --> 1.2.0 databases/hs-persistent-template 1.1.2.4 --> 1.2.0 devel/hs-HUnit 1.2.5.1_1 --> 1.2.5.2 devel/hs-IORefCAS 0.2_3 --> 0.2.0.1 devel/hs-MonadRandom 0.1.8 --> 0.1.9 devel/hs-QuickCheck 2.5.1.1_1 --> 2.6 devel/hs-abstract-deque 0.1.6_1 --> 0.2 devel/hs-alex 3.0.2_1 --> 3.0.5 devel/hs-async 2.0.1.3_1 --> 2.0.1.4 devel/hs-basic-prelude 0.3.4.0 --> 0.3.5.0 devel/hs-blaze-builder 0.3.1.0_4 --> 0.3.1.1 devel/hs-byteorder 1.0.3_4 --> 1.0.4 devel/hs-cabal-install 0.14.0_4 --> 1.16.0.2 devel/hs-classy-prelude 0.5.3 --> 0.5.7 devel/hs-cmdargs 0.10.2 --> 0.10.3 devel/hs-conduit 1.0.2 --> 1.0.5 devel/hs-data-default 0.5.0_1 --> 0.5.3 devel/hs-fsnotify 0.0.6 --> 0.0.11 devel/hs-generic-deriving 1.4.0 --> 1.5.0 devel/hs-git-annex 4.20130323_1 --> 4.20130601 devel/hs-haddock 2.11.0_1 --> 2.13.2 devel/hs-hashable 1.2.0.5 --> 1.1.2.5,1 devel/hs-hlint 1.8.43 --> 1.8.45 devel/hs-hspec 1.4.4 --> 1.5.4 devel/hs-hspec-expectations 0.3.0.3_1 --> 0.3.2 devel/hs-largeword 1.0.4 --> 1.0.5 devel/hs-lens 3.8.7.3 --> 3.9.0.2 devel/hs-lifted-base 0.2.0.2 --> 0.2.0.5 devel/hs-monad-control 0.3.1.4_1 --> 0.3.2.1 devel/hs-monad-logger 0.3.0.1 --> 0.3.1.1 devel/hs-monad-par 0.3.4.1 --> 0.3.4.2 devel/hs-pool-conduit 0.1.1_1 --> 0.1.2 devel/hs-profunctors 3.3 --> 3.3.0.1 devel/hs-reflection 1.1.7 --> 1.3.2 devel/hs-resourcet 0.4.5 --> 0.4.7.1 devel/hs-show 0.5 --> 0.6 devel/hs-split 0.2.1.1_1 --> 0.2.2 devel/hs-stm 2.4_1 --> 2.4.2 devel/hs-syb 0.3.7_1 --> 0.4.0 devel/hs-tagged 0.4.4_1 --> 0.6 devel/hs-text 0.11.2.3_1 --> 0.11.3.1 devel/hs-unix-compat 0.4.1.0 --> 0.4.1.1 devel/hs-unix-time 0.1.5 --> 0.1.8 devel/hs-unordered-containers 0.2.3.0 --> 0.2.3.1 devel/hs-utility-ht 0.0.8_3 --> 0.0.9 devel/hs-uuagc 0.9.42.2_3 --> 0.9.42.3 devel/hs-uuid 1.2.9 --> 1.2.13 devel/hs-void 0.5.11 --> 0.6 math/hs-NumInstances 1.2 --> 1.3 math/hs-comonad-transformers 3.0.1_1 --> 3.0.2 math/hs-semigroups 0.9 --> 0.9.1 math/hs-statistics 0.10.2.0_2 --> 0.10.3.1 net/hs-network 2.3.1.0_1 --> 2.4.1.2 net/hs-publicsuffixlist 0.0.3 --> 0.1 net/hs-socks 0.5.0 --> 0.5.1 security/hs-certificate 1.3.5_1 --> 1.3.7 security/hs-cipher-aes 0.1.7 --> 0.1.8 security/hs-clientsession 0.8.1_1 --> 0.9 security/hs-crypto-api 0.11 --> 0.12.1 security/hs-crypto-conduit 0.5.0 --> 0.5.2 security/hs-crypto-pubkey 0.1.2_1 --> 0.1.3 security/hs-crypto-pubkey-types 0.2.0_1 --> 0.3.2 security/hs-cryptocipher 0.4.0_1 --> 0.5.0 security/hs-cryptohash 0.8.3_1 --> 0.9.0 security/hs-skein 0.1.0.12 --> 1.0.3 textproc/hs-HaXml 1.23.3_2 --> 1.24 textproc/hs-attoparsec-conduit 1.0.0 --> 1.0.1 textproc/hs-blaze-html 0.6.0.0 --> 0.6.1.1 textproc/hs-blaze-markup 0.5.1.4 --> 0.5.1.5 textproc/hs-case-insensitive 1.0 --> 1.0.0.2 textproc/hs-highlighting-kate 0.5.3.8 --> 0.5.3.9 textproc/hs-hs-bibutils 4.17 --> 5.0 textproc/hs-polyparse 1.8_3 --> 1.9 textproc/hs-texmath 0.6.1.3 --> 0.6.1.5 textproc/hs-xml 1.3.12_4 --> 1.3.13 textproc/hs-yaml 0.8.2.3 --> 0.8.2.4 www/hs-HTTP 4000.2.5_1 --> 4000.2.8 www/hs-cgi 3001.1.7.4_6,1 --> 3001.1.7.5,1 www/hs-hamlet 1.1.6.3 --> 1.1.7.1 www/hs-happstack-server 7.1.7 --> 7.1.7.1 www/hs-heist 0.11.1 --> 0.12.0 www/hs-http-conduit 1.9.0 --> 1.9.3 www/hs-http-reverse-proxy 0.1.1.3 --> 0.1.1.6 www/hs-shakespeare 1.0.3.1 --> 1.0.5 www/hs-shakespeare-css 1.0.3 --> 1.0.5.1 www/hs-shakespeare-js 1.1.2.1 --> 1.1.4 www/hs-snap 0.11.2 --> 0.12.0 www/hs-wai-extra 1.3.2.4 --> 1.3.4 www/hs-wai-test 1.3.0.4 --> 1.3.1 www/hs-warp 1.3.7.4 --> 1.3.8.1 www/hs-yesod 1.1.9.2 --> 1.2.0.1 www/hs-yesod-auth 1.1.5.3 --> 1.2.0 www/hs-yesod-core 1.1.8.2 --> 1.2.0.4 www/hs-yesod-form 1.2.1.3 --> 1.3.0 www/hs-yesod-persistent 1.1.0.1_1 --> 1.2.0 www/hs-yesod-platform 1.1.8 --> 1.2.0.1 www/hs-yesod-routes 1.1.2 --> 1.2.0 www/hs-yesod-static 1.1.2.2 --> 1.2.0 www/hs-yesod-test 0.3.5 --> 1.2.0 x11-toolkits/hs-GLUT 2.1.2.1_7,1 --> 2.4.0.0,1 x11-toolkits/hs-OpenGL 2.2.3.1_4,1 --> 2.8.0.0,1 x11/hs-xmobar 0.16_2 --> 0.17 Removed ports (2): www/hs-yesod-default 1.1.3.2 www/hs-yesod-json 1.1.2.1 PR: ports/179146 [1] Requested by: Omar Thameen [1] Reported by: sperber, bapt [2] Tested by: sperber [2] Obtained from: FreeBSD Haskell --- textproc/bibutils/Makefile | 22 ++++++------- textproc/bibutils/distinfo | 4 +-- textproc/bibutils/files/patch-Makefile_start | 36 ---------------------- textproc/bibutils/files/patch-bin__Makefile | 11 ------- .../bibutils/files/patch-bin__Makefile.dynamic | 11 ------- textproc/bibutils/files/patch-bin__Makefile.static | 11 ------- textproc/bibutils/files/patch-configure | 24 +++++++-------- textproc/bibutils/files/patch-lib__Makefile.static | 24 --------------- textproc/bibutils/pkg-descr | 2 +- textproc/bibutils/pkg-plist | 19 ------------ 10 files changed, 25 insertions(+), 139 deletions(-) delete mode 100644 textproc/bibutils/files/patch-Makefile_start delete mode 100644 textproc/bibutils/files/patch-bin__Makefile delete mode 100644 textproc/bibutils/files/patch-bin__Makefile.dynamic delete mode 100644 textproc/bibutils/files/patch-bin__Makefile.static delete mode 100644 textproc/bibutils/files/patch-lib__Makefile.static delete mode 100644 textproc/bibutils/pkg-plist (limited to 'textproc/bibutils') diff --git a/textproc/bibutils/Makefile b/textproc/bibutils/Makefile index 5758c4edfabf..2ebe1c9a1de0 100644 --- a/textproc/bibutils/Makefile +++ b/textproc/bibutils/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: bibutils -# Date created: May 14, 2010 -# Whom: Gabor Pali -# # $FreeBSD$ -# PORTNAME= bibutils -PORTVERSION= 4.12 +PORTVERSION= 5.0 CATEGORIES= textproc -MASTER_SITES= http://www.scripps.edu/~cdputnam/software/bibutils/ +MASTER_SITES= SF/${PORTNAME}/ + DISTNAME= ${PORTNAME}_${PORTVERSION}_src EXTRACT_SUFX= .tgz @@ -21,14 +17,18 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} -post-patch: - @${REINPLACE_CMD} 's|make |gmake |g' \ - ${WRKSRC}/Makefile_start - do-configure: @cd ${WRKSRC} && ./configure --install-dir ${PREFIX}/bin test: all cd ${WRKSRC}/test && ${GMAKE} all test +BINARIES= bib2xml biblatex2xml copac2xml ebi2xml end2xml endx2xml \ + isi2xml med2xml modsclean ris2xml wordbib2xml xml2ads \ + xml2bib xml2end xml2isi xml2ris xml2wordbib + +.for binary in ${BINARIES} +PLIST_FILES+= bin/${binary} +.endfor + .include diff --git a/textproc/bibutils/distinfo b/textproc/bibutils/distinfo index 0665ded962fb..e4ee4a233c59 100644 --- a/textproc/bibutils/distinfo +++ b/textproc/bibutils/distinfo @@ -1,2 +1,2 @@ -SHA256 (bibutils_4.12_src.tgz) = 2b19875f9a525350e0a7ca5f3b95a1408fb3530fac11276d42e0b2e6c0dfe648 -SIZE (bibutils_4.12_src.tgz) = 816430 +SHA256 (bibutils_5.0_src.tgz) = 0a3f1dfc8f3ee98c2f6507e68358678fe355c5a3b3d0157dcab5d4fa2e6c662b +SIZE (bibutils_5.0_src.tgz) = 458532 diff --git a/textproc/bibutils/files/patch-Makefile_start b/textproc/bibutils/files/patch-Makefile_start deleted file mode 100644 index 9403ddd7000e..000000000000 --- a/textproc/bibutils/files/patch-Makefile_start +++ /dev/null @@ -1,36 +0,0 @@ ---- ./Makefile_start.orig 2010-10-10 19:42:50.000000000 +0200 -+++ ./Makefile_start 2011-07-31 01:06:08.000000000 +0200 -@@ -1,6 +1,6 @@ - POSTFIX=REPLACE_POSTFIX --CC = REPLACE_CC --RANLIB=REPLACE_RANLIB -+%%SET_CC%% -+%%SET_RANLIB%% - INSTALLDIR=REPLACE_INSTALLDIR - LIBINSTALLDIR=REPLACE_LIBINSTALLDIR - -@@ -12,8 +12,8 @@ - xml2ads xml2bib xml2end xml2isi xml2ris xml2wordbib modsclean - - all : FORCE -- cd lib; make -k $(CC) -k $(RANLIB); cd .. -- cd bin; make -k $(CC) -k VERSION="$(VERSION)" -k DATE="$(DATE)"; cd .. -+ cd lib; make ; cd .. -+ cd bin; make VERSION="$(VERSION)" DATE="$(DATE)"; cd .. - - clean: FORCE - cd lib ; make clean ; cd .. -@@ -31,11 +31,12 @@ - cd bin ; make test; cd .. - - install: all FORCE -- cd lib ; make -k LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd .. -+ cd lib ; make LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd .. - sed 's/VERSION/${VERSION}/g' packageconfig_start > lib/bibutils.pc - @for p in ${PROGRAMS}; \ - do ( cp bin/$$p ${INSTALLDIR}/$$p ); \ - done -+ cp lib/libbibutils.a ${INSTALLDIR}/../lib - - package: all FORCE - csh -f maketgz.csh ${VERSION} ${POSTFIX} diff --git a/textproc/bibutils/files/patch-bin__Makefile b/textproc/bibutils/files/patch-bin__Makefile deleted file mode 100644 index 041aa21928e5..000000000000 --- a/textproc/bibutils/files/patch-bin__Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ./bin/Makefile.orig 2010-10-10 19:49:05.000000000 +0200 -+++ ./bin/Makefile 2011-07-31 01:05:18.000000000 +0200 -@@ -2,7 +2,7 @@ - # bibutils converters MAKEFILE - # - --CFLAGS = -I ../lib -+CFLAGS += -I ../lib - LIBDIR = -L../lib - - TOMODS = bibprog.o tomods.o args.o ../lib/modsout.o diff --git a/textproc/bibutils/files/patch-bin__Makefile.dynamic b/textproc/bibutils/files/patch-bin__Makefile.dynamic deleted file mode 100644 index fafe20bac3d2..000000000000 --- a/textproc/bibutils/files/patch-bin__Makefile.dynamic +++ /dev/null @@ -1,11 +0,0 @@ ---- ./bin/Makefile.dynamic.orig 2010-10-10 19:07:17.000000000 +0200 -+++ ./bin/Makefile.dynamic 2011-07-31 01:05:18.000000000 +0200 -@@ -4,7 +4,7 @@ - # dynamic linkage version - # - --CFLAGS = -I ../lib -+CFLAGS += -I ../lib - LDFLAGS = -L ../lib - LDLIBS = -lbibutils - diff --git a/textproc/bibutils/files/patch-bin__Makefile.static b/textproc/bibutils/files/patch-bin__Makefile.static deleted file mode 100644 index ab69b1a81e23..000000000000 --- a/textproc/bibutils/files/patch-bin__Makefile.static +++ /dev/null @@ -1,11 +0,0 @@ ---- ./bin/Makefile.static.orig 2010-10-08 01:57:09.000000000 +0200 -+++ ./bin/Makefile.static 2011-07-31 01:05:18.000000000 +0200 -@@ -2,7 +2,7 @@ - # bibutils converters MAKEFILE - # - --CFLAGS = -I ../lib -+CFLAGS += -I ../lib - LIBDIR = -L../lib - - TOMODS = bibprog.o tomods.o args.o ../lib/modsout.o diff --git a/textproc/bibutils/files/patch-configure b/textproc/bibutils/files/patch-configure index 8de3874cff3d..c0b5f708301b 100644 --- a/textproc/bibutils/files/patch-configure +++ b/textproc/bibutils/files/patch-configure @@ -1,13 +1,11 @@ ---- ./configure.orig 2010-10-10 19:38:32.000000000 +0200 -+++ ./configure 2011-07-31 01:05:18.000000000 +0200 -@@ -153,8 +153,8 @@ - endif - - cat $INPUT_FILE | \ --sed "s/REPLACE_CC/CC=${CC}/" | \ --sed "s/REPLACE_RANLIB/RANLIB=${RANLIB}/" | \ -+sed "s/%%SET_CC%%/CC?=${CC}/" | \ -+sed "s/%%SET_RANLIB%%/RANLIB?=${RANLIB}/" | \ - sed "s|REPLACE_INSTALLDIR|${INSTALLDIR}|" | \ - sed "s|REPLACE_LIBINSTALLDIR|${LIBINSTALLDIR}|" | \ - sed "s/REPLACE_POSTFIX/${POSTFIX}/" > $OUTPUT_FILE +--- ./configure.orig 2013-05-28 07:21:47.000000000 +0200 ++++ ./configure 2013-06-03 01:00:10.000000000 +0200 +@@ -247,7 +247,7 @@ + RANLIB='ranlib' + POSTFIX='_netbsd' + elif [ "$type" = "FreeBSD" ] ; then +- CC='gcc' ++ CC='cc' + CFLAGS='-Wall' + if [ "$LIBTYPE" = "dynamic" ] ; then + CLIBFLAGS='-Wall -fPIC' diff --git a/textproc/bibutils/files/patch-lib__Makefile.static b/textproc/bibutils/files/patch-lib__Makefile.static deleted file mode 100644 index b37dfc308f13..000000000000 --- a/textproc/bibutils/files/patch-lib__Makefile.static +++ /dev/null @@ -1,24 +0,0 @@ ---- ./lib/Makefile.static.orig 2010-10-08 01:57:00.000000000 +0200 -+++ ./lib/Makefile.static 2011-07-31 01:05:18.000000000 +0200 -@@ -1,5 +1,5 @@ - #CC = gcc -Wall --RANLIB = echo -+#RANLIB = echo - - SIMPLE_OBJS = is_ws.o strsearch.o charsets.o - -@@ -31,12 +31,10 @@ - all: libbibcore.a libbibutils.a - - libbibcore.a: $(BIBCORE_OBJS) -- ar -cr $@ $^ -- $(RANLIB) $@ -+ $(AR) -cr $@ $^ - - libbibutils.a: $(BIBUTILS_OBJS) -- ar -cr $@ $^ -- $(RANLIB) $@ -+ $(AR) -cr $@ $^ - - clean: - /bin/rm -f *.o core diff --git a/textproc/bibutils/pkg-descr b/textproc/bibutils/pkg-descr index 7aa3e4f84efd..b91ce0091214 100644 --- a/textproc/bibutils/pkg-descr +++ b/textproc/bibutils/pkg-descr @@ -5,4 +5,4 @@ RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N^2-N. These programs operate on the command line and are styled after standard UNIX-like filters. -WWW: http://www.scripps.edu/~cdputnam/software/bibutils/ +WWW: http://sourceforge.net/p/bibutils/home/Bibutils/ diff --git a/textproc/bibutils/pkg-plist b/textproc/bibutils/pkg-plist deleted file mode 100644 index 3813820ebbd6..000000000000 --- a/textproc/bibutils/pkg-plist +++ /dev/null @@ -1,19 +0,0 @@ -@comment $FreeBSD$ -bin/bib2xml -bin/biblatex2xml -bin/copac2xml -bin/ebi2xml -bin/end2xml -bin/endx2xml -bin/isi2xml -bin/med2xml -bin/modsclean -bin/ris2xml -bin/wordbib2xml -bin/xml2ads -bin/xml2bib -bin/xml2end -bin/xml2isi -bin/xml2ris -bin/xml2wordbib -lib/libbibutils.a -- cgit v1.2.3