svn commit: r354186 - in head/databases/libsdb: . files

[Vanilla I. Shu]

Author: vanilla
Date: Fri May 16 02:31:45 2014
New Revision: 354186
URL: http://svnweb.freebsd.org/changeset/ports/354186
QAT: https://qat.redports.org/buildarchive/r354186/

Log:
  Support STAGEDIR.

Modified:
  head/databases/libsdb/Makefile
  head/databases/libsdb/files/patch-Makefiles_Other
  head/databases/libsdb/files/patch-config.in
  head/databases/libsdb/pkg-plist

Modified: head/databases/libsdb/Makefile
==============================================================================
--- head/databases/libsdb/Makefile	Fri May 16 02:10:08 2014	(r354185)
+++ head/databases/libsdb/Makefile	Fri May 16 02:31:45 2014	(r354186)
@@ -17,10 +17,6 @@ HAS_CONFIGURE=	yes
 MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}"
 USE_LDCONFIG=	yes
 
-MAN3=		sdb.3 sdb_init.3 sdb_open.3 sdb_close.3 sdb_query.3
-MAN8=		sdbd.8
-
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/databases/libsdb/files/patch-Makefiles_Other
==============================================================================
--- head/databases/libsdb/files/patch-Makefiles_Other	Fri May 16 02:10:08 2014	(r354185)
+++ head/databases/libsdb/files/patch-Makefiles_Other	Fri May 16 02:31:45 2014	(r354186)
@@ -1,6 +1,6 @@
---- Makefiles/Other.orig	Tue Sep 13 00:26:50 2005
-+++ Makefiles/Other	Tue Sep 13 00:27:45 2005
-@@ -24,16 +24,13 @@
+--- Makefiles/Other.orig	2008-04-30 16:38:02.000000000 +0800
++++ Makefiles/Other	2014-05-16 10:07:54.769419058 +0800
+@@ -24,18 +24,15 @@ $(STATICLIB): $(STATICOBJ)
  
  $(SHAREDLIB): $(SHAREDOBJ)
  	rm -f $(SHAREDLIB)
@@ -15,8 +15,12 @@
 -	mkdir -p $(LIBDIR)
 -	cp $(SOVERSION) $(LIBDIR)
 -	cp $(STATICLIB) $(LIBDIR)
-+	$(BSD_INSTALL_PROGRAM) $(SOVERSION) $(LIBDIR)
-+	$(BSD_INSTALL_DATA) $(STATICLIB) $(LIBDIR)
- 	cd $(LIBDIR) && ln -s $(SOVERSION) $(SHAREDLIB)
- 	cd $(LIBDIR) && ln -s $(SOVERSION) $(SONAME)
+-	cd $(LIBDIR) && ln -s $(SOVERSION) $(SHAREDLIB)
+-	cd $(LIBDIR) && ln -s $(SOVERSION) $(SONAME)
++	$(BSD_INSTALL_PROGRAM) $(SOVERSION) $(DESTDIR)$(LIBDIR)
++	$(BSD_INSTALL_DATA) $(STATICLIB) $(DESTDIR)$(LIBDIR)
++	cd $(DESTDIR)$(LIBDIR) && ln -s $(SOVERSION) $(SHAREDLIB)
++	cd $(DESTDIR)$(LIBDIR) && ln -s $(SOVERSION) $(SONAME)
  
+ uninstall-lib:
+ 	cd $(LIBDIR) && rm -f $(SHAREDLIB) $(STATICLIB) $(SOVERSION) $(SONAME)

Modified: head/databases/libsdb/files/patch-config.in
==============================================================================
--- head/databases/libsdb/files/patch-config.in	Fri May 16 02:10:08 2014	(r354185)
+++ head/databases/libsdb/files/patch-config.in	Fri May 16 02:31:45 2014	(r354186)
@@ -1,13 +1,13 @@
---- config.in.orig	Sat Feb 19 01:20:21 2005
-+++ config.in	Tue Sep 13 01:40:14 2005
-@@ -78,21 +78,22 @@
+--- config.in.orig	2008-04-30 16:38:02.000000000 +0800
++++ config.in	2014-05-16 10:25:15.024329118 +0800
+@@ -81,21 +81,22 @@ sdbd: sdbd.o sdb-config
  	$(CC) -I. -L. -lsdb $(LDFLAGS) -o $@ sdbd.o
  
  install-man:
 -	mkdir -p $(MANDIR)/man3 && cp $(MAN3) $(MANDIR)/man3
 -	mkdir -p $(MANDIR)/man8 && cp $(MAN8) $(MANDIR)/man8
-+	$(BSD_INSTALL_MAN) $(MAN3) $(MANDIR)/man3
-+	$(BSD_INSTALL_MAN) $(MAN8) $(MANDIR)/man8
++	$(BSD_INSTALL_MAN) $(MAN3) $(DESTDIR)$(MANDIR)/man3
++	$(BSD_INSTALL_MAN) $(MAN8) $(DESTDIR)$(MANDIR)/man8
  
  uninstall-man:
  	cd $(MANDIR)/man3 && rm -f $(MAN3)
@@ -15,15 +15,15 @@
  
  install-prog: $(PROGS)
 -	mkdir -p $(BINDIR) && cp $(PROGS) $(BINDIR)
-+	$(BSD_INSTALL_PROGRAM) sdb_client sdbd_client sdbd $(BINDIR)
-+	$(BSD_INSTALL_SCRIPT) sdb-config $(BINDIR)
++	$(BSD_INSTALL_PROGRAM) sdb_client sdbd_client sdbd $(DESTDIR)$(BINDIR)
++	$(BSD_INSTALL_SCRIPT) sdb-config $(DESTDIR)$(BINDIR)
  
  uninstall-prog:
  	cd $(BINDIR) && rm -f $(PROGS)
  
  install-header:
 -	mkdir -p $(INCDIR) && cp $(HEADERS) $(INCDIR)
-+	$(BSD_INSTALL_DATA) $(HEADERS) $(INCDIR)
++	$(BSD_INSTALL_DATA) $(HEADERS) $(DESTDIR)$(INCDIR)
  
  uninstall-header:
  	cd $(INCDIR) && rm -f $(HEADERS)

Modified: head/databases/libsdb/pkg-plist
==============================================================================
--- head/databases/libsdb/pkg-plist	Fri May 16 02:10:08 2014	(r354185)
+++ head/databases/libsdb/pkg-plist	Fri May 16 02:31:45 2014	(r354186)
@@ -7,3 +7,9 @@ lib/libsdb.a
 lib/libsdb.so
 lib/libsdb.so.0
 lib/libsdb.so.%%VERSION%%
+man/man3/sdb.3.gz
+man/man3/sdb_close.3.gz
+man/man3/sdb_init.3.gz
+man/man3/sdb_open.3.gz
+man/man3/sdb_query.3.gz
+man/man8/sdbd.8.gz