Update to 1.27.0

PR:		ports/145875
Submitted by:	Takefu [takefu airport.fm]
Reviewed by:	maintainer
Approved by:	maintainer, tabthorpe (mentor)

5 files changed, 100 insertions, 50 deletions

diff --git a/devel/dklibs/Makefile b/devel/dklibs/Makefile
index da3188568356..0d893edeae9b 100644
--- a/devel/dklibs/Makefile
+++ b/devel/dklibs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dklibs
-PORTVERSION=	1.26.0
-PORTREVISION=	1
+PORTVERSION=	1.27.0
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -33,6 +32,7 @@ CFLAGS+=	-I${LOCALBASE}/include \
 		-I${BDB_INCLUDE_DIR}
 
 CONFIGURE_ARGS+=	--datadir=${DATADIR} \
+			--datarootdir=${DATADIR} \
 			--sysconfdir=${ETCDIR}
 
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
@@ -72,7 +72,18 @@ MAN3=		dk.3 \
 MANCOMPRESSED=	no
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900002
+EXTRA_PATCHES+=	${PATCHDIR}/900003-no-sys_termios.h
+.endif
+
 post-install:
+	@${MKDIR} ${PREFIX}/etc/dklibs
+	${INSTALL_DATA} ${WRKSRC}/appdefaults ${PREFIX}/etc/dklibs/appdefaults.sample
+	@if [ ! -f ${PREFIX}/etc/dklibs/appdefaults ]; then \
+		${CP} -p ${PREFIX}/etc/dklibs/appdefaults.sample ${PREFIX}/etc/dklibs/appdefaults ; \
+	fi
 .if !defined(NO_INSTALL_MANPAGES)
 	@${MKDIR} ${MAN3PREFIX}/man/man3
 .for manpage in ${MAN3}
