diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2006-02-23 10:40:44 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2006-02-23 10:40:44 +0000 |
| commit | 8503536d3896846d823f7f76be54e0a99da8d8b6 (patch) | |
| tree | 1a89e4038216ead71b008f2a5091474964e1c341 /databases/xbsql | |
| parent | Unbreak: make it fetchable again (diff) | |
Conversion to a single libtool environment.
Approved by: portmgr (kris)
Notes
Notes:
svn path=/head/; revision=156749
Diffstat (limited to 'databases/xbsql')
| -rw-r--r-- | databases/xbsql/Makefile | 3 | ||||
| -rw-r--r-- | databases/xbsql/files/patch-xbsql::Makefile.in | 54 | ||||
| -rw-r--r-- | databases/xbsql/pkg-plist | 1 |
3 files changed, 25 insertions, 33 deletions
diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile index 2a7357e8af45..4bc26784840f 100644 --- a/databases/xbsql/Makefile +++ b/databases/xbsql/Makefile @@ -6,6 +6,7 @@ PORTNAME= xbsql PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.rekallrevealed.org/packages/ EXTRACT_SUFX= .tgz @@ -16,7 +17,7 @@ COMMENT= An SQL wrapper for the XBase DBMS library LIB_DEPENDS= xbase-2.0.0:${PORTSDIR}/databases/xbase USE_BISON= yes -USE_AUTOTOOLS= libtool:13:inc +GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes USE_REINPLACE= yes diff --git a/databases/xbsql/files/patch-xbsql::Makefile.in b/databases/xbsql/files/patch-xbsql::Makefile.in index e508898babb3..fe6b29b58fe9 100644 --- a/databases/xbsql/files/patch-xbsql::Makefile.in +++ b/databases/xbsql/files/patch-xbsql::Makefile.in @@ -1,37 +1,27 @@ ---- xbsql/Makefile.in.orig Fri Mar 28 21:03:25 2003 -+++ xbsql/Makefile.in Sun Nov 23 01:16:18 2003 -@@ -89,9 +89,9 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --DEBUG = -g --CFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) --CXXFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) -+DEBUG = -+CFLAGS = @CFLAGS@ -UNO_READLINE -I/usr/local/include $(DEBUG) -+CXXFLAGS = @CXXFLAGS@ -UNO_READLINE -I/usr/local/include $(DEBUG) - LDFLAGS = $(DEBUG) +--- xbsql/Makefile.in.orig Fri Mar 28 12:03:25 2003 ++++ xbsql/Makefile.in Sun Jan 22 13:55:02 2006 +@@ -74,3 +74,3 @@ + AWK = @AWK@ +-CC = g++ ++CC = @CXX@ + CURSES = @CURSES@ +@@ -94,3 +94,3 @@ + CXXFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) +-LDFLAGS = $(DEBUG) ++LDFLAGS = -L/usr/local/lib $(DEBUG) INCLUDE = -I/usr/local/include - -@@ -108,10 +108,10 @@ - xbsql.tab.c xb_datetime.cpp - - --libxbsql_la_LDFLAGS = -lxbase $(DEBUG) -+libxbsql_la_LDFLAGS = `xbase-config --libs` $(DEBUG) - - xql_SOURCES = xql.cpp --xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la -+xql_LDADD = `xbase-config --libs` -lreadline -l$(CURSES) ./libxbsql.la - - - #install-data-hook: -@@ -228,7 +228,7 @@ - if test -f $$p \ - || test -f $$p1 \ +@@ -166,3 +166,3 @@ + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -174,3 +174,3 @@ + CXXLD = $(CXX) +-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ++CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -230,3 +230,3 @@ ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ diff --git a/databases/xbsql/pkg-plist b/databases/xbsql/pkg-plist index 7c96f62bd756..714a004ebea0 100644 --- a/databases/xbsql/pkg-plist +++ b/databases/xbsql/pkg-plist @@ -1,5 +1,6 @@ bin/xql include/xbsql.h lib/libxbsql.a +lib/libxbsql.la lib/libxbsql.so lib/libxbsql.so.0 |