ports/143545: [PATCH] devel/dklibs Update to 1.26.0, take maintainership
Rob Farmer
rfarmer at predatorlabs.net
Thu Feb 4 10:40:01 UTC 2010
>Number: 143545
>Category: ports
>Synopsis: [PATCH] devel/dklibs Update to 1.26.0, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 04 10:40:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Rob Farmer
>Release: 9.0-CURRENT
>Organization:
>Environment:
FreeBSD coretwo.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r203366: Mon Feb 1 17:42:33 PST 2010 rfarmer at coretwo.predatorlabs.net:/usr/obj/usr/src/sys/CORETWO amd64
>Description:
* Update to 1.26.0
* Take maintainership
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/dklibs/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 27 Jan 2010 13:19:18 -0000 1.3
+++ Makefile 4 Feb 2010 10:10:57 -0000
@@ -6,11 +6,11 @@
#
PORTNAME= dklibs
-PORTVERSION= 1.23.1
+PORTVERSION= 1.26.0
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= rfarmer at predatorlabs.net
COMMENT= A set of libraries by Dirk Krause
LIB_DEPENDS= png:${PORTSDIR}/graphics/png \
@@ -18,6 +18,8 @@
tiff:${PORTSDIR}/graphics/tiff \
netpbm:${PORTSDIR}/graphics/netpbm
+MAKE_JOBS_SAFE= yes
+
USE_BDB= 43+
USE_OPENSSL_BASE= yes
@@ -37,12 +39,6 @@
# Need -lc for RELENG_6 support.
MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -L${BDB_LIB_DIR} -lc"
-VERSION_PLUGIN= 1.23
-MAJOR_VERSION= 1
-
-PLIST_SUB+= VERSION_PLUGIN="${VERSION_PLUGIN}" \
- MAJOR_VERSION="${MAJOR_VERSION}"
-
.if !defined(NO_INSTALL_MANPAGES)
MAN3= dk.3 \
dkapp.3 \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/dklibs/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 1 Aug 2009 21:49:30 -0000 1.1
+++ distinfo 4 Feb 2010 08:38:35 -0000
@@ -1,3 +1,3 @@
-MD5 (dklibs-1.23.1.tar.gz) = 5d6b38ebfc50aa2983684537dd30dceb
-SHA256 (dklibs-1.23.1.tar.gz) = 9a60b06c4069e4fed37d5a41b58e35233202bfed9df26c09d8a6c18e11bd3a84
-SIZE (dklibs-1.23.1.tar.gz) = 4281544
+MD5 (dklibs-1.26.0.tar.gz) = 1f0c3f3a3d60d0b7ff6ddd0165b54a88
+SHA256 (dklibs-1.26.0.tar.gz) = 234f7047106d133eb6f955a7d9b46987792c5609b0d9603fa3c4227ee573bfd3
+SIZE (dklibs-1.26.0.tar.gz) = 5164144
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/dklibs/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 1 Aug 2009 21:49:30 -0000 1.1
+++ pkg-plist 4 Feb 2010 09:12:20 -0000
@@ -4,6 +4,8 @@
bin/stc
bin/tracecc
bin/trana
+%%ETCDIR%%/appdefaults
+%%ETCDIR%%/appdefaults.sample
include/dk.h
include/dkapp.h
include/dkbf.h
@@ -15,9 +17,11 @@
include/dkcp.h
include/dkenc.h
include/dkerror.h
+include/dkfigw.h
include/dkfont.h
include/dkl2l.h
include/dkle.h
+include/dklibs-version.h
include/dklic.h
include/dklogc.h
include/dkma.h
@@ -43,185 +47,186 @@
include/tracecc.h
include/traceco.h
lib/libdkappr.so
-lib/libdkappr.so.%%VERSION_PLUGIN%%
-lib/libdkappr.so.%%MAJOR_VERSION%%
+lib/libdkappr.so.1
+lib/libdkappr.so.1.26
lib/libdkbif.so
-lib/libdkbif.so.%%VERSION_PLUGIN%%
-lib/libdkbif.so.%%MAJOR_VERSION%%
+lib/libdkbif.so.1
+lib/libdkbif.so.1.26
lib/libdkc.so
-lib/libdkc.so.%%VERSION_PLUGIN%%
-lib/libdkc.so.%%MAJOR_VERSION%%
+lib/libdkc.so.1
+lib/libdkc.so.1.26
+lib/libdkfigw.so
+lib/libdkfigw.so.1
+lib/libdkfigw.so.1.26
lib/libdklatsup.so
-lib/libdklatsup.so.%%VERSION_PLUGIN%%
-lib/libdklatsup.so.%%MAJOR_VERSION%%
+lib/libdklatsup.so.1
+lib/libdklatsup.so.1.26
lib/libdknet.so
-lib/libdknet.so.%%VERSION_PLUGIN%%
-lib/libdknet.so.%%MAJOR_VERSION%%
+lib/libdknet.so.1
+lib/libdknet.so.1.26
lib/libdkport.so
-lib/libdkport.so.%%VERSION_PLUGIN%%
-lib/libdkport.so.%%MAJOR_VERSION%%
+lib/libdkport.so.1
+lib/libdkport.so.1.26
lib/libdksdbi.so
-lib/libdksdbi.so.%%VERSION_PLUGIN%%
-lib/libdksdbi.so.%%MAJOR_VERSION%%
+lib/libdksdbi.so.1
+lib/libdksdbi.so.1.26
lib/libdktrace.so
-lib/libdktrace.so.%%VERSION_PLUGIN%%
-lib/libdktrace.so.%%MAJOR_VERSION%%
-%%ETCDIR%%/appdefaults
-%%ETCDIR%%/appdefaults.sample
+lib/libdktrace.so.1
+lib/libdktrace.so.1.26
%%DATADIR%%/cp.850
-%%DATADIR%%/de/utf-8/dkapp.stt
-%%DATADIR%%/de/utf-8/dkappd.stt
-%%DATADIR%%/de/utf-8/dkappe.stt
%%DATADIR%%/de/dkapp.stt
%%DATADIR%%/de/dkappd.stt
%%DATADIR%%/de/dkappe.stt
+%%DATADIR%%/de/utf-8/dkapp.stt
+%%DATADIR%%/de/utf-8/dkappd.stt
+%%DATADIR%%/de/utf-8/dkappe.stt
%%DATADIR%%/dkapp.stt
%%DATADIR%%/dkappd.stt
%%DATADIR%%/dkappe.stt
-%%DATADIR%%/dkpref/de/utf-8/dkpref.stt
-%%DATADIR%%/dkpref/de/dkpref.txt
%%DATADIR%%/dkpref/de/dkpref.stt
-%%DATADIR%%/dkpref/en/dkpref.txt
-%%DATADIR%%/dkpref/en/utf-8/dkpref.stt
-%%DATADIR%%/dkpref/en/dkpref.stt
+%%DATADIR%%/dkpref/de/dkpref.txt
+%%DATADIR%%/dkpref/de/utf-8/dkpref.stt
%%DATADIR%%/dkpref/dkpref.stt
%%DATADIR%%/dkpref/dkpref.txt
+%%DATADIR%%/dkpref/en/dkpref.stt
+%%DATADIR%%/dkpref/en/dkpref.txt
+%%DATADIR%%/dkpref/en/utf-8/dkpref.stt
%%DATADIR%%/dkpref/utf-8
-%%DATADIR%%/en/utf-8/dkapp.stt
-%%DATADIR%%/en/utf-8/dkappd.stt
-%%DATADIR%%/en/utf-8/dkappe.stt
%%DATADIR%%/en/dkapp.stt
%%DATADIR%%/en/dkappd.stt
%%DATADIR%%/en/dkappe.stt
-%%DATADIR%%/stc/de/utf-8/stc.stt
-%%DATADIR%%/stc/de/stc.txt
+%%DATADIR%%/en/utf-8/dkapp.stt
+%%DATADIR%%/en/utf-8/dkappd.stt
+%%DATADIR%%/en/utf-8/dkappe.stt
%%DATADIR%%/stc/de/stc.stt
-%%DATADIR%%/stc/en/utf-8/stc.stt
-%%DATADIR%%/stc/en/stc.txt
+%%DATADIR%%/stc/de/stc.txt
+%%DATADIR%%/stc/de/utf-8/stc.stt
%%DATADIR%%/stc/en/stc.stt
-%%DATADIR%%/stc/stc.txt
+%%DATADIR%%/stc/en/stc.txt
+%%DATADIR%%/stc/en/utf-8/stc.stt
%%DATADIR%%/stc/stc.stt
+%%DATADIR%%/stc/stc.txt
+%%DATADIR%%/tracecc/de/tracecc.stt
%%DATADIR%%/tracecc/de/tracecc2.txt
+%%DATADIR%%/tracecc/de/tracecca.stt
%%DATADIR%%/tracecc/de/utf-8/tracecc.stt
%%DATADIR%%/tracecc/de/utf-8/tracecca.stt
-%%DATADIR%%/tracecc/de/tracecc.stt
-%%DATADIR%%/tracecc/de/tracecca.stt
+%%DATADIR%%/tracecc/dktrace/dktrace.c
+%%DATADIR%%/tracecc/dktrace/dktrace.h
+%%DATADIR%%/tracecc/en/tracecc.stt
%%DATADIR%%/tracecc/en/tracecc2.txt
+%%DATADIR%%/tracecc/en/tracecca.stt
%%DATADIR%%/tracecc/en/utf-8/tracecc.stt
%%DATADIR%%/tracecc/en/utf-8/tracecca.stt
-%%DATADIR%%/tracecc/en/tracecc.stt
-%%DATADIR%%/tracecc/en/tracecca.stt
-%%DATADIR%%/tracecc/dktrace/dktrace.c
-%%DATADIR%%/tracecc/dktrace/dktrace.h
-%%DATADIR%%/tracecc/utf-8/tracecc.stt
-%%DATADIR%%/tracecc/utf-8/tracecca.stt
%%DATADIR%%/tracecc/tracecc.stt
%%DATADIR%%/tracecc/tracecca.stt
+%%DATADIR%%/tracecc/utf-8/tracecc.stt
+%%DATADIR%%/tracecc/utf-8/tracecca.stt
+%%DATADIR%%/trana/de/trana.stt
%%DATADIR%%/trana/de/trana.txt
%%DATADIR%%/trana/de/utf-8/trana.stt
-%%DATADIR%%/trana/de/trana.stt
-%%DATADIR%%/trana/en/utf-8/trana.stt
%%DATADIR%%/trana/en/trana.stt
-%%DATADIR%%/trana/utf-8/trana.stt
+%%DATADIR%%/trana/en/utf-8/trana.stt
%%DATADIR%%/trana/trana.stt
+%%DATADIR%%/trana/utf-8/trana.stt
%%DATADIR%%/uc2lat-t/00/00/00.dat
%%DATADIR%%/uc2lat-t/00/00/01.dat
%%DATADIR%%/utf-8/dkapp.stt
%%DATADIR%%/utf-8/dkappd.stt
%%DATADIR%%/utf-8/dkappe.stt
-%%PORTDOCS%%%%DOCSDIR%%/tracecc.pdf
-%%PORTDOCS%%%%DOCSDIR%%/enc.pdf
-%%PORTDOCS%%%%DOCSDIR%%/dklibs.pdf
%%PORTDOCS%%%%DOCSDIR%%/ChooseDirectory.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc11.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc10.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc09.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc08.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc07.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc06.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc05.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc04.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc03.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc02.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc01.png
-%%PORTDOCS%%%%DOCSDIR%%/tracegui.png
-%%PORTDOCS%%%%DOCSDIR%%/sflogo.png
-%%PORTDOCS%%%%DOCSDIR%%/sc19.png
-%%PORTDOCS%%%%DOCSDIR%%/sc18.png
-%%PORTDOCS%%%%DOCSDIR%%/sc17.png
-%%PORTDOCS%%%%DOCSDIR%%/sc16.png
-%%PORTDOCS%%%%DOCSDIR%%/sc15.png
-%%PORTDOCS%%%%DOCSDIR%%/sc14.png
-%%PORTDOCS%%%%DOCSDIR%%/sc13.png
-%%PORTDOCS%%%%DOCSDIR%%/sc12.png
-%%PORTDOCS%%%%DOCSDIR%%/sc11.png
-%%PORTDOCS%%%%DOCSDIR%%/sc10.png
-%%PORTDOCS%%%%DOCSDIR%%/sc09.png
-%%PORTDOCS%%%%DOCSDIR%%/sc08.png
-%%PORTDOCS%%%%DOCSDIR%%/sc07.png
-%%PORTDOCS%%%%DOCSDIR%%/sc06.png
-%%PORTDOCS%%%%DOCSDIR%%/sc05.png
-%%PORTDOCS%%%%DOCSDIR%%/sc04.png
-%%PORTDOCS%%%%DOCSDIR%%/sc03.png
-%%PORTDOCS%%%%DOCSDIR%%/sc02.png
-%%PORTDOCS%%%%DOCSDIR%%/sc01.png
-%%PORTDOCS%%%%DOCSDIR%%/Run.png
-%%PORTDOCS%%%%DOCSDIR%%/Options.png
%%PORTDOCS%%%%DOCSDIR%%/Exit.png
-%%PORTDOCS%%%%DOCSDIR%%/w32sc12.png
-%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/Options.png
+%%PORTDOCS%%%%DOCSDIR%%/Run.png
%%PORTDOCS%%%%DOCSDIR%%/changes.html
-%%PORTDOCS%%%%DOCSDIR%%/tuto.html
-%%PORTDOCS%%%%DOCSDIR%%/tracegui.html
-%%PORTDOCS%%%%DOCSDIR%%/tracecc.html
-%%PORTDOCS%%%%DOCSDIR%%/stc.html
-%%PORTDOCS%%%%DOCSDIR%%/sort.html
-%%PORTDOCS%%%%DOCSDIR%%/security.html
-%%PORTDOCS%%%%DOCSDIR%%/search.html
-%%PORTDOCS%%%%DOCSDIR%%/projects.html
-%%PORTDOCS%%%%DOCSDIR%%/prefs.html
-%%PORTDOCS%%%%DOCSDIR%%/latex.html
-%%PORTDOCS%%%%DOCSDIR%%/io.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/inst_w32.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/gui.html
-%%PORTDOCS%%%%DOCSDIR%%/font.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/dklibs.pdf
%%PORTDOCS%%%%DOCSDIR%%/download.html
+%%PORTDOCS%%%%DOCSDIR%%/enc.pdf
+%%PORTDOCS%%%%DOCSDIR%%/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/font.html
+%%PORTDOCS%%%%DOCSDIR%%/gui.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/inst_w32.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/io.html
+%%PORTDOCS%%%%DOCSDIR%%/latex.html
+%%PORTDOCS%%%%DOCSDIR%%/prefs.html
+%%PORTDOCS%%%%DOCSDIR%%/projects.html
+%%PORTDOCS%%%%DOCSDIR%%/sc01.png
+%%PORTDOCS%%%%DOCSDIR%%/sc02.png
+%%PORTDOCS%%%%DOCSDIR%%/sc03.png
+%%PORTDOCS%%%%DOCSDIR%%/sc04.png
+%%PORTDOCS%%%%DOCSDIR%%/sc05.png
+%%PORTDOCS%%%%DOCSDIR%%/sc06.png
+%%PORTDOCS%%%%DOCSDIR%%/sc07.png
+%%PORTDOCS%%%%DOCSDIR%%/sc08.png
+%%PORTDOCS%%%%DOCSDIR%%/sc09.png
+%%PORTDOCS%%%%DOCSDIR%%/sc10.png
+%%PORTDOCS%%%%DOCSDIR%%/sc11.png
+%%PORTDOCS%%%%DOCSDIR%%/sc12.png
+%%PORTDOCS%%%%DOCSDIR%%/sc13.png
+%%PORTDOCS%%%%DOCSDIR%%/sc14.png
+%%PORTDOCS%%%%DOCSDIR%%/sc15.png
+%%PORTDOCS%%%%DOCSDIR%%/sc16.png
+%%PORTDOCS%%%%DOCSDIR%%/sc17.png
+%%PORTDOCS%%%%DOCSDIR%%/sc18.png
+%%PORTDOCS%%%%DOCSDIR%%/sc19.png
+%%PORTDOCS%%%%DOCSDIR%%/search.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sflogo.png
+%%PORTDOCS%%%%DOCSDIR%%/sort.html
+%%PORTDOCS%%%%DOCSDIR%%/stc.html
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/tracecc.html
+%%PORTDOCS%%%%DOCSDIR%%/tracecc.pdf
+%%PORTDOCS%%%%DOCSDIR%%/tracegui.html
+%%PORTDOCS%%%%DOCSDIR%%/tracegui.png
+%%PORTDOCS%%%%DOCSDIR%%/tuto.html
%%PORTDOCS%%%%DOCSDIR%%/usage.html
- at dirrm %%ETCDIR%%
- at dirrm %%DATADIR%%/de/utf-8
- at dirrm %%DATADIR%%/de
+%%PORTDOCS%%%%DOCSDIR%%/w32sc01.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc02.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc03.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc04.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc05.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc06.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc07.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc08.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc09.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc10.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc11.png
+%%PORTDOCS%%%%DOCSDIR%%/w32sc12.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%DATADIR%%/utf-8
+ at dirrm %%DATADIR%%/uc2lat-t/00/00
+ at dirrm %%DATADIR%%/uc2lat-t/00
+ at dirrm %%DATADIR%%/uc2lat-t
+ at dirrm %%DATADIR%%/trana/utf-8
+ at dirrm %%DATADIR%%/trana/en/utf-8
+ at dirrm %%DATADIR%%/trana/en
+ at dirrm %%DATADIR%%/trana/de/utf-8
+ at dirrm %%DATADIR%%/trana/de
+ at dirrm %%DATADIR%%/trana
+ at dirrm %%DATADIR%%/tracecc/utf-8
+ at dirrm %%DATADIR%%/tracecc/en/utf-8
+ at dirrm %%DATADIR%%/tracecc/en
+ at dirrm %%DATADIR%%/tracecc/dktrace
+ at dirrm %%DATADIR%%/tracecc/de/utf-8
+ at dirrm %%DATADIR%%/tracecc/de
+ at dirrm %%DATADIR%%/tracecc
+ at dirrm %%DATADIR%%/stc/en/utf-8
+ at dirrm %%DATADIR%%/stc/en
+ at dirrm %%DATADIR%%/stc/de/utf-8
+ at dirrm %%DATADIR%%/stc/de
+ at dirrm %%DATADIR%%/stc
+ at dirrm %%DATADIR%%/en/utf-8
+ at dirrm %%DATADIR%%/en
@dirrm %%DATADIR%%/dkpref/en/utf-8
@dirrm %%DATADIR%%/dkpref/en
@dirrm %%DATADIR%%/dkpref/de/utf-8
@dirrm %%DATADIR%%/dkpref/de
@dirrm %%DATADIR%%/dkpref
- at dirrm %%DATADIR%%/en/utf-8
- at dirrm %%DATADIR%%/en
- at dirrm %%DATADIR%%/stc/de/utf-8
- at dirrm %%DATADIR%%/stc/de
- at dirrm %%DATADIR%%/stc/en/utf-8
- at dirrm %%DATADIR%%/stc/en
- at dirrm %%DATADIR%%/stc
- at dirrm %%DATADIR%%/tracecc/dktrace
- at dirrm %%DATADIR%%/tracecc/de/utf-8
- at dirrm %%DATADIR%%/tracecc/de
- at dirrm %%DATADIR%%/tracecc/en/utf-8
- at dirrm %%DATADIR%%/tracecc/en
- at dirrm %%DATADIR%%/tracecc/utf-8
- at dirrm %%DATADIR%%/tracecc
- at dirrm %%DATADIR%%/trana/de/utf-8
- at dirrm %%DATADIR%%/trana/de
- at dirrm %%DATADIR%%/trana/en/utf-8
- at dirrm %%DATADIR%%/trana/en
- at dirrm %%DATADIR%%/trana/utf-8
- at dirrm %%DATADIR%%/trana
- at dirrm %%DATADIR%%/utf-8
- at dirrm %%DATADIR%%/uc2lat-t/00/00
- at dirrm %%DATADIR%%/uc2lat-t/00
- at dirrm %%DATADIR%%/uc2lat-t
+ at dirrm %%DATADIR%%/de/utf-8
+ at dirrm %%DATADIR%%/de
@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%ETCDIR%%
Index: files/patch-Makefile-shared-linux.in
===================================================================
RCS file: /home/ncvs/ports/devel/dklibs/files/patch-Makefile-shared-linux.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile-shared-linux.in
--- files/patch-Makefile-shared-linux.in 1 Aug 2009 21:49:30 -0000 1.1
+++ files/patch-Makefile-shared-linux.in 4 Feb 2010 10:08:35 -0000
@@ -1,8 +1,8 @@
---- Makefile-shared-linux.in.orig 2009-02-16 08:10:43.000000000 -0800
-+++ Makefile-shared-linux.in 2009-07-19 14:41:01.000000000 -0700
+--- 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
@@ -1,5 +1,6 @@
- SOVERS=1.23
+ SOVERS=1.26
+MAJORVERS=1
# The build prefix
@@ -16,7 +16,7 @@
mandir = @mandir@
includedir = @includedir@
srcdir = @srcdir@
-@@ -54,18 +55,14 @@
+@@ -74,18 +75,14 @@
all: $(progs) $(libs) stc-static
-[ -d lib ] || mkdir lib
-[ -d share ] || mkdir share
@@ -35,17 +35,7 @@
chmod 755 share/stc
chmod 755 share/tracecc
chmod 755 share/trana
-@@ -92,22 +89,12 @@
- -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
-- cp DOCU/*.pdf share/doc/dklibs
-- cp DOCU/*.png share/doc/dklibs
-- cp DOCU/*.css share/doc/dklibs
-- cp DOCU/*.html share/doc/dklibs
- find lib -type d -exec chmod 755 {} \;
- find lib -type f -exec chmod 644 {} \;
- find share -type d -exec chmod 755 {} \;
+@@ -119,12 +116,6 @@
find share -type f -exec chmod 644 {} \;
cp appdefaults.sample appdefaults
chmod 755 showdd
@@ -57,8 +47,22 @@
- find Java/TraceGUI/doc -type f -exec chmod ugo+r {} \;
./showdd $(datadir) >> appdefaults
touch all
-
-@@ -135,18 +122,8 @@
+ chmod 755 rwperlmk.sh
+@@ -148,32 +139,14 @@
+ install: all
+ -[ -d $(pp)$(libdir) ] || mkdir -p $(pp)$(libdir)
+ -chmod 755 $(pp)$(libdir)
+- -[ -d $(pp)$(libdir)/java ] || mkdir -p $(pp)$(libdir)/java
+- -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 ] || mkdir -p $(pp)$(libdir)/java/src/dklibsj
+- -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)
-[ -d $(pp)$(includedir) ] || mkdir -p $(pp)$(includedir)
-chmod 755 $(pp)$(includedir)
@@ -77,33 +81,35 @@
chmod 644 *.so
tar cf - *.so | (cd $(pp)$(libdir) ; tar xf -)
-[ ! -f $(pp)$(libdir)/libdklatsup.so.$(SOVERS) ] || rm -f $(pp)$(libdir)/libdklatsup.so.$(SOVERS)
-@@ -162,36 +139,52 @@
- -[ ! -f $(pp)$(libdir)/libdktrace.so.$(SOVERS) ] || rm -f $(pp)$(libdir)/libdktrace.so.$(SOVERS)
- -[ ! -f $(pp)$(libdir)/libdktrace.so ] || rm -f $(pp)$(libdir)/libdktrace.so
+@@ -196,39 +169,57 @@
+ -[ ! -f $(pp)$(libdir)/libdkfigw.so ] || rm -f $(pp)$(libdir)/libdkfigw.so
cp libdklatsup.so.$(SOVERS) $(pp)$(libdir)/libdklatsup.so.$(SOVERS)
-+ ln -sf $(libdir)/libdklatsup.so.$(SOVERS) $(pp)$(libdir)/libdklatsup.so.$(MAJORVERS)
- ln -sf $(libdir)/libdklatsup.so.$(SOVERS) $(pp)$(libdir)/libdklatsup.so
+ ( cd $(pp)$(libdir); ln -sf libdklatsup.so.$(SOVERS) libdklatsup.so )
++ ( cd $(pp)$(libdir); ln -sf libdklatsup.so.$(SOVERS) libdklatsup.so.$(MAJORVERS) )
cp libdkport.so.$(SOVERS) $(pp)$(libdir)/libdkport.so.$(SOVERS)
-+ ln -sf $(libdir)/libdkport.so.$(SOVERS) $(pp)$(libdir)/libdkport.so.$(MAJORVERS)
- ln -sf $(libdir)/libdkport.so.$(SOVERS) $(pp)$(libdir)/libdkport.so
+ ( cd $(pp)$(libdir); ln -sf libdkport.so.$(SOVERS) libdkport.so )
++ ( cd $(pp)$(libdir); ln -sf libdkport.so.$(SOVERS) libdkport.so.$(MAJORVERS) )
cp libdkc.so.$(SOVERS) $(pp)$(libdir)/libdkc.so.$(SOVERS)
-+ ln -sf $(libdir)/libdkc.so.$(SOVERS) $(pp)$(libdir)/libdkc.so.$(MAJORVERS)
- ln -sf $(libdir)/libdkc.so.$(SOVERS) $(pp)$(libdir)/libdkc.so
+ ( cd $(pp)$(libdir); ln -sf libdkc.so.$(SOVERS) libdkc.so )
++ ( cd $(pp)$(libdir); ln -sf libdkc.so.$(SOVERS) libdkc.so.$(MAJORVERS) )
cp libdkappr.so.$(SOVERS) $(pp)$(libdir)/libdkappr.so.$(SOVERS)
-+ ln -sf $(libdir)/libdkappr.so.$(SOVERS) $(pp)$(libdir)/libdkappr.so.$(MAJORVERS)
- ln -sf $(libdir)/libdkappr.so.$(SOVERS) $(pp)$(libdir)/libdkappr.so
+ ( cd $(pp)$(libdir); ln -sf libdkappr.so.$(SOVERS) libdkappr.so )
++ ( cd $(pp)$(libdir); ln -sf libdkappr.so.$(SOVERS) libdkappr.so.$(MAJORVERS) )
cp libdknet.so.$(SOVERS) $(pp)$(libdir)/libdknet.so.$(SOVERS)
-+ ln -sf $(libdir)/libdknet.so.$(SOVERS) $(pp)$(libdir)/libdknet.so.$(MAJORVERS)
- ln -sf $(libdir)/libdknet.so.$(SOVERS) $(pp)$(libdir)/libdknet.so
+ ( cd $(pp)$(libdir); ln -sf libdknet.so.$(SOVERS) libdknet.so )
++ ( cd $(pp)$(libdir); ln -sf libdknet.so.$(SOVERS) libdknet.so.$(MAJORVERS) )
cp libdktrace.so.$(SOVERS) $(pp)$(libdir)/libdktrace.so.$(SOVERS)
-+ ln -sf $(libdir)/libdktrace.so.$(SOVERS) $(pp)$(libdir)/libdktrace.so.$(MAJORVERS)
- ln -sf $(libdir)/libdktrace.so.$(SOVERS) $(pp)$(libdir)/libdktrace.so
+ ( cd $(pp)$(libdir); ln -sf libdktrace.so.$(SOVERS) libdktrace.so )
++ ( cd $(pp)$(libdir); ln -sf libdktrace.so.$(SOVERS) libdktrace.so.$(MAJORVERS) )
cp libdkbif.so.$(SOVERS) $(pp)$(libdir)/libdkbif.so.$(SOVERS)
-+ ln -sf $(libdir)/libdkbif.so.$(SOVERS) $(pp)$(libdir)/libdkbif.so.$(MAJORVERS)
- ln -sf $(libdir)/libdkbif.so.$(SOVERS) $(pp)$(libdir)/libdkbif.so
+ ( cd $(pp)$(libdir); ln -sf libdkbif.so.$(SOVERS) libdkbif.so )
++ ( cd $(pp)$(libdir); ln -sf libdkbif.so.$(SOVERS) libdkbif.so.$(MAJORVERS) )
cp libdksdbi.so.$(SOVERS) $(pp)$(libdir)/libdksdbi.so.$(SOVERS)
-+ ln -sf $(pp)$(libdir)/libdksdbi.so.$(SOVERS) $(pp)$(libdir)/libdksdbi.so.$(MAJORVERS)
- ln -sf $(pp)$(libdir)/libdksdbi.so.$(SOVERS) $(pp)$(libdir)/libdksdbi.so
+ ( cd $(pp)$(libdir); ln -sf libdksdbi.so.$(SOVERS) libdksdbi.so )
++ ( cd $(pp)$(libdir); ln -sf libdksdbi.so.$(SOVERS) libdksdbi.so.$(MAJORVERS) )
+ cp libdkfigw.so.$(SOVERS) $(pp)$(libdir)/libdkfigw.so.$(SOVERS)
+ ( cd $(pp)$(libdir); ln -sf libdkfigw.so.$(SOVERS) libdkfigw.so )
++ ( cd $(pp)$(libdir); ln -sf libdkfigw.so.$(SOVERS) libdkfigw.so.$(MAJORVERS) )
chmod 644 $(pp)$(libdir)/libdklatsup.so.$(SOVERS)
+ chmod 644 $(pp)$(libdir)/libdklatsup.so.$(MAJORVERS)
chmod 644 $(pp)$(libdir)/libdklatsup.so
@@ -128,9 +134,12 @@
chmod 644 $(pp)$(libdir)/libdksdbi.so.$(SOVERS)
+ chmod 644 $(pp)$(libdir)/libdksdbi.so.$(MAJORVERS)
chmod 644 $(pp)$(libdir)/libdksdbi.so
+ chmod 644 $(pp)$(libdir)/libdkfigw.so.$(SOVERS)
++ chmod 644 $(pp)$(libdir)/libdkfigw.so.$(MAJORVERS)
+ chmod 644 $(pp)$(libdir)/libdkfigw.so
chmod 644 *.h
mv config.h config.h.do-not-install
-@@ -210,22 +203,12 @@
+@@ -247,24 +238,12 @@
chmod 755 $(pp)$(bindir)/bifconf
cp jhelp $(pp)$(bindir)/jhelp
chmod 755 $(pp)$(bindir)/jhelp
@@ -146,8 +155,10 @@
-[ -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 -)
+- -[ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list