@@ -87,4 +98,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/DOCU/*.html ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/dklibs/distinfo b/devel/dklibs/distinfo
index ab1737e712c5..c56ab21a28c4 100644
--- a/devel/dklibs/distinfo
+++ b/devel/dklibs/distinfo
@@ -1,3 +1,3 @@
-MD5 (dklibs-1.26.0.tar.gz) = 1f0c3f3a3d60d0b7ff6ddd0165b54a88
-SHA256 (dklibs-1.26.0.tar.gz) = 234f7047106d133eb6f955a7d9b46987792c5609b0d9603fa3c4227ee573bfd3
-SIZE (dklibs-1.26.0.tar.gz) = 5164144
+MD5 (dklibs-1.27.0.tar.gz) = 6ec7eade516185e8a3c1fe330882085f
+SHA256 (dklibs-1.27.0.tar.gz) = 2e30670b8c44208fa71353a65299d05072719ff4d27052409f1ef1822d4b5f7d
+SIZE (dklibs-1.27.0.tar.gz) = 5181712
diff --git a/devel/dklibs/files/900003-no-sys_termios.h b/devel/dklibs/files/900003-no-sys_termios.h
new file mode 100644
index 000000000000..452032cdca30
--- /dev/null
+++ b/devel/dklibs/files/900003-no-sys_termios.h
@@ -0,0 +1,24 @@
+--- dktypes.h.orig	2010-04-20 22:32:58.000000000 -0700
++++ dktypes.h	2010-04-20 22:33:13.000000000 -0700
+@@ -121,9 +121,6 @@
+ #if DK_HAVE_TERMIOS_H
+ #include <termios.h>
+ #endif
+-#if DK_HAVE_SYS_TERMIOS_H
+-#include <sys/termios.h>
+-#endif
+ #if DK_HAVE_SYS_TTOLD_H
+ #include <sys/ttold.h>
+ #endif
+--- dksf.c.orig	2010-04-20 22:48:51.000000000 -0700
++++ dksf.c	2010-04-20 22:49:02.000000000 -0700
+@@ -87,9 +87,6 @@
+ #if DK_HAVE_TERMIOS_H
+ #include <termios.h>
+ #endif
+-#if DK_HAVE_SYS_TERMIOS_H
+-#include <sys/termios.h>
+-#endif
+ #if DK_HAVE_SYS_TTOLD_H
+ #include <sys/ttold.h>
+ #endif
diff --git a/devel/dklibs/files/patch-Makefile-shared-linux.in b/devel/dklibs/files/patch-Makefile-shared-linux.in
index e0ee2852ee2b..8cd7d14842e9 100644
--- a/devel/dklibs/files/patch-Makefile-shared-linux.in
+++ b/devel/dklibs/files/patch-Makefile-shared-linux.in
@@ -1,22 +1,22 @@
---- Makefile-shared-linux.in.orig	2010-01-04 06:49:13.000000000 -0800
-+++ Makefile-shared-linux.in	2010-02-04 02:00:24.685902608 -0800
+--- Makefile-shared-linux.in.orig	2010-02-25 04:44:58.000000000 -0800
++++ Makefile-shared-linux.in	2010-04-20 22:18:32.000000000 -0700
 @@ -1,5 +1,6 @@
  
- SOVERS=1.26
+ SOVERS=1.27
 +MAJORVERS=1
  
  # The build prefix
  pp=
-@@ -13,7 +14,7 @@
- sysconfdir = @sysconfdir@
+@@ -14,7 +15,7 @@
+ sysconfdir=@sysconfdir@
  scd=$(sysconfdir)
- libdir = @libdir@
--sharedlibdir = $(libdir)/shared
-+sharedlibdir = $(libdir)
- mandir = @mandir@
- includedir = @includedir@
- srcdir = @srcdir@
-@@ -74,18 +75,14 @@
+ libdir=@libdir@
+-sharedlibdir=$(libdir)/shared
++sharedlibdir=$(libdir)
+ mandir=@mandir@
+ includedir=@includedir@
+ srcdir=@srcdir@
+@@ -75,18 +76,14 @@
  all:	$(progs) $(libs) stc-static
  	-[ -d lib ] || mkdir lib
  	-[ -d share ] || mkdir share
@@ -35,20 +35,24 @@
  	chmod 755 share/stc
  	chmod 755 share/tracecc
  	chmod 755 share/trana
-@@ -119,12 +116,6 @@
- 	find share -type f -exec chmod 644 {} \;
- 	cp appdefaults.sample appdefaults
+@@ -113,7 +110,6 @@
+ 	-cp share/tracecc/en/utf-8/tracecca.* share/tracecc/utf-8
+ 	-cp share/trana/en/utf-8/trana.* share/trana/utf-8
+ 	-cp share/dkpref/en/utf-8/dkpref.* share/dkpref/utf-8
+-	-(cd DOCU; tar cf - .) | (cd share/doc/dklibs; tar xf -)
+ 	find lib -type d -exec chmod 755 {} \;
+ 	find lib -type f -exec chmod 644 {} \;
+ 	find share -type d -exec chmod 755 {} \;
+@@ -122,8 +118,6 @@
  	chmod 755 showdd
--	chmod 755 tracecc-gui
--	chmod 755 tracegui.jar
--	find Java/dklibsj/doc -type d -exec chmod ugo+rx {} \;
--	find Java/dklibsj/doc -type f -exec chmod ugo+r {} \;
--	find Java/TraceGUI/doc -type d -exec chmod ugo+rx {} \;
--	find Java/TraceGUI/doc -type f -exec chmod ugo+r {} \;
+ 	chmod 755 tracecc-gui
+ 	chmod 755 tracegui.jar
+-	find Java/doc -type d -exec chmod ugo+rx {} \;
+-	find Java/doc -type f -exec chmod ugo+r {} \;
  	./showdd $(datadir) >> appdefaults
  	touch all
  	chmod 755 rwperlmk.sh
-@@ -148,32 +139,14 @@
+@@ -147,16 +141,6 @@
  install:	all
  	-[ -d $(pp)$(libdir) ] || mkdir -p $(pp)$(libdir)
  	-chmod 755 $(pp)$(libdir)
@@ -56,24 +60,27 @@
 -	-chmod 755 $(pp)$(libdir)/java
 -	-[ -d $(pp)$(libdir)/java/src ] || mkdir -p $(pp)$(libdir)/java/src
 -	-chmod 755 $(pp)$(libdir)/java/src
+-	-[ ! -d $(pp)$(libdir)/java/src/dklibsj ] || rm -fr $(pp)$(libdir)/java/src/dklibsj
 -	-[ -d $(pp)$(libdir)/java/src/dklibsj ] || mkdir -p $(pp)$(libdir)/java/src/dklibsj
+-	-[ -d $(pp)$(libdir)/java/src/dklibsj/loc ] || mkdir -p $(pp)$(libdir)/java/src/dklibsj/loc
 -	-chmod 755 $(pp)$(libdir)/java/src/dklibsj
 -	-[ -d $(pp)$(libdir)/java/doc ] || mkdir -p $(pp)$(libdir)/java/doc
 -	-chmod 755 $(pp)$(libdir)/java/doc
  	-[ -d $(pp)$(bindir) ] || mkdir -p $(pp)$(bindir)
  	-chmod 755 $(pp)$(bindir)
  	-[ -d $(pp)$(datadir) ] || mkdir -p $(pp)$(datadir)
- 	-chmod 755 $(pp)$(datadir)
+@@ -164,18 +148,7 @@
  	-[ -d $(pp)$(includedir) ] || mkdir -p $(pp)$(includedir)
  	-chmod 755 $(pp)$(includedir)
--	-[ -d $(pp)$(mandir) ] || mkdir -p $(pp)$(mandir)
+ 	-[ -d $(pp)$(mandir) ] || mkdir -p $(pp)$(mandir)
 -	-chmod 755 $(pp)$(mandir)
- 	-[ -d $(pp)$(sysconfdir) ] || mkdir -p $(pp)$(sysconfdir)
+-	-[ -d $(pp)$(sysconfdir) ] || mkdir -p $(pp)$(sysconfdir)
  	-chmod 755 $(pp)$(sysconfdir)
 -	-[ -d $(pp)$(datadir)/doc ] || mkdir -p $(pp)$(datadir)/doc
 -	-chmod 755 $(pp)$(datadir)/doc
 -	-[ -d $(pp)$(datadir)/doc/javadoc ] || mkdir -p $(pp)$(datadir)/doc/javadoc
 -	-chmod 755 $(pp)$(datadir)/doc/javadoc
+-	-[ ! -d $(pp)$(datadir)/doc/javadoc/dklibsj ] || rm -fr $(pp)$(datadir)/doc/javadoc/dklibsj
 -	-[ -d $(pp)$(datadir)/doc/javadoc/dklibsj ] || mkdir -p $(pp)$(datadir)/doc/javadoc/dklibsj
 -	-chmod 755 $(pp)$(datadir)/doc/javadoc/dklibsj
 -	-[ -d $(pp)$(datadir)/doc/javadoc/TraceGUI ] || mkdir -p $(pp)$(datadir)/doc/javadoc/TraceGUI
@@ -81,7 +88,7 @@
  	chmod 644 *.so
  	tar cf - *.so | (cd $(pp)$(libdir) ; tar xf -)
  	-[ ! -f $(pp)$(libdir)/libdklatsup.so.$(SOVERS) ] || rm -f $(pp)$(libdir)/libdklatsup.so.$(SOVERS)
-@@ -196,39 +169,57 @@
+@@ -198,39 +171,57 @@
  	-[ ! -f $(pp)$(libdir)/libdkfigw.so ] || rm -f $(pp)$(libdir)/libdkfigw.so
  	cp libdklatsup.so.$(SOVERS) $(pp)$(libdir)/libdklatsup.so.$(SOVERS)
  	( cd $(pp)$(libdir); ln -sf libdklatsup.so.$(SOVERS) libdklatsup.so )
@@ -139,7 +146,7 @@
  	chmod 644 $(pp)$(libdir)/libdkfigw.so
  	chmod 644 *.h
  	mv config.h config.h.do-not-install
-@@ -247,24 +238,12 @@
+@@ -249,27 +240,10 @@
  	chmod 755 $(pp)$(bindir)/bifconf
  	cp jhelp $(pp)$(bindir)/jhelp
  	chmod 755 $(pp)$(bindir)/jhelp
@@ -149,15 +156,18 @@
 -	chmod 755 $(pp)$(bindir)/tracegui.jar
 -	cp dklibsj.jar $(pp)$(bindir)/dklibsj.jar
 -	chmod 755  $(pp)$(bindir)/dklibsj.jar
+-	cp wdklibsj.jar $(pp)$(bindir)/wdklibsj.jar
+-	chmod 755 $(pp)$(bindir)/wdklibsj.jar
  	cp dkpref $(pp)$(bindir)/dkpref
  	chmod 755 $(pp)$(bindir)/dkpref
- 	-cp appdefaults $(pp)$(scd)/appdefaults.sample
- 	-[ -f $(pp)$(scd)/appdefaults ] || cp appdefaults $(pp)$(scd)/appdefaults
+-	-cp appdefaults $(pp)$(scd)/appdefaults.sample
+-	-[ -f $(pp)$(scd)/appdefaults ] || cp appdefaults $(pp)$(scd)/appdefaults
 -	-(cd man; tar cf - ./*) | (cd $(pp)$(mandir) ; tar xf -)
  	-(cd share; tar cf - ./*) | (cd $(pp)$(datadir) ; tar xf -)
--	-(cd Java/dklibsj/src; tar cf - ./dirk_krause) | (cd $(pp)$(libdir)/java/src/dklibsj; tar xf -)
--	-(cd Java/dklibsj/doc; tar cf - .) | (cd $(pp)$(datadir)/doc/javadoc/dklibsj && tar xf -)
--	-(cd Java/TraceGUI/doc; tar cf - .) | (cd $(pp)$(datadir)/doc/javadoc/TraceGUI && tar xf -)
+-	-(cd Java/src; tar cf - ./dirk_krause) | (cd $(pp)$(libdir)/java/src/dklibsj; tar xf -)
+-	-(cd Java/loc; tar cf - .) | (cd $(pp)$(libdir)/java/src/dklibsj/loc; tar xf -)
+-	-(cd Java/doc; tar cf - .) | (cd $(pp)$(datadir)/doc/javadoc && tar xf -)
+-	-(cd Java/doc/traceccgui; tar cf - .) | (cd $(pp)$(datadir)/doc/javadoc/TraceGUI && tar xf -)
 -	-[ -d $(pp)$(libdir)/java/doc/dklibsj ] || ln -s $(pp)$(datadir)/doc/javadoc/dklibsj $(pp)$(libdir)/java/doc/dklibsj
  	ldconfig
 -	echo Documentation was installed in $(pp)$(datadir)/doc/dklibs
diff --git a/devel/dklibs/pkg-plist b/devel/dklibs/pkg-plist
index d92a48e86a4e..7014dbd29689 100644
--- a/devel/dklibs/pkg-plist
+++ b/devel/dklibs/pkg-plist
@@ -4,8 +4,6 @@ bin/jhelp
 bin/stc
 bin/tracecc
 bin/trana
-%%ETCDIR%%/appdefaults
-%%ETCDIR%%/appdefaults.sample
 include/dk.h
 include/dkapp.h
 include/dkbf.h
@@ -48,31 +46,31 @@ include/tracecc.h
 include/traceco.h
 lib/libdkappr.so
 lib/libdkappr.so.1
-lib/libdkappr.so.1.26
+lib/libdkappr.so.1.27
 lib/libdkbif.so
 lib/libdkbif.so.1
-lib/libdkbif.so.1.26
+lib/libdkbif.so.1.27
 lib/libdkc.so
 lib/libdkc.so.1
-lib/libdkc.so.1.26
+lib/libdkc.so.1.27
 lib/libdkfigw.so
 lib/libdkfigw.so.1
-lib/libdkfigw.so.1.26
+lib/libdkfigw.so.1.27
 lib/libdklatsup.so
 lib/libdklatsup.so.1
-lib/libdklatsup.so.1.26
+lib/libdklatsup.so.1.27
 lib/libdknet.so
 lib/libdknet.so.1
-lib/libdknet.so.1.26
+lib/libdknet.so.1.27
 lib/libdkport.so
 lib/libdkport.so.1
-lib/libdkport.so.1.26
+lib/libdkport.so.1.27
 lib/libdksdbi.so
 lib/libdksdbi.so.1
-lib/libdksdbi.so.1.26
+lib/libdksdbi.so.1.27
 lib/libdktrace.so
 lib/libdktrace.so.1
-lib/libdktrace.so.1.26
+lib/libdktrace.so.1.27
 %%DATADIR%%/cp.850
 %%DATADIR%%/de/dkapp.stt
 %%DATADIR%%/de/dkappd.stt
@@ -140,6 +138,7 @@ lib/libdktrace.so.1.26
 %%PORTDOCS%%%%DOCSDIR%%/Run.png
 %%PORTDOCS%%%%DOCSDIR%%/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/dklibs.pdf
+%%PORTDOCS%%%%DOCSDIR%%/dklibsj.html
 %%PORTDOCS%%%%DOCSDIR%%/download.html
 %%PORTDOCS%%%%DOCSDIR%%/enc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/examples.html
@@ -172,6 +171,8 @@ lib/libdktrace.so.1.26
 %%PORTDOCS%%%%DOCSDIR%%/sc17.png
 %%PORTDOCS%%%%DOCSDIR%%/sc18.png
 %%PORTDOCS%%%%DOCSDIR%%/sc19.png
+%%PORTDOCS%%%%DOCSDIR%%/sc20.png
+%%PORTDOCS%%%%DOCSDIR%%/sc21.png
 %%PORTDOCS%%%%DOCSDIR%%/search.html
 %%PORTDOCS%%%%DOCSDIR%%/security.html
 %%PORTDOCS%%%%DOCSDIR%%/sflogo.png
@@ -196,7 +197,11 @@ lib/libdktrace.so.1.26
 %%PORTDOCS%%%%DOCSDIR%%/w32sc10.png
 %%PORTDOCS%%%%DOCSDIR%%/w32sc11.png
 %%PORTDOCS%%%%DOCSDIR%%/w32sc12.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%
+@unexec if cmp -s %D/etc/dklibs/appdefaults.sample %D/etc/dklibs/appdefaults; then rm -f %D/etc/dklibs/appdefaults; fi
+%%ETCDIR%%/appdefaults.sample
+@exec if [ ! -f %D/etc/dklibs/appdefaults ] ; then cp -p %D/%F %B/appdefaults; fi
+@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/utf-8
 @dirrm %%DATADIR%%/uc2lat-t/00/00
 @dirrm %%DATADIR%%/uc2lat-t/00