karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

netpbm: Updated (10.33 -> 10.35.74)

user/karasz/test/ecn
Nagy Karoly Gabriel 15 years ago committed by Alejandro Mery
parent
ea3fad8b01
commit
da908b7781
5 changed files with 33 additions and 125 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      graphic/netpbm/makefile.patch
  2. 3
      graphic/netpbm/netpbm.conf
  3. 6
      graphic/netpbm/netpbm.desc
  4. 28
      graphic/netpbm/pnmtopng-zlib.patch
  5. 83
      graphic/netpbm/shared_files-fix.patch

38
graphic/netpbm/makefile.patch
Unescape View File

@ -1,38 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../netpbm/makefile.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -urN netpbm-10.29.orig/converter/pbm/pbmtoppa/Makefile netpbm-10.29/converter/pbm/pbmtoppa/Makefile
--- netpbm-10.29.orig/converter/pbm/pbmtoppa/Makefile 2004-03-29 18:50:15.000000000 +0200
+++ netpbm-10.29/converter/pbm/pbmtoppa/Makefile 2005-09-05 13:15:08.714994500 +0200
@@ -22,6 +22,6 @@
pbmtoppa: $(OBJECTS) $(NETPBMLIB) $(LIBOPT)
$(LD) $(LDFLAGS) -o pbmtoppa $(OBJECTS) \
- -lm `$(LIBOPT) $(NETPBMLIB)` $(LDLIBS) \
+ `$(LIBOPT) $(NETPBMLIB)` $(LDLIBS) -lm \
$(RPATH) $(LADD)
diff -urN netpbm-10.29.orig/Makefile.common netpbm-10.29/Makefile.common
--- netpbm-10.29.orig/Makefile.common 2005-08-15 00:03:22.000000000 +0200
+++ netpbm-10.29/Makefile.common 2005-09-05 13:14:46.473604500 +0200
@@ -264,7 +264,7 @@
$(PORTBINARIES) $(MATHBINARIES): %: %.o $(NETPBMLIB) $(LIBOPT)
# Note that LDFLAGS might contain -L options, so order is important.
# LDFLAGS is commonly set as an environment variable.
- $(LD) -o $@ $@.o $(MATHLIB) `$(LIBOPT) $(NETPBMLIB)` \
+ $(LD) -o $@ $@.o `$(LIBOPT) $(NETPBMLIB)` $(MATHLIB) \
$(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)

3
graphic/netpbm/netpbm.conf
Unescape View File

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../netpbm/netpbm.conf # Filename: package/.../netpbm/netpbm.conf
# Copyright (C) 2010 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -15,7 +16,7 @@
netpbm_main() { netpbm_main() {
{ echo -e "\ngnu\nregular\nshared\ny\n\n\n" { echo -e "\ngnu\nregular\nshared\ny\n\n\n"
echo -e "\n\n\n\n\n\n\n" ; } | ./configure echo -e "\n\n\n\nnone\nnone\n\n\n\n" ; } | ./configure
make make
make package pkgdir=$builddir/netpbm.bin make package pkgdir=$builddir/netpbm.bin

6
graphic/netpbm/netpbm.desc
Unescape View File

@ -3,7 +3,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../netpbm/netpbm.desc [COPY] Filename: package/.../netpbm/netpbm.desc
[COPY] Copyright (C) 2006 The OpenSDE Project [COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] [COPY]
@ -32,8 +32,8 @@
[L] OpenSource [L] OpenSource
[S] Stable [S] Stable
[V] 10.33 [V] 10.35.74
[P] X -----5---9 131.900 [P] X -----5---9 131.900
[D] 401622629 netpbm-10.33.tgz http://dl.sourceforge.net/sourceforge/netpbm/ [D] 1915679985 netpbm-10.35.74.tgz http://dl.sourceforge.net/sourceforge/netpbm/

28
graphic/netpbm/pnmtopng-zlib.patch
Unescape View File

@ -0,0 +1,28 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../netpbm/pnmtopng-zlib.patch
# Copyright (C) 2010 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
http://bugs.gentoo.org/291987
--- netpbm-10.35.74/converter/other/Makefile.orig 2009-09-18 21:04:37.000000000 +0200
+++ netpbm-10.35.74/converter/other/Makefile 2010-05-28 18:09:51.000000000 +0200
@@ -159,6 +159,7 @@
$(shell $(LIBOPT) $(NETPBMLIB)) \
$(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
+pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself
pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
$(LD) -o $@ $@.o pngtxt.o \
$(shell $(LIBOPT) $(NETPBMLIB)) \

83
graphic/netpbm/shared_files-fix.patch
Unescape View File

@ -1,83 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../netpbm/shared_files-fix.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- netpbm-10.25/buildtools/installnetpbm.pl 2003-11-05 23:35:37.000000000 +0100
+++ netpbm-10.25-t2/buildtools/installnetpbm.pl 2004-10-18 17:46:15.739386208 +0200
@@ -146,13 +146,12 @@
if (`cp --version 2>/dev/null` =~ m/GNU/) {
# It's GNU Cp -- we have options galore, and they're readable.
- $cpCommand = "cp --recursive --preserve --no-dereference";
+ $cpCommand = "cp --preserve --no-dereference";
} else {
# This works on Cp from "4th Berkeley Distribution", July 1994.
# Mac OSX has this.
- # -R means recursive with no dereferencing of symlinks
# -p means preserve attributes
- $cpCommand = "cp -R -p";
+ $cpCommand = "cp -p -d";
}
return($cpCommand);
}
@@ -734,6 +733,28 @@
+sub installManPages($$) {
+
+ my ($srcdir, $dstdir) = @_;
+
+ if (! -d ($dstdir)) {
+ my $succeeded = mkdir($dstdir, 0777);
+
+ if (!$succeeded) {
+ print("Unable to create directory '$dstdir'. " .
+ "Error=$ERRNO\n");
+ return;
+ }
+ }
+
+ my $rc = system("$cpCommand $srcdir/* $dstdir/");
+
+ if ($rc != 0) {
+ print("copy of man pages from $srcdir to $dstdir failed.\n");
+ print("cp exit code is $rc\n");
+ }
+}
+
sub installManPage($$$) {
@@ -745,16 +766,11 @@
print("Installing man pages...\n");
- my $rc = system("$cpCommand $pkgdir/man/* $manDir/");
+ installManPages("$pkgdir/man/man1", "$manDir/man1");
+ installManPages("$pkgdir/man/man3", "$manDir/man3");
+ installManPages("$pkgdir/man/man5", "$manDir/man5");
- if ($rc != 0) {
- print("copy of man pages from $pkgdir/man to $manDir failed.\n");
- print("cp exit code is $rc\n");
- } else {
- print("done.\n");
- }
-
- print("\n");
+ print("done\n");
removeObsoleteManPage($manDir);
Write Preview
Loading…
Cancel
Save