Attachment 25587 Details for Bug 43700 – file.diff

[patch] file.diff

file.diff (text/plain), 8.14 KB, created by tkato on 2002-10-05 10:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-10-05 10:40:05 UTC

Size: 8.14 KB

patch

obsolete

>diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
>--- /usr/ports/graphics/netpbm/Makefile	Tue Sep 10 20:12:31 2002
>+++ graphics/netpbm/Makefile	Sat Oct  5 00:00:00 2002
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	netpbm
>-PORTVERSION=	10.8
>+PORTVERSION=	10.9
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -28,10 +28,17 @@
> INSTALLS_SHLIB=	yes
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/pm_config.h
>+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
>+		 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
>+		 s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/pm_config.h
> 	@${REINPLACE_CMD} -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/lib/pm.h
> 	@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
> 	@${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h
> 	@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
>+
>+post-install:
>+	@${MKDIR} ${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/lib/rgb.txt ${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/converter/other/pnmtopalm/*.map ${DATADIR}
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/graphics/netpbm/distinfo graphics/netpbm/distinfo
>--- /usr/ports/graphics/netpbm/distinfo	Tue Sep 10 20:12:31 2002
>+++ graphics/netpbm/distinfo	Sat Oct  5 00:00:00 2002
>@@ -1 +1 @@
>-MD5 (netpbm-10.8.tgz) = bd550c71b76bcb18992ab722962756e2
>+MD5 (netpbm-10.9.tgz) = b6fe7198e2f3c2cbecabab9b39554617
>diff -urN /usr/ports/graphics/netpbm/files/patch-Makefile.common graphics/netpbm/files/patch-Makefile.common
>--- /usr/ports/graphics/netpbm/files/patch-Makefile.common	Thu Jun 20 05:21:21 2002
>+++ graphics/netpbm/files/patch-Makefile.common	Sat Oct  5 00:00:00 2002
>@@ -1,6 +1,6 @@
>---- Makefile.common.orig	Fri Jun 14 11:55:58 2002
>-+++ Makefile.common	Tue Jun 18 00:00:00 2002
>-@@ -209,11 +209,11 @@
>+--- Makefile.common.orig	Tue Sep  3 10:56:40 2002
>++++ Makefile.common	Sat Oct  5 00:00:00 2002
>+@@ -235,19 +235,19 @@
>  INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
>  .PHONY: $(INSTALLBIN_TARGETS)
>  $(INSTALLBIN_TARGETS): $(PKGDIR)/bin
>@@ -13,4 +13,14 @@
> +	${BSD_INSTALL_SCRIPT} \
>  	  $(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<
>  
>- .PHONY: install.man install.man1 install.man3 install.man5
>+ .PHONY: install.data
>+ install.data: $(DATAFILES:%=%_installdata) 
>+ 
>+ .PHONY: $(DATAFILES:%=%_installdata) 
>+-$(DATAFILES:%=%_installdata): $(PKGDIR)/misc
>+-	$(INSTALL) -c -m $(INSTALL_PERM_DATA) \
>++$(DATAFILES:%=%_installdata): $(PKGDIR)/share/netpbm
>++	${BSD_INSTALL_DATA} \
>+ 	  $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $<
>+ 
>+ 
>diff -urN /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile
>--- /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile	Thu Jun 20 05:21:21 2002
>+++ graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile	Sat Oct  5 00:00:00 2002
>@@ -1,22 +1,11 @@
>---- converter/other/pnmtopalm/Makefile.orig	Mon Jun 10 13:40:28 2002
>-+++ converter/other/pnmtopalm/Makefile	Tue Jun 18 00:00:00 2002
>-@@ -35,15 +35,15 @@
>+--- converter/other/pnmtopalm/Makefile.orig	Thu Sep 19 12:30:39 2002
>++++ converter/other/pnmtopalm/Makefile	Sat Oct  5 00:00:00 2002
>+@@ -11,7 +11,7 @@
>+ OBJECTS = $(BINARIES:%=%.o) palmcolormap.o
>+ MERGE_OBJECTS = $(BINARIES:%=%.o2) palmcolormap.o
>+ MERGEBINARIES = $(BINARIES)
>+-DATAFILE = palmcolor8.map palmgray1.map palmgray2.map palmgray4.map
>++DATAFILES = palmcolor8.map palmgray1.map palmgray2.map palmgray4.map
>  
>- install.bin: install.bin.local
>- .PHONY: install.bin.local
>--install.bin.local: $(PKGDIR)/misc $(DATAFILE:%=%_installdata)
>-+install.bin.local: $(PKGDIR)/share/netpbm $(DATAFILE:%=%_installdata)
>+ all: $(BINARIES)
>  
>- install.merge: install.merge.local
>- .PHONY: install.merge.local
>--install.merge.local: $(PKGDIR)/misc $(DATAFILE:%=%_installdata)
>-+install.merge.local: $(PKGDIR)/share/netpbm $(DATAFILE:%=%_installdata)
>- 
>- %_installdata:
>--	$(INSTALL) -c -m $(INSTALL_PERM_DATA) \
>--	  $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $(PKGDIR)/misc;
>-+	${BSD_INSTALL_DATA} \
>-+	  $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $(PKGDIR)/share/netpbm;
>- 
>- 
>- clean: cleanspecial
>diff -urN /usr/ports/graphics/netpbm/files/patch-lib::Makefile graphics/netpbm/files/patch-lib::Makefile
>--- /usr/ports/graphics/netpbm/files/patch-lib::Makefile	Thu Jun 20 05:21:21 2002
>+++ graphics/netpbm/files/patch-lib::Makefile	Sat Oct  5 00:00:00 2002
>@@ -1,6 +1,6 @@
>---- lib/Makefile.orig	Wed Jun 12 13:00:32 2002
>-+++ lib/Makefile	Tue Jun 18 00:00:00 2002
>-@@ -31,12 +31,14 @@
>+--- lib/Makefile.orig	Thu Sep 19 12:58:41 2002
>++++ lib/Makefile	Sat Oct  5 00:00:00 2002
>+@@ -32,14 +32,16 @@
>  # Library objects to be linked but not built by Makefile.common:
>  LIBOBJECTS_X = util/shhopt.o util/nstring.o
>  
>@@ -15,9 +15,12 @@
> +	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
>  
>+-DATAFILE = rgb.txt
>++DATAFILES = rgb.txt
>+ 
>  HEADERLINKS = pm_config.h version.h compile.h shhopt.h
>  
>-@@ -57,6 +59,9 @@
>+@@ -69,12 +71,15 @@
>  
>  $(LIBOBJECTS): %.o: %.c $(HEADERLINKS)
>  # Note that the user may have configured -I options into CFLAGS.
>@@ -26,8 +29,6 @@
> +$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS)
>  	$(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) -o $@ $<
>  
>- SUBDIRS = util
>-@@ -67,7 +72,7 @@
>  MAJ = $(NETPBM_MAJOR_RELEASE)
>  MIN = $(NETPBM_MINOR_RELEASE)
>  
>@@ -36,7 +37,7 @@
>  
>  ifeq ($(NETPBMLIBTYPE),irixshared)
>  # The libxxx.so link is needed to link the executables.
>-@@ -97,12 +102,9 @@
>+@@ -98,12 +103,9 @@
>  # The $(SONAME) link is only needed 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).
>@@ -45,14 +46,14 @@
> -	$(SYMLINK) $< $@
> -libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
> -	$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
>--          -lc $(CADD)
>+-          -lc $(LADD)
> +$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
> +	$(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
>-+          $(CADD)
>++          $(LADD)
>  endif
>  
>  ifeq ($(NETPBMLIBTYPE),dll)
>-@@ -181,13 +183,10 @@
>+@@ -180,13 +182,10 @@
>  .PHONY: install.lib
>  ifeq ($(NETPBMLIBTYPE),unixshared)
>  # install a Unix-style shared library
>@@ -70,7 +71,7 @@
>  endif
>  ifeq ($(NETPBMLIBTYPE),dll)
>  #install a Windows DLL shared library
>-@@ -217,23 +216,23 @@
>+@@ -216,23 +215,23 @@
>  # directory when you compile your programs.
>  
>  %_installhdr: $(PKGDIR)/include
>diff -urN /usr/ports/graphics/netpbm/files/patch-pm_config.h graphics/netpbm/files/patch-pm_config.h
>--- /usr/ports/graphics/netpbm/files/patch-pm_config.h	Thu Jun 20 05:21:21 2002
>+++ graphics/netpbm/files/patch-pm_config.h	Sat Oct  5 00:00:00 2002
>@@ -1,5 +1,5 @@
>---- pm_config.h.orig	Sat Jun 15 05:36:45 2002
>-+++ pm_config.h	Tue Jun 18 00:00:00 2002
>+--- pm_config.h.orig	Sat Aug 10 01:19:45 2002
>++++ pm_config.h	Sat Oct  5 00:00:00 2002
> @@ -35,6 +35,10 @@
>  typedef unsigned int uint32n;
>  typedef signed int int32n;
>@@ -27,8 +27,8 @@
> -#define RGB_DB1 "/usr/lib/X11/rgb.txt"
> -#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
> -#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
>-+#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt"
>-+#define RGB_DB2 "%%X11BASE%%/lib/X11/rgb.txt"
>++#define RGB_DB1 "%%PREFIX%%/share/netpbm/rgb.txt"
>++#define RGB_DB2 "%%LOCALBASE%%/share/netpbm/rgb.txt"
> +#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt"
>  #endif
>  
>diff -urN /usr/ports/graphics/netpbm/pkg-plist graphics/netpbm/pkg-plist
>--- /usr/ports/graphics/netpbm/pkg-plist	Tue Sep 10 20:12:32 2002
>+++ graphics/netpbm/pkg-plist	Sat Oct  5 00:00:00 2002
>@@ -111,6 +111,7 @@
> bin/pgmtofs
> bin/pgmtolispm
> bin/pgmtopbm
>+bin/pgmtopgm
> bin/pgmtoppm
> bin/pi1toppm
> bin/pi3topbm
>@@ -194,6 +195,7 @@
> bin/ppmquantall
> bin/ppmrainbow
> bin/ppmrelief
>+bin/ppmrough
> bin/ppmshadow
> bin/ppmshift
> bin/ppmspread
>@@ -216,9 +218,11 @@
> bin/ppmtopict
> bin/ppmtopj
> bin/ppmtopjxl
>+bin/ppmtoppm
> bin/ppmtopuzz
> bin/ppmtorgb3
> bin/ppmtosixel
>+bin/ppmtoterm
> bin/ppmtouil
> bin/ppmtowinicon
> bin/ppmtoxpm
>@@ -277,4 +281,5 @@
> share/netpbm/palmgray1.map
> share/netpbm/palmgray2.map
> share/netpbm/palmgray4.map
>+share/netpbm/rgb.txt
> @dirrm share/netpbm

Actions: View | Diff

Attachments on bug 43700: 25587