diff options
| author | acm <acm@FreeBSD.org> | 2010-11-18 13:03:04 +0800 |
|---|---|---|
| committer | acm <acm@FreeBSD.org> | 2010-11-18 13:03:04 +0800 |
| commit | 02a95167d9af0b335bf6ac823d34b2bd9e5a558d (patch) | |
| tree | fa0774bb31ba70ab8955374cef139eedf97fa7e9 /databases | |
| parent | 9a2ecfe6ace7ec7fa13a4a49e122e027f0bee321 (diff) | |
| download | freebsd-ports-gnome-02a95167d9af0b335bf6ac823d34b2bd9e5a558d.tar.gz freebsd-ports-gnome-02a95167d9af0b335bf6ac823d34b2bd9e5a558d.tar.zst freebsd-ports-gnome-02a95167d9af0b335bf6ac823d34b2bd9e5a558d.zip | |
- Remove database/unixODBC and database/firebird20-* CONFLICTS. Now
database/virtuoso installs bin/isql and bin-isqlw like bin/isql-vt and
bin/isqlw-vt respectly
- Bump PORTREVISION
PR: 150391
Approved by: fjoe (maintainer timeout - 5 weeks)
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/virtuoso/Makefile | 5 | ||||
| -rw-r--r-- | databases/virtuoso/files/patch-binsrc-tests-Makefile.in | 27 | ||||
| -rw-r--r-- | databases/virtuoso/pkg-plist | 4 |
3 files changed, 33 insertions, 3 deletions
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index 178fb020be44..2930de9219df 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -7,6 +7,7 @@ PORTNAME= virtuoso PORTVERSION= 6.1.2 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF DISTNAME= ${PORTNAME}-opensource-${PORTVERSION} @@ -17,7 +18,6 @@ COMMENT= Universal SQL/Application Server BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk\ htmldoc:${PORTSDIR}/textproc/htmldoc LIB_DEPENDS= iodbc.3:${PORTSDIR}/databases/libiodbc -CONFLICTS= unixODBC-* firebird-client-* USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-readline\ @@ -55,6 +55,9 @@ post-patch: ${XARGS} ${REINPLACE_CMD}\ -e 's,expr \$$,expr -- $$,'\ -e 's,netstat -an.*grep.*$$\([a-zA-Z0-9]*\).*grep LISTEN,${CHECK_PORT},' + ${FIND} -E ${WRKSRC} -type f -name "mkvad.sh" -o -name "make_vad.sh" -o -name "mkdoc.sh" |\ + ${XARGS} ${REINPLACE_CMD}\ + -e 's,-isql,-isql-vt,' .include <bsd.port.pre.mk> diff --git a/databases/virtuoso/files/patch-binsrc-tests-Makefile.in b/databases/virtuoso/files/patch-binsrc-tests-Makefile.in new file mode 100644 index 000000000000..328671900192 --- /dev/null +++ b/databases/virtuoso/files/patch-binsrc-tests-Makefile.in @@ -0,0 +1,27 @@ +--- binsrc/tests/Makefile.in 2010-07-09 11:17:05.000000000 -0500 ++++ binsrc/tests/Makefile.in 2010-08-15 01:57:14.000000000 -0500 +@@ -56,7 +56,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-bin_PROGRAMS = isql$(EXEEXT) isqlw$(EXEEXT) inifile$(EXEEXT) \ ++bin_PROGRAMS = isql-vt$(EXEEXT) isqlw-vt$(EXEEXT) inifile$(EXEEXT) \ + $(am__EXEEXT_1) + noinst_PROGRAMS = M2$(EXEEXT) paramstats$(EXEEXT) ins$(EXEEXT) \ + blobs$(EXEEXT) blobs2$(EXEEXT) blobnulls$(EXEEXT) \ +@@ -763,13 +763,13 @@ + ins-iodbc$(EXEEXT): $(ins_iodbc_OBJECTS) $(ins_iodbc_DEPENDENCIES) + @rm -f ins-iodbc$(EXEEXT) + $(ins_iodbc_LINK) $(ins_iodbc_OBJECTS) $(ins_iodbc_LDADD) $(LIBS) +-isql$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) ++isql-vt$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) + @rm -f isql$(EXEEXT) + $(isql_LINK) $(isql_OBJECTS) $(isql_LDADD) $(LIBS) + isql-iodbc$(EXEEXT): $(isql_iodbc_OBJECTS) $(isql_iodbc_DEPENDENCIES) + @rm -f isql-iodbc$(EXEEXT) + $(isql_iodbc_LINK) $(isql_iodbc_OBJECTS) $(isql_iodbc_LDADD) $(LIBS) +-isqlw$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) ++isqlw-vt$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) + @rm -f isqlw$(EXEEXT) + $(isqlw_LINK) $(isqlw_OBJECTS) $(isqlw_LDADD) $(LIBS) + isqlw-iodbc$(EXEEXT): $(isqlw_iodbc_OBJECTS) $(isqlw_iodbc_DEPENDENCIES) diff --git a/databases/virtuoso/pkg-plist b/databases/virtuoso/pkg-plist index 2a51678624be..e57f35bd3319 100644 --- a/databases/virtuoso/pkg-plist +++ b/databases/virtuoso/pkg-plist @@ -1,7 +1,7 @@ bin/inifile -bin/isql +bin/isql-vt bin/isql-iodbc -bin/isqlw +bin/isqlw-vt bin/isqlw-iodbc bin/odbc_mail bin/virt_mail |