Date: Sat, 27 Feb 1999 20:16:58 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10293: Port change: deve/gettext Message-ID: <199902271816.UAA43594@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 10293
>Category: ports
>Synopsis: Port change: deve/gettext
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 27 10:20:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports collection
>Description:
This patch does two things:
1. Enable the gettext port to build a shared library. This is
needed by the latest gtk-engines release. Adds patch-ag and
patch-ah.
2. (Controversial?) Have the port create ${PREFIX}/share/locale
and ${X11BASE}/share/locale, and rm -r these on deinstall.
These directories are not well managed by ports, which either
don't delete the locale specific directories, or try to and
fail since other software is using them.
>How-To-Repeat:
man patch
>Fix:
diff -urN -x CVS /usr/ports.ref/devel/gettext/Makefile /usr/ports/devel/gettext/Makefile
--- /usr/ports.ref/devel/gettext/Makefile Tue Jan 12 18:50:26 1999
+++ /usr/ports/devel/gettext/Makefile Wed Feb 24 12:19:12 1999
@@ -8,12 +8,14 @@
DISTNAME= gettext-0.10.35
CATEGORIES= devel
-MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/
+MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ \
+ ftp://alpha.gnu.org/pub/gnu
MAINTAINER= nacai@iname.com
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= i386--freebsd --with-gnu-gettext
+
+PLIST_SUB= X11BASE=${X11BASE}
pre-configure:
${RM} ${WRKSRC}/doc/gettext.info*
@@ -25,5 +27,6 @@
@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
${PREFIX}/share/gettext/po-mode.el
+ ${MKDIR} ${X11BASE}/share/locale
.include <bsd.port.mk>
diff -urN -x CVS /usr/ports.ref/devel/gettext/patches/patch-ae /usr/ports/devel/gettext/patches/patch-ae
--- /usr/ports.ref/devel/gettext/patches/patch-ae Sun Dec 6 17:30:16 1998
+++ /usr/ports/devel/gettext/patches/patch-ae Wed Feb 17 02:06:25 1999
@@ -1,5 +1,14 @@
---- configure.orig Fri May 1 13:48:25 1998
-+++ configure Thu Dec 3 20:11:52 1998
+--- configure.orig Fri May 1 07:48:25 1998
++++ configure Wed Feb 17 02:05:55 1999
+@@ -3958,7 +3958,7 @@
+ fi
+
+
+- l=
++ l=l
+
+
+ test -d po || mkdir po
@@ -4004,7 +4004,7 @@
;;
esac
diff -urN -x CVS /usr/ports.ref/devel/gettext/patches/patch-ag /usr/ports/devel/gettext/patches/patch-ag
--- /usr/ports.ref/devel/gettext/patches/patch-ag Thu Jan 1 02:00:00 1970
+++ /usr/ports/devel/gettext/patches/patch-ag Wed Feb 24 12:14:37 1999
@@ -0,0 +1,55 @@
+--- ltmain.sh.orig Mon Apr 27 23:22:35 1998
++++ ltmain.sh Wed Feb 17 01:53:42 1999
+@@ -967,6 +967,16 @@
+ versuffix="$current.$revision"
+ ;;
+
++ freebsd)
++ version_vars="$version_vars major versuffix"
++ major="$current"
++ if [ $PORTOBJFORMAT = elf ]; then
++ versuffix="$current"
++ else
++ versuffix="$current.$revision"
++ fi
++ ;;
++
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+--- ltconfig.orig Mon Apr 27 23:22:35 1998
++++ ltconfig Wed Feb 17 01:55:13 1999
+@@ -777,7 +777,7 @@
+ ;;
+
+ # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+- freebsd3*)
++ freebsd*)
+ archive_cmds='$CC -shared -o $lib$libobjs'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+@@ -1123,10 +1123,21 @@
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+ ;;
+
+-freebsd2* | freebsd3*)
++freebsd2*)
+ version_type=sunos
+- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
+- finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
++ library_names_spec='$libname.so.$versuffix $libname.so'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++freebsd*)
++ version_type=freebsd
++ library_names_spec='$libname.so.$versuffix $libname.so'
++ if [ $PORTOBJFORMAT = elf ]; then
++ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
++ else
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
diff -urN -x CVS /usr/ports.ref/devel/gettext/patches/patch-ah /usr/ports/devel/gettext/patches/patch-ah
--- /usr/ports.ref/devel/gettext/patches/patch-ah Thu Jan 1 02:00:00 1970
+++ /usr/ports/devel/gettext/patches/patch-ah Wed Feb 17 02:35:49 1999
@@ -0,0 +1,11 @@
+--- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999
++++ intl/Makefile.in Wed Feb 17 02:30:13 1999
+@@ -119,7 +119,7 @@
+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ fi; \
+ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
++ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+ else \
+ : ; \
+ fi
diff -urN -x CVS /usr/ports.ref/devel/gettext/pkg/PLIST /usr/ports/devel/gettext/pkg/PLIST
--- /usr/ports.ref/devel/gettext/pkg/PLIST Sun Dec 6 17:30:17 1998
+++ /usr/ports/devel/gettext/pkg/PLIST Sat Feb 27 19:57:29 1999
@@ -12,6 +12,11 @@
@exec install-info %D/info/gettext.info %D/info/dir
include/libintl.h
lib/libintl.a
+lib/libintl.la
+lib/libintl.so
+lib/libintl.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
share/aclocal/gettext.m4
share/aclocal/lcmessage.m4
share/aclocal/progtest.m4
@@ -57,28 +62,6 @@
@dirrm share/gettext/intl
@dirrm share/gettext/po
@dirrm share/gettext
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/no@nynorsk/LC_MESSAGES
-@dirrm share/locale/no@nynorsk
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale
+@unexec rm -r %D/share/locale
+@exec mkdir -p %%X11BASE%%/share/locale
+@unexec rm -r %%X11BASE%%/share/locale
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199902271816.UAA43594>