libraries/cdk: Miscellaneous cleanups and fixes.

Removed stale patch file; fixed doc dir and permissions.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
This commit is contained in:
dsomero 2012-09-08 08:46:27 -04:00 committed by Robby Workman
parent ce1ae69a08
commit a02a867b74
2 changed files with 7 additions and 39 deletions

View file

@ -1,33 +0,0 @@
--- Makefile.in.orig 2008-10-31 00:40:47.000000000 +0100
+++ Makefile.in 2009-02-02 19:14:59.892008198 +0100
@@ -267,7 +267,7 @@
all cdklib :: $(DEFAULT)
$(CDKLIB) :: $(OBJECTS)
- @echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT)
+ @echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT) $(LIBS)
@$(RANLIB) $@
cdkshlib $(CDKSHLIB) :: $(CDKSHOBJS)
--- aclocal.m4.orig 2009-02-02 19:13:54.256006211 +0100
+++ aclocal.m4 2009-02-02 19:14:39.332007971 +0100
@@ -2425,7 +2425,7 @@
AC_MSG_ERROR(Cannot find libtool)
fi
])dnl
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LDFLAGS} ${LIBTOOL_OPTS} -o'
LIB_OBJECT='${OBJECTS:.o=.lo}'
LIB_SUFFIX=.la
LIB_CLEAN='${LIBTOOL} --mode=clean'
--- configure.orig 2009-02-02 19:30:01.000000000 +0100
+++ configure 2009-02-02 19:30:50.000000000 +0100
@@ -3869,7 +3869,7 @@
echo "$as_me: error: Cannot find libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LDFLAGS} ${LIBTOOL_OPTS} -o'
LIB_OBJECT='${OBJECTS:.o=.lo}'
LIB_SUFFIX=.la
LIB_CLEAN='${LIBTOOL} --mode=clean'

View file

@ -6,7 +6,7 @@
PRGNAM=cdk
VERSION=${VERSION:-5.0_20110517}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -56,6 +56,8 @@ CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--with-ncursesw \
--with-x \
@ -64,7 +66,7 @@ CXXFLAGS="$SLKCFLAGS" \
--build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
make install DESTDIR=$PKG DOCUMENT_DIR=$PKG/usr/doc/$PRGNAM-$VERSION
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@ -72,10 +74,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
CHANGES COPYING EXPANDING INSTALL NOTES README TODO \
$PKG/usr/doc/$PRGNAM-$VERSION
# Fix permissions on this file.
chmod +x $PKG/usr/bin/cdk5-config
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install