mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-04 01:48:54 +00:00
- The maintainer changed => upstream is now on GitHub;
- Upgrade to v0.9.1; - Really install the shared library with a soname.
This commit is contained in:
parent
7789398d16
commit
3e3f1282b8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=569109
@ -1,26 +1,26 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= frobby
|
||||
PORTVERSION= 0.9.1
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 0.9.0
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= http://www.broune.com/frobby/
|
||||
DISTNAME= ${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= Software system and project for computations with monomial ideals
|
||||
|
||||
LICENSE= GPLv2+
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
LIB_DEPENDS= libgmp.so:math/gmp
|
||||
|
||||
USES= gmake shebangfix
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= Macaulay2
|
||||
|
||||
BINARY_ALIAS= make=gmake
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
SHEBANG_FILES= test/testScripts/* \
|
||||
SHEBANG_FILES= test/testScripts/* test/runTests test/runSplitTests \
|
||||
test/latticeFormats/runtest*
|
||||
|
||||
OPTIONS_DEFINE= EXEDOCS LIBDOCS TEST
|
||||
@ -42,6 +42,7 @@ TEST_BUILD_DEPENDS= bash:shells/bash
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
MAKE_ARGS+= GMP_INC_DIR=${LOCALBASE}/include
|
||||
MAKE_ENV= RANLIB=${RANLIB}
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
@ -80,7 +81,9 @@ do-install-EXECUTABLE-on:
|
||||
|
||||
do-install-SHARED-on:
|
||||
${INSTALL_DATA} ${WRKSRC}/src/frobby.h ${STAGEDIR}${PREFIX}/include
|
||||
${INSTALL_DATA} ${WRKSRC}/bin/libfrobby.so ${STAGEDIR}${PREFIX}/lib
|
||||
${INSTALL_DATA} ${WRKSRC}/bin/libfrobby.so ${STAGEDIR}${PREFIX}/lib/libfrobby.so.0
|
||||
cd ${STAGEDIR}${PREFIX}/lib && \
|
||||
${LN} -sf libfrobby.so.0 ${STAGEDIR}${PREFIX}/lib/libfrobby.so
|
||||
|
||||
do-install-STATIC-on:
|
||||
${INSTALL_DATA} ${WRKSRC}/src/frobby.h ${STAGEDIR}${PREFIX}/include
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1535898606
|
||||
SHA256 (frobby_v0.9.0.tar.gz) = af092383e6dc849c86f4e79747ae0e5cd309a690747230e10aa38d60640062df
|
||||
SIZE (frobby_v0.9.0.tar.gz) = 852524
|
||||
TIMESTAMP = 1616580213
|
||||
SHA256 (Macaulay2-frobby-v0.9.1_GH0.tar.gz) = 4bd699ff009973bc2d209ec9abdee33ef09e11de83914046fcc4ce68e7cc25b5
|
||||
SIZE (Macaulay2-frobby-v0.9.1_GH0.tar.gz) = 875167
|
||||
|
@ -1,26 +1,35 @@
|
||||
--- Makefile.orig 2011-09-23 20:09:12 UTC
|
||||
--- Makefile.orig 2020-06-16 11:03:34 UTC
|
||||
+++ Makefile
|
||||
@@ -87,7 +87,6 @@ endif
|
||||
@@ -86,7 +86,6 @@ endif
|
||||
MATCH=false
|
||||
ifeq ($(MODE), release)
|
||||
outdir = bin/release/
|
||||
- cflags += -O2
|
||||
- cxxflags += -O2
|
||||
MATCH=true
|
||||
endif
|
||||
ifeq ($(MODE), debug)
|
||||
@@ -99,13 +98,13 @@ ifeq ($(MODE), debug)
|
||||
@@ -98,13 +97,13 @@ ifeq ($(MODE), debug)
|
||||
endif
|
||||
ifeq ($(MODE), shared)
|
||||
outdir = bin/shared/
|
||||
- cflags += -O2 -fPIC
|
||||
+ cflags += -fPIC
|
||||
- cxxflags += -O2 -fPIC
|
||||
+ cxxflags += -fPIC
|
||||
library = libfrobby.so
|
||||
MATCH=true
|
||||
endif
|
||||
ifeq ($(MODE), profile)
|
||||
outdir = bin/profile/
|
||||
- cflags += -g -pg -O2 -D PROFILE
|
||||
+ cflags += -g -pg -D PROFILE
|
||||
- cxxflags += -g -pg -O2 -D PROFILE
|
||||
+ cxxflags += -g -pg -D PROFILE
|
||||
ldflags += -pg
|
||||
MATCH=true
|
||||
benchArgs = _profile $(FROBBYARGS)
|
||||
@@ -212,7 +211,7 @@ library: bin/$(library)
|
||||
bin/$(library): $(objs) | bin/
|
||||
rm -f bin/$(library)
|
||||
ifeq ($(MODE), shared)
|
||||
- $(CXX) -shared -o bin/$(library) $(ldflags) \
|
||||
+ $(CXX) -shared -Wl,-soname,$(library) -o bin/$(library) $(ldflags) \
|
||||
$(patsubst $(outdir)main.o,,$(objs))
|
||||
else
|
||||
ar crs bin/$(library) $(patsubst $(outdir)main.o,,$(objs))
|
||||
|
@ -1,58 +0,0 @@
|
||||
--- src/HashMap.h.orig 2018-09-05 21:12:33 UTC
|
||||
+++ src/HashMap.h
|
||||
@@ -34,55 +34,10 @@
|
||||
template<class Key>
|
||||
class FrobbyHash {};
|
||||
|
||||
-// *********************************************************
|
||||
-#ifdef __GNUC__ // Only GCC defines this macro
|
||||
-#include "hash_map/hash_map"
|
||||
-#include <string>
|
||||
-
|
||||
-template<>
|
||||
-class FrobbyHash<string> : public __gnu_cxx::hash<string> {
|
||||
-};
|
||||
-
|
||||
-template<class Key, class Value>
|
||||
-class HashMap : public __gnu_cxx::hash_map<Key, Value,
|
||||
- FrobbyHash<Key> > {
|
||||
-};
|
||||
-
|
||||
-#else
|
||||
-
|
||||
-// *********************************************************
|
||||
-#ifdef _MSC_VER // Only Microsoft C++ defines this macro
|
||||
-#include <hash_map>
|
||||
-#include <string>
|
||||
-
|
||||
-template<class Key>
|
||||
-class HashWrapper : public stdext::hash_compare<Key, ::std::less<Key> >, FrobbyHash<Key> {
|
||||
-public:
|
||||
- size_t operator()(const Key& key) const {
|
||||
- return FrobbyHash<typename Key>::operator()(key);
|
||||
- }
|
||||
-
|
||||
- bool operator()(const Key& a, const Key& b) const {
|
||||
- return stdext::hash_compare<Key, ::std::less<Key> >::operator()(a, b);
|
||||
- }
|
||||
-};
|
||||
-
|
||||
-template<>
|
||||
-class HashWrapper<string> : public stdext::hash_compare<string, ::std::less<string> > {
|
||||
-};
|
||||
-
|
||||
-template<class Key, class Value>
|
||||
-class HashMap : public stdext::hash_map<Key, Value, HashWrapper<Key> > {
|
||||
-};
|
||||
-
|
||||
-// *********************************************************
|
||||
-#else // Fall-back for unknown compilers
|
||||
#include <map>
|
||||
template<class Key, class Value>
|
||||
class HashMap : public std::map<Key, Value> {
|
||||
};
|
||||
-#endif
|
||||
-#endif
|
||||
|
||||
|
||||
#endif
|
@ -1,11 +0,0 @@
|
||||
--- src/StatisticsStrategy.cpp.orig 2011-09-23 20:09:12 UTC
|
||||
+++ src/StatisticsStrategy.cpp
|
||||
@@ -140,7 +140,7 @@ double StatisticsStrategy::StatTracker::getAvgSubGenCo
|
||||
if (_nodeCount == 0)
|
||||
return 0.0;
|
||||
else {
|
||||
- mpz_class q = mpq_class(_subGenSum) / _nodeCount;
|
||||
+ mpq_class q = mpq_class(_subGenSum) / _nodeCount;
|
||||
return q.get_d();
|
||||
}
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
--- src/main.cpp.orig 2011-09-23 20:09:12 UTC
|
||||
+++ src/main.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include <ctime>
|
||||
#include <cstdlib>
|
||||
+#include <unistd.h>
|
||||
|
||||
/** This function runs the Frobby console interface. the ::main
|
||||
function calls this function after having set up DEBUG-specific
|
@ -1,10 +0,0 @@
|
||||
--- src/randomDataGenerators.cpp.orig 2018-09-05 21:14:15 UTC
|
||||
+++ src/randomDataGenerators.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <limits>
|
||||
#include <ctime>
|
||||
+#include <unistd.h>
|
||||
|
||||
void generateLinkedListIdeal(BigIdeal& ideal, size_t variableCount) {
|
||||
VarNames names(variableCount);
|
@ -12,4 +12,4 @@ between formats that can be used with several different computer
|
||||
systems, such as Macaulay 2, Monos, 4ti2, CoCoA4 and Singular. Thus
|
||||
Frobby can be used with any of those systems.
|
||||
|
||||
WWW: http://www.broune.com/frobby/
|
||||
WWW: https://github.com/Macaulay2/frobby
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user