ports/145875: [UPDATE] devel/dklibs: update to 1.27.0

Takefu takefu at airport.fm
Tue Apr 20 10:00:10 UTC 2010


>Number:         145875
>Category:       ports
>Synopsis:       [UPDATE] devel/dklibs: update to 1.27.0
>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:   Tue Apr 20 10:00:08 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Takefu
>Release:        
>Organization:
FOX Amateur Radio Club
>Environment:
>Description:
update to 1.26.0 -> 1.27.0

>How-To-Repeat:
>Fix:

--- dklibs.diff begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/dklibs/Makefile dklibs/Makefile
--- /usr/ports/devel/dklibs/Makefile	2010-04-06 09:12:54.000000000 +0900
+++ dklibs/Makefile	2010-04-20 18:44:53.000000000 +0900
@@ -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 @@
 		-I${BDB_INCLUDE_DIR}

 CONFIGURE_ARGS+=	--datadir=${DATADIR} \
+			--datarootdir=${DATADIR} \
 			--sysconfdir=${ETCDIR}

 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
diff -ruN --exclude=CVS /usr/ports/devel/dklibs/distinfo dklibs/distinfo
--- /usr/ports/devel/dklibs/distinfo	2010-02-09 00:05:15.000000000 +0900
+++ dklibs/distinfo	2010-04-20 16:48:53.000000000 +0900
@@ -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 -ruN --exclude=CVS /usr/ports/devel/dklibs/files/patch-Makefile-shared-linux.in dklibs/files/patch-Makefile-shared-linux.in
--- /usr/ports/devel/dklibs/files/patch-Makefile-shared-linux.in	2010-02-09 00:05:15.000000000 +0900
+++ dklibs/files/patch-Makefile-shared-linux.in	2010-04-20 18:23:32.000000000 +0900
@@ -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 21:44:58.000000000 +0900
++++ Makefile-shared-linux.in	2010-04-20 18:23:22.000000000 +0900
 @@ -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,18 @@
  	chmod 755 share/stc
  	chmod 755 share/tracecc
  	chmod 755 share/trana
-@@ -119,12 +116,6 @@
+@@ -120,10 +117,6 @@
  	find share -type f -exec chmod 644 {} \;
  	cp appdefaults.sample appdefaults
  	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 {} \;
+-	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,35 +140,14 @@
  install:	all
  	-[ -d $(pp)$(libdir) ] || mkdir -p $(pp)$(libdir)
  	-chmod 755 $(pp)$(libdir)
@@ -56,7 +54,9 @@
 -	-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
@@ -74,6 +74,7 @@
 -	-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 +82,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 +170,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 +140,7 @@
  	chmod 644 $(pp)$(libdir)/libdkfigw.so
  	chmod 644 *.h
  	mv config.h config.h.do-not-install
-@@ -247,24 +238,12 @@
+@@ -249,27 +239,12 @@
  	chmod 755 $(pp)$(bindir)/bifconf
  	cp jhelp $(pp)$(bindir)/jhelp
  	chmod 755 $(pp)$(bindir)/jhelp
@@ -149,18 +150,30 @@
 -	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
 -	-(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


  PORTOBJ1=	dkslsupp.o dkma.o dksf.o dkstrdc.o dkstr.o dkenc.o
+@@ -409,8 +384,4 @@
+ 	$(LINK) -o rwperlmk rwperlmk.o
+ 	chmod 755 rwperlmk
+
+-java-progs:
+-	cd Java && ./build
+-
+-VERSNUMB= -DVERSNUMB=\"1.26.0\"
+ VERSNUMB= -DVERSNUMB=\"1.27.0\"
diff -ruN --exclude=CVS /usr/ports/devel/dklibs/pkg-plist dklibs/pkg-plist
--- /usr/ports/devel/dklibs/pkg-plist	2010-02-09 00:05:15.000000000 +0900
+++ dklibs/pkg-plist	2010-04-20 18:12:55.000000000 +0900
@@ -48,31 +48,31 @@
 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
@@ -134,6 +134,9 @@
 %%DATADIR%%/utf-8/dkapp.stt
 %%DATADIR%%/utf-8/dkappd.stt
 %%DATADIR%%/utf-8/dkappe.stt
+%%PORTDOCS%%%%DOCSDIR%%/dklibsj.html
+%%PORTDOCS%%%%DOCSDIR%%/sc20.png
+%%PORTDOCS%%%%DOCSDIR%%/sc21.png
 %%PORTDOCS%%%%DOCSDIR%%/ChooseDirectory.png
 %%PORTDOCS%%%%DOCSDIR%%/Exit.png
 %%PORTDOCS%%%%DOCSDIR%%/Options.png
--- dklibs-1.27.0.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list