Date: Sat, 12 Feb 2005 20:27:04 -0500 (EST) From: Brian Clapper <bmc@clapper.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bmc@clapper.org Subject: ports/77435: update gnuls port to prevent installation of /usr/local/lib/charset.alias Message-ID: <200502130127.j1D1R4Cu074912@z.inside.clapper.org> Resent-Message-ID: <200502130130.j1D1UMGC043403@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77435
>Category: ports
>Synopsis: update gnuls port to prevent installation of /usr/local/lib/charset.alias
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 13 01:30:22 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Brian Clapper
>Release: FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
System: FreeBSD z.inside.clapper.org 4.10-RELEASE FreeBSD 4.10-RELEASE #1: Mon Aug 23 11:00:34 EDT 2004 root@z.inside.clapper.org:/usr/src/sys/compile/Z i386
>Description:
gnuls port is currently broken. It installs
${PREFIX}/lib/charset.alias, which (a) isn't in pkg-plist, and (b)
isn't necessary. The enclosed patch addresses the problem by preventing
installation of that file. Patch also incorporates some suggested
changes from Yen-Ming Lee <leeym@FreeBSD.org>
>How-To-Repeat:
N/A
>Fix:
Apply enclosed patch.
diff -uNr gnuls.orig/Makefile gnuls/Makefile
--- gnuls.orig/Makefile Sat Feb 12 20:12:10 2005
+++ gnuls/Makefile Sat Feb 12 20:12:46 2005
@@ -16,15 +16,16 @@
COMMENT= GNU colorized `ls'
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-nls
MAN1= gnuls.1 dircolors.1 dir.1 vdir.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 500019
.if defined(WITH_ACL_SUPPORT)
-PATCHFILES= gnuls-acl-20010825.patch
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= jedgar
+PATCHFILES+= gnuls-acl-20010825.patch
+PATCH_SITES+= ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR+= jedgar
.else
pre-fetch:
@${ECHO} "To build this port with ACL support, define"
diff -uNr gnuls.orig/Makefile.orig gnuls/Makefile.orig
--- gnuls.orig/Makefile.orig Wed Dec 31 19:00:00 1969
+++ gnuls/Makefile.orig Sat Feb 12 20:12:06 2005
@@ -0,0 +1,35 @@
+# New ports collection makefile for: GNU colorized `ls'
+# Date created: 06 January 1996
+# Whom: bmc@WillsCreek.COM
+#
+# $FreeBSD: ports/misc/gnuls/Makefile,v 1.20 2003/09/03 14:28:30 krion Exp $
+#
+
+PORTNAME= gnuls
+PORTVERSION= 4.1
+CATEGORIES= misc
+MASTER_SITES= ${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR= fileutils
+DISTNAME= fileutils-${PORTVERSION}
+
+MAINTAINER= bmc@clapper.org
+COMMENT= GNU colorized `ls'
+
+GNU_CONFIGURE= yes
+MAN1= gnuls.1 dircolors.1 dir.1 vdir.1
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 500019
+.if defined(WITH_ACL_SUPPORT)
+PATCHFILES= gnuls-acl-20010825.patch
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= jedgar
+.else
+pre-fetch:
+ @${ECHO} "To build this port with ACL support, define"
+ @${ECHO} "WITH_ACL_SUPPORT (i.e. make -DWITH_ACL_SUPPORT)"
+.endif
+.endif
+
+.include <bsd.port.post.mk>
diff -uNr gnuls.orig/files/patch-ai gnuls/files/patch-ai
--- gnuls.orig/files/patch-ai Wed Dec 31 19:00:00 1969
+++ gnuls/files/patch-ai Sat Feb 12 20:19:44 2005
@@ -0,0 +1,33 @@
+*** lib/Makefile.in.orig Sat Feb 12 20:16:15 2005
+--- lib/Makefile.in Sat Feb 12 20:17:13 2005
+***************
+*** 880,899 ****
+ # On systems with glibc-2.1 or newer, the file is redundant, therefore we
+ # avoid installing it.
+
+! all-local: charset.alias ref-add.sed ref-del.sed lstat.c stat.c
+ install-exec-local: all-local
+- $(mkinstalldirs) $(DESTDIR)$(libdir)
+- if test -f $(charset_alias); then \
+- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+- rm -f $(charset_tmp) ; \
+- else \
+- if test @GLIBC21@ = no; then \
+- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+- rm -f $(charset_tmp) ; \
+- fi ; \
+- fi
+
+ uninstall-local: all-local
+ if test -f $(charset_alias); then \
+--- 880,887 ----
+ # On systems with glibc-2.1 or newer, the file is redundant, therefore we
+ # avoid installing it.
+
+! all-local: ref-add.sed ref-del.sed lstat.c stat.c
+ install-exec-local: all-local
+
+ uninstall-local: all-local
+ if test -f $(charset_alias); then \
diff -uNr gnuls.orig/gnuls/files/patch-ai gnuls/gnuls/files/patch-ai
--- gnuls.orig/gnuls/files/patch-ai Wed Dec 31 19:00:00 1969
+++ gnuls/gnuls/files/patch-ai Sat Feb 12 20:12:46 2005
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig Sat Feb 12 13:50:32 2005
++++ lib/Makefile.in Sat Feb 12 13:51:25 2005
+@@ -826,7 +826,7 @@
+
+ install-data-am:
+
+-install-exec-am: install-exec-local
++install-exec-am:
+
+ install-info:
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502130127.j1D1R4Cu074912>