sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

upgrade to 10.10

Browse source 
PR:		43969
Submitted by:	Ports Fury
This commit is contained in:
Ying-Chieh Liao 2002-10-12 16:36:45 +00:00
parent 31a4b0d703
commit 9c01f6297d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=67878
6 changed files with 26 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
graphics/netpbm/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= netpbm
PORTVERSION= 10.9
PORTVERSION= 10.10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -24,7 +24,7 @@ USE_REINPLACE= yes
USE_GMAKE= yes
MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}"
MAKEFILE= GNUmakefile
INSTALL_TARGET= install.bin install.lib install-dev
INSTALL_TARGET= install.bin install.lib install.data install-dev
INSTALLS_SHLIB= yes
post-patch:
@ -36,9 +36,4 @@ post-patch:
@${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>

2
graphics/netpbm/distinfo
View file

@ -1 +1 @@
MD5 (netpbm-10.9.tgz) = b6fe7198e2f3c2cbecabab9b39554617
MD5 (netpbm-10.10.tgz) = 50c01683e45887d9e55c0a17927501df

8
graphics/netpbm/files/patch-Makefile.common
View file

@ -1,6 +1,6 @@
--- Makefile.common.orig Tue Sep 3 10:56:40 2002
+++ Makefile.common Sat Oct 5 00:00:00 2002
@@ -235,19 +235,19 @@
--- Makefile.common.orig Wed Oct 9 11:17:24 2002
+++ Makefile.common Sat Oct 12 00:00:00 2002
@@ -231,19 +231,19 @@
INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
.PHONY: $(INSTALLBIN_TARGETS)
$(INSTALLBIN_TARGETS): $(PKGDIR)/bin
@ -14,7 +14,7 @@
$(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<
.PHONY: install.data
install.data: $(DATAFILES:%=%_installdata)
install.data: $(DATAFILES:%=%_installdata) $(SUBDIRS:%=%/install.data)
.PHONY: $(DATAFILES:%=%_installdata)
-$(DATAFILES:%=%_installdata): $(PKGDIR)/misc

11
graphics/netpbm/files/patch-analyzer::Makefile Normal file
View file

@ -0,0 +1,11 @@
--- analyzer/Makefile.orig Sat Sep 28 02:02:50 2002
+++ analyzer/Makefile Sat Oct 12 00:00:00 2002
@@ -31,7 +31,7 @@
.PHONY: all
all: $(BINARIES)
-HEADERLINKS = pm_config.h pm.h pbm.h pgm.h ppm.h pnm.h pam.h shhopt.h
+HEADERLINKS = pm_config.h pm.h pbm.h pgm.h ppm.h ppmcmap.h pnm.h pam.h shhopt.h nstring.h
include $(SRCDIR)/Makefile.common

11
graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile
View file

@ -1,11 +0,0 @@
--- 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
all: $(BINARIES)

21
graphics/netpbm/files/patch-lib::Makefile
View file

@ -1,6 +1,6 @@
--- lib/Makefile.orig Thu Sep 19 12:58:41 2002
+++ lib/Makefile Sat Oct 5 00:00:00 2002
@@ -32,14 +32,16 @@
--- 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
@ -15,10 +15,7 @@
+ 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
DATAFILES = rgb.txt
@@ -69,12 +71,15 @@
@ -37,8 +34,8 @@
ifeq ($(NETPBMLIBTYPE),irixshared)
# The libxxx.so link is needed to link the executables.
@@ -98,12 +103,9 @@
# The $(SONAME) link is only needed to test the programs without
@@ -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)
@ -46,13 +43,11 @@
- $(SYMLINK) $< $@
-libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
- -lc $(LADD)
+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
+ $(LADD)
$(SHLIB_CLIB) $(LADD)
endif
ifeq ($(NETPBMLIBTYPE),dll)
@@ -180,13 +182,10 @@
.PHONY: install.lib
ifeq ($(NETPBMLIBTYPE),unixshared)
@ -67,7 +62,7 @@
+install.lib: $(PKGDIR)/lib
+ cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).*
+ ${BSD_INSTALL_DATA} \
+ $(SONAME) $(PKGDIR)/lib/
+ $(SONAME) $(PKGDIR)/lib/
endif
ifeq ($(NETPBMLIBTYPE),dll)
#install a Windows DLL shared library