On 2019/03/22 10:27, Alessandro DE LAURENZIS wrote:
> Hello Anthony,
>
> thanks a lot for your feedback.
>
> On 22/03/2019 06:16, Anthony J. Bentley wrote:
> > Hi Alessandro,
> >
> > Alessandro DE LAURENZIS writes:
> > > All tests are PASS, provided that we use gdiff(1) instead of diff(1) for
> > > the dddmp set.
> >
> > Careful...
> >
> > -# Store corresponding CNF in different format:
> > +# Store corresponding CNF in gdifferent format:
> > # NodeByNode method -> file 4.node1.tmp
> > # MaxtermByMaxterm -> file 4.max1.tmp
> > -# Best with different options:
> > +# Best with gdifferent options:
>
> Ooops. Fixed.
>
> >
> > > HOMEPAGE = https://sourceforge.net/projects/cudd-mirror/
> >
> > I think https://www.davidkebo.com/cudd is a better homepage. I would use
> > both SourceForge and https://www.davidkebo.com/source/cudd_versions/ in
> > MASTER_SITES.
>
> Actually David doesn't seem to be affiliated to the project in any way, and
> his page is just a tutorial (there are a few on the net).
>
> The most complete source I can find is a Github mirror:
>
> https://github.com/ivmai/cudd
>
> which contains a collection of the most recent releases and upstream's
> README as front page.
>
> I would suggest to switch to this as master site, but I'm facing issues in
> fetching the tarball: we're trying to download:
>
> https://github.com/ivmai/cudd/archive/3.0.0/cudd-3.0.0.tar.gz
>
> instead of:
>
> https://github.com/ivmai/cudd/archive/cudd-3.0.0.tar.gz
>
> I vaguely remember a similar problem some months ago... do we have to change
> something in ports' infrastructure?
>
> >
> > > One thing I'm not able to do is to force the name of the .so file to be
> > > libcudd.so.0.0, instead of libcudd-3.0.0.so.0.0. Could someone point me
> > > in the right direction?
> >
> > Well, it seems to create both. I suppose you could @comment out the
> > redundant library in PLIST, but personally I wouldn't bother; in ports
> > like textproc/apertium I just leave it be. Which one does OpenSTA pick up?
> >
>
> OpenSTA searches for libcudd-3.0.0.so.0.0 (so we would need
>
> WANTLIB += cudd-3.0.0
>
> which doesn't seem ideal to me, but maybe I'm wrong...).
>
> Also, I would prefer to add some documentation, given that it's available in
> the release (although not updated to the latest version), but I didn't find
> a way to do it using a target from the upstream's Makefile; I just added a
> post-install part in the port's one (this requires pdflatex, so I added
> print/texlive/base to BUILD_DEPENDS).
>
> Updated tarball (using GH_ACCOUNT/PROJECT/TAGNAME, so breaking 'make fetch')
> attached.
>
> --
> Alessandro DE LAURENZIS
> [mailto:[email protected]]
> Web: http://www.atlantide.t28.net
> LinkedIn: https://www.linkedin.com/in/delaurenzis/
Diff on top of yours.
- fix fetches
- it's c++ so use COMPILER
- it builds with or without doxygen, but if present during the configure
run then it's needed during build, so add a build dep
- get rid of "-release @PACKAGE_VERSION@" to remove the lib symlink;
if other things were looking for 'cudd-3.0.0' then you'd probably want
to keep it but it doesn't sound like that's the case
- symlink is simpler than patching for gdiff
with this added, OK sthen@ to import.
diff --git Makefile Makefile
index cb1d15c..c3314f0 100644
--- Makefile
+++ Makefile
@@ -2,13 +2,14 @@
COMMENT = Colorado University Decision Diagram
+V = 3.0.0
GH_ACCOUNT = ivmai
GH_PROJECT = cudd
-GH_TAGNAME = 3.0.0
+GH_TAGNAME = cudd-$V
+DISTNAME = cudd-$V
CATEGORIES = devel
-SHARED_LIBS += cudd-${GH_TAGNAME} 0.0 # 0.0
SHARED_LIBS += cudd 0.0 # 0.0
MAINTAINER = Alessandro De Laurenzis <[email protected]>
@@ -18,7 +19,10 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = ${COMPILER_LIBCXX} m
-BUILD_DEPENDS = print/texlive/base
+COMPILER = base-clang ports-gcc base-gcc
+
+BUILD_DEPENDS = devel/doxygen \
+ print/texlive/base
CONFIGURE_STYLE = gnu
@@ -32,4 +36,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/cudd.pdf ${PREFIX}/share/doc/cudd
${INSTALL_DATA} ${WRKSRC}/doc/phase.pdf ${PREFIX}/share/doc/cudd
+pre-test:
+ ln -s ${LOCALBASE}/bin/gdiff ${WRKDIR}/bin/diff
+
.include <bsd.port.mk>
diff --git distinfo distinfo
index 28e2db0..cfe8ddd 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (cudd-3.0.0.tar.gz) = uOlmtFYslqA+f76iOXKVh9ezldU8rcw5pyA7Sc9+62k=
-SIZE (cudd-3.0.0.tar.gz) = 1175302
+SHA256 (cudd-3.0.0.tar.gz) = X+FFBBxZRonm589M1iPV8rfDYmFwi+jJpyrtcs9nrM4=
+SIZE (cudd-3.0.0.tar.gz) = 1170745
diff --git pkg/PLIST pkg/PLIST
index aae6309..02d57dd 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v$
include/cudd.h
-@lib lib/libcudd-3.0.0.so.${LIBcudd-3.0.0_VERSION}
lib/libcudd.a
lib/libcudd.la
@lib lib/libcudd.so.${LIBcudd_VERSION}
diff --git patches/patch-Makefile_in patches/patch-Makefile_in
new file mode 100644
index 0000000..0b4bc88
--- /dev/null
+++ patches/patch-Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -880,7 +880,7 @@ cudd_libcudd_la_CPPFLAGS = -I$(top_srcdir)/cudd -I$(to
+ -I$(top_srcdir)/epd -I$(top_srcdir)/mtr -I$(top_srcdir)/util
+
+ @OBJ_TRUE@cudd_libcudd_la_LIBTOOLFLAGS = --tag=CXX
+-cudd_libcudd_la_LDFLAGS = -release @PACKAGE_VERSION@ -version-info 0:0:0 \
++cudd_libcudd_la_LDFLAGS = -version-info 0:0:0 \
+ -no-undefined
+
+ cudd_testcudd_SOURCES = cudd/testcudd.c
diff --git patches/patch-dddmp_exp_test2_sh_in
patches/patch-dddmp_exp_test2_sh_in
deleted file mode 100644
index 02a9b67..0000000
--- patches/patch-dddmp_exp_test2_sh_in
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD$
-
-Index: dddmp/exp/test2.sh.in
---- dddmp/exp/test2.sh.in.orig
-+++ dddmp/exp/test2.sh.in
-@@ -31,7 +31,7 @@ quit
- END
- test $? != 1 && exitval=1
- echo "----------------------------- ... RESULTS ...
-----------------------------"
--diff --strip-trailing-cr --brief ${dest}/s27deltaDddmp1.bdd.tmp \
-+gdiff --strip-trailing-cr --brief ${dest}/s27deltaDddmp1.bdd.tmp \
- ${where}/s27deltaDddmp1.bdd.bis
- test $? != 0 && exitval=1
- echo "-------------------------------- ... END
----------------------------------"
diff --git patches/patch-dddmp_exp_test3_sh_in
patches/patch-dddmp_exp_test3_sh_in
deleted file mode 100644
index 108c173..0000000
--- patches/patch-dddmp_exp_test3_sh_in
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD$
-
-Index: dddmp/exp/test3.sh.in
---- dddmp/exp/test3.sh.in.orig
-+++ dddmp/exp/test3.sh.in
-@@ -69,11 +69,11 @@ quit
- END
- test $? != 1 && exitval=1
- echo "----------------------------- ... RESULTS ...
-----------------------------"
--diff --strip-trailing-cr --brief ${where}/0or1.bdd ${dest}/0or1.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${where}/0or1.bdd ${dest}/0or1.bdd.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${where}/2and3.bdd ${dest}/2and3.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${where}/2and3.bdd ${dest}/2and3.bdd.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${where}/4xor5.bdd ${dest}/4xor5.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4xor5.bdd ${dest}/4xor5.bdd.tmp
- test $? != 0 && exitval=1
- echo "-------------------------------- ... END
----------------------------------"
- rm -f ${dest}/0or1.bdd.tmp ${dest}/2and3.bdd.tmp ${dest}/4xor5.bdd.tmp
diff --git patches/patch-dddmp_exp_test4_sh_in
patches/patch-dddmp_exp_test4_sh_in
deleted file mode 100644
index 9c2bab3..0000000
--- patches/patch-dddmp_exp_test4_sh_in
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD$
-
-Index: dddmp/exp/test4.sh.in
---- dddmp/exp/test4.sh.in.orig
-+++ dddmp/exp/test4.sh.in
-@@ -58,9 +58,9 @@ quit
- END2
- test $? != 1 && exitval=1
- echo "----------------------------- ... RESULTS ...
-----------------------------"
--diff --strip-trailing-cr --brief ${where}/4.bdd ${dest}/4a.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4.bdd ${dest}/4a.bdd.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${dest}/4a.bdd.tmp ${dest}/4c.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${dest}/4a.bdd.tmp ${dest}/4c.bdd.tmp
- test $? != 0 && exitval=1
- echo "-------------------------------- ... END
----------------------------------"
- rm -f ${dest}/4a.bdd.tmp ${dest}/4c.bdd.tmp
diff --git patches/patch-dddmp_exp_test5_sh_in
patches/patch-dddmp_exp_test5_sh_in
deleted file mode 100644
index 7042824..0000000
--- patches/patch-dddmp_exp_test5_sh_in
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD$
-
-Index: dddmp/exp/test5.sh.in
---- dddmp/exp/test5.sh.in.orig
-+++ dddmp/exp/test5.sh.in
-@@ -43,9 +43,9 @@ quit
- END1
- test $? != 1 && exitval=1
- echo "----------------------------- ... RESULTS ...
-----------------------------"
--diff --strip-trailing-cr --brief ${where}/0.add ${dest}/0.add.tmp
-+gdiff --strip-trailing-cr --brief ${where}/0.add ${dest}/0.add.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${where}/1.add ${dest}/1.add.tmp
-+gdiff --strip-trailing-cr --brief ${where}/1.add ${dest}/1.add.tmp
- test $? != 0 && exitval=1
- echo "-------------------------------- ... END
----------------------------------"
- rm -f ${dest}/0.add.tmp ${dest}/1.add.tmp
diff --git patches/patch-dddmp_exp_test6_sh_in
patches/patch-dddmp_exp_test6_sh_in
deleted file mode 100644
index 8c18a3a..0000000
--- patches/patch-dddmp_exp_test6_sh_in
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD$
-
-Index: dddmp/exp/test6.sh.in
---- dddmp/exp/test6.sh.in.orig
-+++ dddmp/exp/test6.sh.in
-@@ -52,9 +52,9 @@ quit
- END2
- test $? != 1 && exitval=1
- echo "----------------------------- ... RESULTS ...
-----------------------------"
--diff --strip-trailing-cr --brief ${where}/4.cnf.bis ${dest}/4.cnf.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4.cnf.bis ${dest}/4.cnf.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${where}/4.bdd.bis1 ${dest}/4.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4.bdd.bis1 ${dest}/4.bdd.tmp
- test $? != 0 && exitval=1
- echo "-------------------------------- ... END
----------------------------------"
- rm -f ${dest}/4.cnf.tmp ${dest}/4.bdd.tmp
diff --git patches/patch-dddmp_exp_test7_sh_in
patches/patch-dddmp_exp_test7_sh_in
deleted file mode 100644
index 216025a..0000000
--- patches/patch-dddmp_exp_test7_sh_in
+++ /dev/null
@@ -1,29 +0,0 @@
-$OpenBSD$
-
-Index: dddmp/exp/test7.sh.in
---- dddmp/exp/test7.sh.in.orig
-+++ dddmp/exp/test7.sh.in
-@@ -151,17 +151,17 @@ quit
- END5
- test $? != 1 && exitval=1
- echo "----------------------------- ... RESULTS ...
-----------------------------"
--diff --strip-trailing-cr --brief ${where}/4.max1 ${dest}/4.max1.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4.max1 ${dest}/4.max1.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${where}/4.max2 ${dest}/4.max2.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4.max2 ${dest}/4.max2.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${where}/4.bdd.bis1 ${dest}/4.node2.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4.bdd.bis1 ${dest}/4.node2.bdd.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${where}/4.bdd.bis2 ${dest}/4.node3.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4.bdd.bis2 ${dest}/4.node3.bdd.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${where}/4.bdd.bis3 ${dest}/4.best1.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4.bdd.bis3 ${dest}/4.best1.bdd.tmp
- test $? != 0 && exitval=1
--diff --strip-trailing-cr --brief ${where}/4.bdd.bis4 ${dest}/4.best2.bdd.tmp
-+gdiff --strip-trailing-cr --brief ${where}/4.bdd.bis4 ${dest}/4.best2.bdd.tmp
- test $? != 0 && exitval=1
- echo "-------------------------------- ... END
----------------------------------"
- rm -f ${dest}/4.max1.tmp ${dest}/4.max2.tmp ${dest}/4.node2.bdd.tmp \
