From owner-freebsd-ports-bugs Wed Mar 26 18:30:17 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E42037B404 for ; Wed, 26 Mar 2003 18:30:10 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7445143F93 for ; Wed, 26 Mar 2003 18:30:09 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h2R2U9NS093035 for ; Wed, 26 Mar 2003 18:30:09 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h2R2U9Tm093034; Wed, 26 Mar 2003 18:30:09 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43FAF37B404 for ; Wed, 26 Mar 2003 18:20:50 -0800 (PST) Received: from quenix.dyndns.org (modemcable246.166-130-66.que.mc.videotron.ca [66.130.166.246]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BF2243F75 for ; Wed, 26 Mar 2003 18:20:49 -0800 (PST) (envelope-from serge@quenix.dyndns.org) Received: from serge by quenix.dyndns.org with local (Exim 4.12) id 18yNA8-000CRg-00 for FreeBSD-gnats-submit@freebsd.org; Wed, 26 Mar 2003 21:30:40 -0500 Message-Id: Date: Wed, 26 Mar 2003 21:30:40 -0500 From: Serge Gagnon Reply-To: Serge Gagnon To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/50330: graphics/netpbm patch malformed X-Spam-Status: No, hits=-3.6 required=5.0 tests=MSG_ID_ADDED_BY_MTA_3,PATCH_UNIFIED_DIFF,RCVD_IN_RFCI, RESENT_TO,UPPERCASE_25_50 autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 50330 >Category: ports >Synopsis: graphics/netpbm patch malformed >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 26 18:30:08 PST 2003 >Closed-Date: >Last-Modified: >Originator: Serge Gagnon >Release: FreeBSD 4.8-RC i386 >Organization: me >Environment: System: FreeBSD quenix.dyndns.org 4.8-RC FreeBSD 4.8-RC #0: Wed Mar 19 13:49:56 EST 2003 root@:/usr/obj/usr/src/sys/OCEAN i386 >Description: A simple character 'S' is missing at the word "INCLUDE" in the file "files/patch-lib::Makefile" at line 24. - effect: doesn't compile - I have include the new patch-lib::Makefile with this pr. >How-To-Repeat: run make in the netpbm dir >Fix: --- patch-lib::Makefile begins here --- --- lib/Makefile.orig Wed Oct 9 11:21:57 2002 +++ lib/Makefile Sat Oct 12 00:00:00 2002 @@ -32,12 +32,14 @@ # Library objects to be linked but not built by Makefile.common: LIBOBJECTS_X = util/shhopt.o util/nstring.o +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) + MANUALS3 = libnetpbm MANUALS5 = pbm pgm ppm pnm pam INTERFACE_HEADERS = pm.h pbm.h bitio.h pbmfont.h \ - pgm.h ppm.h ppm.h ppmcmap.h ppmfloyd.h colorname.h \ - pnm.h pam.h pammap.h util/shhopt.h util/nstring.h + pgm.h ppm.h ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h colorname.h \ + pnm.h pam.h pammap.h util/pm_shhopt.h util/pm_nstring.h DATAFILES = rgb.txt @@ -69,12 +71,15 @@ $(LIBOBJECTS): %.o: %.c $(HEADERLINKS) # Note that the user may have configured -I options into CFLAGS. + $(CC) -c $(INCLUDES) $(CFLAGS) $(CADD) -o $@ $< + +$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS) $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) -o $@ $< MAJ = $(NETPBM_MAJOR_RELEASE) MIN = $(NETPBM_MINOR_RELEASE) -SONAME = libnetpbm.so.$(MAJ) +SONAME = libnetpbm.so.$(SOVER) ifeq ($(NETPBMLIBTYPE),irixshared) # The libxxx.so link is needed to link the executables. @@ -98,11 +103,8 @@ # The $(SONAME) link is needed only to test the programs without # installing the libraries (in that case, you also need to direct the # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH). -$(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) - rm -f $@ - $(SYMLINK) $< $@ -libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) - $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ +$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) + $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \ $(SHLIB_CLIB) $(LADD) endif @@ -180,13 +182,10 @@ .PHONY: install.lib ifeq ($(NETPBMLIBTYPE),unixshared) # install a Unix-style shared library -install.lib: $(PKGDIR)/lib $(PKGDIR)/link - cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).* - $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \ - libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/ - cd $(PKGDIR)/lib/ ; \ - rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ); \ - $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(SONAME) +install.lib: $(PKGDIR)/lib + cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).* + ${BSD_INSTALL_DATA} \ + $(SONAME) $(PKGDIR)/lib/ endif ifeq ($(NETPBMLIBTYPE),dll) #install a Windows DLL shared library @@ -216,23 +215,23 @@ # directory when you compile your programs. %_installhdr: $(PKGDIR)/include - $(INSTALL) -c -m $(INSTALL_PERM_HDR) \ + ${BSD_INSTALL_DATA} \ $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/; .PHONY: install.staticlib -install.staticlib: $(PKGDIR)/link - $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ - $(PKGDIR)/link +install.staticlib: $(PKGDIR)/lib + ${BSD_INSTALL_DATA} libnetpbm.$(STATICLIBSUFFIX) \ + $(PKGDIR)/lib # Install a shared library stub -- the ".so" file used at link time to # prepare a program for dynamically linking a library at run time .PHONY: install.sharedlibstub -install.sharedlibstub: $(PKGDIR)/link +install.sharedlibstub: $(PKGDIR)/lib ifeq ($(NETPBMLIBTYPE),unixshared) # install the link-time (.so) links to the runtime libraries - cd $(PKGDIR)/link ; \ + cd $(PKGDIR)/lib ; \ rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ - $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ + $(SYMLINK) $(SONAME) \ libnetpbm.$(NETPBMLIBSUFFIX) endif ifeq ($(NETPBMLIBTYPE),dll) --- patch-lib::Makefile ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message