integ/base/netpbm/centos/patches/remove-pstopnm.patch
Scott Little b5e0d0cbe9 Relocate netpbm to stx-integ/base/netpbm
Move content from stx-gplv2 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        bash
        cgcs-users
        cluster-resource-agents
        dpkg
        haproxy
        libfdt
        netpbm
        rpm

    database/
        mariadb

    filesystem/
        iscsi-initiator-utils

    filesystem/drbd/
        drbd-tools

    kernel/kernel-modules/
        drbd
        integrity
        intel-e1000e
        intel-i40e
        intel-i40evf
        intel-ixgbe
        intel-ixgbevf
        qat17
        tpmdd

    ldap/
        ldapscripts

    networking/
        iptables
        net-tools

Change-Id: I8b10c77b14fd50c8dea77a7fbeb3b3e82d101f20
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 15:31:54 -04:00

26 lines
709 B
Diff

diff --git a/netpbm-10.61.02/converter/other/Makefile b/netpbm-10.61.02/converter/other/Makefile
index 746db87..02c66b4 100644
--- a/netpbm-10.61.02/converter/other/Makefile
+++ b/netpbm-10.61.02/converter/other/Makefile
@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
include $(BUILDDIR)/config.mk
+USE_GHOSTSCRIPT=N
TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
@@ -134,10 +135,12 @@ BINARIES = \
rasttopnm \
srftopam \
+ifneq ($(USE_GHOSTSCRIPT),N)
ifneq ($(DONT_HAVE_PROCESS_MGMT),Y)
PORTBINARIES += pstopnm
BINARIES += pnmtops
endif
+endif
ifeq ($(HAVE_PNGLIB),Y)
BINARIES += pnmtopng pngtopam pamrgbatopng