From owner-freebsd-ports Sun Feb 6 9:50:14 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by builder.freebsd.org (Postfix) with ESMTP id C8A343DE8 for ; Sun, 6 Feb 2000 09:49:30 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id JAA50337; Sun, 6 Feb 2000 09:50:07 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from rock.ghis.net (rock.ghis.net [209.222.164.7]) by builder.freebsd.org (Postfix) with ESMTP id 941D83D9E for ; Sun, 6 Feb 2000 09:42:24 -0800 (PST) Received: from shadow.blackdawn.com (postfix@13-046.008.popsite.net [209.69.195.46]) by rock.ghis.net (8.9.3/8.9.3) with ESMTP id JAA22007 for ; Sun, 6 Feb 2000 09:42:57 -0800 (PST) Received: from argon.blackdawn.com (argon.blackdawn.com [192.168.0.3]) by shadow.blackdawn.com (Postfix) with ESMTP id CD9631A18 for ; Sun, 6 Feb 2000 12:42:53 -0500 (EST) Received: by argon.blackdawn.com (Postfix, from userid 1000) id B05761A5F; Sun, 6 Feb 2000 12:42:49 -0500 (EST) Message-Id: <20000206174249.B05761A5F@argon.blackdawn.com> Date: Sun, 6 Feb 2000 12:42:49 -0500 (EST) From: Will Andrews Reply-To: Will Andrews To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/16523: fix port: devel/libslang [PATCH] Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 16523 >Category: ports >Synopsis: fix port: devel/libslang [PATCH] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 6 09:50:06 PST 2000 >Closed-Date: >Last-Modified: >Originator: Will Andrews >Release: FreeBSD 4.0-CURRENT i386 >Organization: none >Environment: FreeBSD argon.blackdawn.com 4.0-CURRENT FreeBSD 4.0-CURRENT #0: Fri Jan 28 16:46:16 EST 2000 root@argon.blackdawn.com:/usr/src/sys/compile/KRYPTON i386 >Description: This patch will fix devel/libslang in two ways: 1) Direct -lc call, which (on -CURRENT at least) leads to linking with libc.so.3 instead of libc.so.4. 2) It installs the library as `libslang.so.1` instead of `libslang.so.1.3` - how could anyone miss this? This patch is required in order for net/dhcpconf to work properly (dhcpconf depends on newt, which depends on this). >How-To-Repeat: Use the patch below to fix the current port. >Fix: diff -urN libslang/Makefile libslang.new/Makefile --- libslang/Makefile Wed Dec 29 18:13:54 1999 +++ libslang.new/Makefile Thu Feb 3 02:00:48 2000 @@ -15,12 +15,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes -#WRKSRC= ${WRKDIR}/slang - ALL_TARGET= all elf INSTALL_TARGET= install install-elf - -post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include diff -urN libslang/patches/patch-ad libslang.new/patches/patch-ad --- libslang/patches/patch-ad Wed Dec 29 18:13:56 1999 +++ libslang.new/patches/patch-ad Thu Feb 3 01:53:36 2000 @@ -1,14 +1,74 @@ ---- src/Makefile.in Fri Apr 24 01:17:04 1998 -+++ /tmp/Makefile.in Tue Sep 22 15:45:26 1998 -@@ -68,7 +68,11 @@ +--- src/Makefile.in Thu Feb 3 01:52:00 2000 ++++ src/Makefile.in.new Thu Feb 3 01:53:11 2000 +@@ -16,7 +16,7 @@ + ELF_CC = @ELF_CC@ + ELF_CFLAGS = @ELF_CFLAGS@ + ELF_LINK = @ELF_LINK@ +-ELF_DEP_LIBS = $(DL_LIB) -lm -lc ++ELF_DEP_LIBS = $(DL_LIB) -lm - ELFLIB = lib$(THIS_LIB).so# + #--------------------------------------------------------------------------- + # Set these values to ABSOLUTE path names +@@ -36,7 +36,7 @@ + exec_prefix = @exec_prefix@ + install_lib_dir = @libdir@ + install_include_dir = @includedir@ +-install_doc_dir = $(prefix)/doc/slang/@slang_version@ ++install_doc_dir = $(prefix)/share/doc/slang/@slang_version@ + DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt + #--------------------------------------------------------------------------- + # Misc commands (safe to leave these untouched) +@@ -76,7 +76,7 @@ ELFLIB_MAJOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# -+.if ${PORTOBJFORMAT} == elf -+ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# -+.else ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)# -+.endif - ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)# +-ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)# ++ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR)# + EXECLIBS = -L$(OBJDIR) -lslang -lm $(TCAPLIB) $(DL_LIB) + EXECDEPS = $(OBJDIR_NORMAL_LIB) +@@ -106,11 +106,11 @@ + + $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) + -$(RM) $(ELFDIR_ELF_LIB) +- cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS) +- cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB) ++ cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR) $(OFILES) $(ELF_DEP_LIBS) ++ cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR) $(ELFLIB) + @echo "" +- @echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR). +- @echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created. ++ @echo $(ELFLIB_MAJOR) created in $(ELFDIR). ++ @echo The link $(ELFLIB) to $(ELFLIB_MAJOR) was also created. + @echo "" + $(OBJDIR) : + -$(MKDIR) $(OBJDIR) +@@ -146,21 +146,21 @@ + install-elf: elf install + -$(RM) $(install_lib_dir)/$(ELFLIB) + -$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR) +- @echo installing $(ELFLIB_MAJOR_MINOR) in $(install_lib_dir) ++ @echo installing $(ELFLIB_MAJOR) in $(install_lib_dir) + $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(install_lib_dir) +- @echo creating symbolic links to $(ELFLIB_MAJOR_MINOR) +- -cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB) ++ @echo creating symbolic links to $(ELFLIB_MAJOR) ++ -cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR) $(ELFLIB) + @echo "" +- @echo $(ELFLIB_MAJOR_MINOR) created in $(install_lib_dir). +- @echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created. ++ @echo $(ELFLIB_MAJOR) created in $(install_lib_dir). ++ @echo The link $(ELFLIB) to $(ELFLIB_MAJOR) was also created. + @echo "" + install-links: + -$(RM) $(install_lib_dir)/$(ELFLIB) + -$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR) +- cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR) ++ cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR) $(ELFLIB_MAJOR) + cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR) $(ELFLIB) + @echo +- @echo A link $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) was created. ++ @echo A link $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR) was created. + @echo A link $(ELFLIB) to $(ELFLIB_MAJOR) was created. + @echo "" + #--------------------------------------------------------------------------- diff -urN libslang/patches/patch-ae libslang.new/patches/patch-ae --- libslang/patches/patch-ae Thu Jan 27 01:36:56 2000 +++ libslang.new/patches/patch-ae Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Mon Jan 24 13:38:33 2000 -+++ src/Makefile.in Mon Jan 24 13:38:41 2000 -@@ -36,7 +36,7 @@ - exec_prefix = @exec_prefix@ - install_lib_dir = @libdir@ - install_include_dir = @includedir@ --install_doc_dir = $(prefix)/doc/slang/@slang_version@ -+install_doc_dir = $(prefix)/share/doc/slang/@slang_version@ - DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt - #--------------------------------------------------------------------------- - # Misc commands (safe to leave these untouched) diff -urN libslang/pkg/PLIST libslang.new/pkg/PLIST --- libslang/pkg/PLIST Thu Jan 27 06:14:57 2000 +++ libslang.new/pkg/PLIST Thu Feb 3 01:56:49 2000 @@ -2,7 +2,7 @@ include/slcurses.h lib/libslang.a lib/libslang.so -lib/libslang.so.1.3 +lib/libslang.so.1 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/doc/slang/COPYING >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message