ports/167886: [PATCH] databases/gigabase: Fixed failed Patch

[Muhammad Moinur Rahman]

>Number:         167886
>Category:       ports
>Synopsis:       [PATCH] databases/gigabase: Fixed failed Patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 14 15:50:04 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Muhammad Moinur Rahman
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD bofh.telnet.net.bd 9.0-STABLE FreeBSD 9.0-STABLE #0: Fri Mar  2 02:21:51 BDT
>Description:
- Fixed failed Patchset

The generated patch is in DOS format as the Makefile.in file. So added USE_DOS2UNIX flag.

For Committer's reference:
http://tb.s.ubze.ro//logs/7.4-FreeBSD-i386/gigabase-3.86_1.log
http://tb.s.ubze.ro//logs/7.4-FreeBSD-amd64/gigabase-3.86_1.log
http://tb.s.ubze.ro//logs/9.0-FreeBSD-i386/gigabase-3.86_1.log
http://tb.s.ubze.ro//logs/9.0-FreeBSD-amd64/gigabase-3.86_1.log
http://tb.s.ubze.ro//logs/8.3-FreeBSD-i386/gigabase-3.86_1.log
http://tb.s.ubze.ro//logs/8.3-FreeBSD-amd64/gigabase-3.86_1.log

Port maintainer (miwi at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_5 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- gigabase-3.86_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/gigabase/Makefile ./Makefile
--- /usr/ports/databases/gigabase/Makefile	2012-05-03 22:04:11.000000000 +0600
+++ ./Makefile	2012-05-14 21:18:10.606852425 +0600
@@ -7,6 +7,7 @@
 
 PORTNAME=	gigabase
 PORTVERSION=	3.86
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
 		http://www.garret.ru/
@@ -16,6 +17,7 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USE_DOS2UNIX=	Makefile.in
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	${PTHREAD_CFLAGS}
diff -ruN --exclude=CVS /usr/ports/databases/gigabase/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/databases/gigabase/files/patch-Makefile.in	2012-05-03 22:04:11.000000000 +0600
+++ ./files/patch-Makefile.in	2012-05-14 21:17:37.000000000 +0600
@@ -1,28 +1,28 @@
---- Makefile.in.orig	2012-04-15 21:11:23.211612689 +0600
-+++ Makefile.in	2012-04-15 21:16:04.938621569 +0600
-@@ -5,8 +5,10 @@
+--- Makefile.in.orig	2012-05-14 15:11:18.000000000 +0600
++++ Makefile.in 2012-05-14 15:14:15.000000000 +0600
+@@ -5,8 +5,9 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  VPATH = @srcdir@
 -LIBTOOL = ./libtool
+-INSTALL = @INSTALL@
 +LIBTOOL = @LIBTOOL@
- INSTALL = @INSTALL@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_DATA = @INSTALL_DATA@
- 
+
  # Coment this for AIX/xlC 5.0
  LIBEXT=la
-@@ -41,7 +43,7 @@
+@@ -41,7 +42,7 @@
  SUFF=@SUFF@
- 
+
  GB_LIB = libgigabase$(SUFF).${LIBEXT}
 -CLI_LIB = libcli$(SUFF).${LIBEXT}
 +CLI_LIB = libcligb$(SUFF).${LIBEXT}
  EXES = subsql
- 
+
  EXAMPLES = guess testdb testjoin testddl testperf testspat testperf2 testsync testiref testtrav testidx testidx2 clitest testblob testleak testsession testtimeseries testtl
-@@ -49,7 +51,7 @@
- 
+@@ -49,7 +50,7 @@
+
  CXX = @CXX@
  CC = @CC@
 -DEFS = @DEFS@
@@ -30,8 +30,8 @@
  CXXFLAGS = @CXXFLAGS@ $(DEFS)
  CFLAGS = @CFLAGS@ $(DEFS)
  LD = $(CXX)
-@@ -70,7 +72,7 @@
- 
+@@ -70,7 +71,7 @@
+
  $(GB_LIB): $(OBJS)
  # Coment this for AIX/xlC 5.0
 -	$(LIBTOOL) --mode=link $(CXX) -o $@ $(OBJS) $(LDFLAGS) @LTHREADSLIB@ -rpath $(libdir) -version-info $(VERSION)
@@ -39,8 +39,8 @@
  # Uncoment this for AIX/xlC 5.0
  #	mkdir .libs
  #	xlC_r -qmkshrobj=-10 -o .libs/gigabase.so $(OBJS)
-@@ -80,7 +82,7 @@
- 
+@@ -80,7 +81,7 @@
+
  $(CLI_LIB): $(CLI_OBJS)
  # Coment this for AIX/xlC 5.0
 -	$(LIBTOOL) --mode=link $(CXX) -o $@ $(CLI_OBJS) $(LDFLAGS) @LTHREADSLIB@ -rpath $(libdir) -version-info $(VERSION)
@@ -48,21 +48,22 @@
  # Uncoment this for AIX/xlC 5.0
  #	xlC_r -qmkshrobj=-10 -o .libs/cli.so $(CLI_OBJS)
  #	ar rv .libs/libcli_r.a .libs/cli.so
-@@ -155,14 +157,14 @@
- 
+@@ -155,14 +156,14 @@
+
  install: subsql $(GB_LIB) $(CLI_LIB)
- 	mkdir -p $(includedir)
+	mkdir -p $(includedir)
 -	cp $(INCS) $(CLI_INCS) $(includedir)
 +	$(INSTALL_DATA) $(INCS) $(CLI_INCS) $(includedir)
- 	mkdir -p $(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) $(GB_LIB) $(CLI_LIB) $(libdir)
- 	mkdir -p $(bindir)
- 	if test -x .libs/subsql ; then \
+	mkdir -p $(libdir)
+-	$(LIBTOOL) --mode=install $(INSTALL) $(GB_LIB) $(CLI_LIB) $(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(GB_LIB) $(CLI_LIB) $(libdir)
+	mkdir -p $(bindir)
+	if test -x .libs/subsql ; then \
 -		cp .libs/subsql $(bindir); \
-+		$(INSTALL_PROGRAM) .libs/subsql $(bindir)/subsql_gb; \
- 	else \
++		${INSTALL_PROGRAM} .libs/subsql $(bindir)/subsql_gb; \
+	else \
 -		cp subsql $(bindir); \
 +		$(INSTALL_PROGRAM) subsql $(bindir)/subsql_gb; \
- 	fi
+	fi
  #	strip $(bindir)/subsql
- 
+
--- gigabase-3.86_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: