Update to 1.4.1. New PLIST, bye-bye *INSTALL scripts (@sample is so cool)

This commit is contained in:
marcm 2004-08-08 17:13:58 +00:00
parent 568e0e2dab
commit 3b277f8bbc
8 changed files with 53 additions and 216 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2004/06/22 03:15:03 marcm Exp $
# $OpenBSD: Makefile,v 1.9 2004/08/08 17:13:58 marcm Exp $
COMMENT= "library for layout and rendering of text"
DISTNAME= pango-1.4.0
DISTNAME= pango-1.4.1
CATEGORIES= devel x11
HOMEPAGE= http://www.gtk.org
@ -32,7 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pango; \
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/pango/
cp -Rp ${WRKINST}/${SYSCONFDIR}/pango/* ${PREFIX}/share/examples/pango/
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (pango-1.4.0.tar.bz2) = 9b5d9a5dcce5b3899d401f9c2cd6873f
RMD160 (pango-1.4.0.tar.bz2) = c955f0edec937e38728c618bcdeddb6b13b8eb81
SHA1 (pango-1.4.0.tar.bz2) = 10ea96cb05e0ada51e1b81f68dd1cad56cdd6a99
MD5 (pango-1.4.1.tar.bz2) = 39868e0da250fd4c00b2970e4eb84389
RMD160 (pango-1.4.1.tar.bz2) = 17225899bf748bfb6c17b12f8fbcc081dc5520a4
SHA1 (pango-1.4.1.tar.bz2) = ffdc4549fa5b52b4c6a9b8b8fecaa7ad3fde83a0

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2004/06/22 03:15:03 marcm Exp $
--- configure.orig 2004-04-01 08:06:37.000000000 -0800
+++ configure 2004-04-01 08:06:59.000000000 -0800
@@ -8375,7 +8375,7 @@ nto-qnx*)
$OpenBSD: patch-configure,v 1.6 2004/08/08 17:13:58 marcm Exp $
--- configure.orig Mon Aug 2 13:16:28 2004
+++ configure Sat Aug 7 16:23:31 2004
@@ -8372,7 +8372,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no

View File

@ -1,36 +1,22 @@
$OpenBSD: patch-ltmain_sh,v 1.4 2004/06/22 03:15:03 marcm Exp $
--- ltmain.sh.orig 2004-02-17 11:55:01.000000000 -0800
+++ ltmain.sh 2004-03-30 22:05:41.000000000 -0800
@@ -1364,6 +1364,17 @@ EOF
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -2014,6 +2025,10 @@ EOF
$OpenBSD: patch-ltmain_sh,v 1.5 2004/08/08 17:13:58 marcm Exp $
--- ltmain.sh.orig Sun Apr 11 19:01:57 2004
+++ ltmain.sh Sat Aug 7 16:23:53 2004
@@ -1857,9 +1857,12 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
+ continue
fi
+ if test "$linkmode" = "lib"; then
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ deplibs="$deplib $deplibs"
continue
;;
+ -pthread)
+ continue
+ ;;
+
%DEPLIBS%)
alldeplibs=yes
continue
@@ -2262,10 +2277,6 @@ EOF
-l*)
@@ -2274,10 +2277,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -39,11 +25,11 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2004/06/22 03:15:03 marcm Exp $
- need_relink=yes
- fi
# This is a shared library
# Warn about portability, can't link against -module's on some systems (darwin)
@@ -5804,40 +5815,6 @@ relink_command=\"$relink_command\""
# Warn about portability, can't link against -module's on
@@ -5827,40 +5826,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
@ -79,6 +65,6 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2004/06/22 03:15:03 marcm Exp $
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit 0
exit $EXIT_SUCCESS
;;

View File

@ -1,55 +0,0 @@
#!/bin/sh
#
# $OpenBSD: DEINSTALL,v 1.2 2003/08/23 19:52:47 marcm Exp $
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
FILES='
pango/pango.modules
pango/pangox.aliases
'
do_notice()
{
echo
echo "+--------------- $1"
echo "| To really remove $1 from your system you should also"
echo "| remove the configuration files from the ${SYSCONFDIR} directory."
echo "| Remove the directory in which the files reside as well if empty."
echo "|"
echo "| If you are planning on installing $1 again in the future"
echo "| you can leave it as it is."
echo "|"
echo "| FYI, the following configuration files belongs to this package:"
echo "|"
for f in ${FILES}; do
echo "| ${SYSCONFDIR}/$f"
done
echo "+--------------- $1"
echo
}
# Verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname DEINSTALL" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
DEINSTALL)
if [ "$PKG_DELETE_EXTRA" != Yes ]; then
do_notice "$1"
fi
;;
*)
echo "usage: $0 distname DEINSTALL" >&2
exit 1
;;
esac
exit 0

View File

@ -1,92 +0,0 @@
#!/bin/sh
#
# $OpenBSD: INSTALL,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
P_NAME=pango
DEST_PFX=${SYSCONFDIR}
SOURCE_PFX=${PREFIX}/share/examples/${P_NAME}
DIRS='pango'
FILES='
pango/pango.modules
pango/pangox.aliases
'
do_post() {
echo
echo "+--------------- ${P_NAME}"
# install dirs if neccesary
for d in ${DIRS}; do
if [ ! -d "${DEST_PFX}/$d" ]; then
install -d ${DEST_PFX}/$d
fi
done
# install or take note of existing config files
for f in ${FILES}; do
if [ -f "${DEST_PFX}/$f" ]; then
OLD_CONFS="${OLD_CONFS} $f"
else
if ! install -m 644 ${SOURCE_PFX}/$f ${DEST_PFX}/$f; then
echo "| ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f"
exit 1
fi
NEW_CONFS="${NEW_CONFS} $f"
fi
done
# print status report
if [ -n "${NEW_CONFS}" ]; then
echo "| The following NEW configuration files have been installed:"
echo "|"
for f in ${NEW_CONFS}; do
echo "| ${DEST_PFX}/$f"
done
fi
if [ -n "${OLD_CONFS}" ]; then
if [ -n "${NEW_CONFS}" ]; then
echo "|"
fi
echo "| The following OLD configuration files was found and have NOT been overwritten:"
echo "| You should however manually compare them to their equivalents in "
echo "|"
echo "| ${SOURCE_PFX}"
echo "|"
echo "| and update your configuration if needed."
echo "|"
for f in ${OLD_CONFS}; do
echo "| ${DEST_PFX}/$f"
done
fi
echo "+--------------- ${P_NAME}"
echo
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
do_post
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

View File

@ -1,4 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2004/06/22 03:15:03 marcm Exp $
@comment $OpenBSD: PFRAG.shared,v 1.7 2004/08/08 17:13:58 marcm Exp $
@lib lib/libpango-1.0.so.400.1
@lib lib/libpangoft2-1.0.so.400.1
@lib lib/libpangox-1.0.so.400.1
@lib lib/libpangoxft-1.0.so.400.1
lib/pango/1.4.0/modules/pango-arabic-fc.so
lib/pango/1.4.0/modules/pango-basic-fc.so
lib/pango/1.4.0/modules/pango-basic-x.so
@ -6,8 +10,3 @@ lib/pango/1.4.0/modules/pango-hangul-fc.so
lib/pango/1.4.0/modules/pango-hebrew-fc.so
lib/pango/1.4.0/modules/pango-indic-fc.so
lib/pango/1.4.0/modules/pango-thai-fc.so
lib/libpango-1.0.so.399.1
lib/libpangoft2-1.0.so.399.1
lib/libpangox-1.0.so.399.1
lib/libpangoxft-1.0.so.399.1
DYNLIBDIR(%D/lib)

View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.8 2004/06/22 03:15:03 marcm Exp $
@comment $OpenBSD: PLIST,v 1.9 2004/08/08 17:13:58 marcm Exp $
bin/pango-querymodules
include/pango-1.0/
include/pango-1.0/pango/
include/pango-1.0/pango/pango-attributes.h
include/pango-1.0/pango/pango-break.h
include/pango-1.0/pango/pango-context.h
@ -33,6 +35,9 @@ lib/libpangox-1.0.a
lib/libpangox-1.0.la
lib/libpangoxft-1.0.a
lib/libpangoxft-1.0.la
lib/pango/
lib/pango/1.4.0/
lib/pango/1.4.0/modules/
lib/pango/1.4.0/modules/pango-arabic-fc.a
lib/pango/1.4.0/modules/pango-arabic-fc.la
lib/pango/1.4.0/modules/pango-basic-fc.a
@ -47,13 +52,21 @@ lib/pango/1.4.0/modules/pango-indic-fc.a
lib/pango/1.4.0/modules/pango-indic-fc.la
lib/pango/1.4.0/modules/pango-thai-fc.a
lib/pango/1.4.0/modules/pango-thai-fc.la
lib/pkgconfig/
lib/pkgconfig/pango.pc
lib/pkgconfig/pangoft2.pc
lib/pkgconfig/pangox.pc
lib/pkgconfig/pangoxft.pc
man/man1/pango-querymodules.1
share/examples/pango/pango/pango.modules
share/examples/pango/pango/pangox.aliases
@man man/man1/pango-querymodules.1
share/examples/pango/
@sample ${SYSCONFDIR}/pango/
share/examples/pango/pango.modules
@sample ${SYSCONFDIR}/pango/pango.modules
share/examples/pango/pangox.aliases
@sample ${SYSCONFDIR}/pango/pangox.aliases
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/pango/
share/gtk-doc/html/pango/PangoEngineLang.html
share/gtk-doc/html/pango/PangoEngineShape.html
share/gtk-doc/html/pango/PangoFcFont.html
@ -89,17 +102,3 @@ share/gtk-doc/html/pango/right.png
share/gtk-doc/html/pango/tools.html
share/gtk-doc/html/pango/up.png
%%SHARED%%
@dirrm share/gtk-doc/html/pango
@dirrm share/gtk-doc/html
@dirrm share/gtk-doc
@dirrm share/examples/pango/pango
@dirrm share/examples/pango
@dirrm lib/pango/1.4.0/modules
@dirrm lib/pango/1.4.0
@dirrm lib/pango
@dirrm include/pango-1.0/pango
@dirrm include/pango-1.0
@cwd ${SYSCONFDIR}
@extra pango/pango.modules
@extra pango/pangox.aliases
@extra pango/