View | Details | Raw Unified | Return to bug 156930 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +5 lines)
Lines 22-28 Link Here
22
		jasper.4:${PORTSDIR}/graphics/jasper \
22
		jasper.4:${PORTSDIR}/graphics/jasper \
23
		xml2.5:${PORTSDIR}/textproc/libxml2
23
		xml2.5:${PORTSDIR}/textproc/libxml2
24
24
25
MAKE_JOBS_UNSAFE=	yes
25
MAKE_JOBS_SAFE=	yes
26
26
27
USE_PERL5=	yes
27
USE_PERL5=	yes
28
USE_GMAKE=	yes
28
USE_GMAKE=	yes
Lines 43-51 Link Here
43
.endif
43
.endif
44
44
45
pre-configure:
45
pre-configure:
46
	@if [ -e ${DESTDIR}/${LOCALBASE}/include/pm.h ]; then \
47
		(${ECHO_MSG} "===> Cannot build with netpbm installed, please deinstall first"; exit 1) \
48
	fi
49
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
46
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
50
		 -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
47
		 -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
51
		 ${WRKSRC}/pm_config.in.h
48
		 ${WRKSRC}/pm_config.in.h
Lines 57-62 Link Here
57
	@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
54
	@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
58
	cd ${WRKSRC} && buildtools/stamp-date > ${WRKSRC}/lib/compile.h
55
	cd ${WRKSRC} && buildtools/stamp-date > ${WRKSRC}/lib/compile.h
59
56
57
# This snippet is all it takes to make the port as of 10.35.80 MAKE_JOBS_SAFE:
58
pre-build:
59
	${GMAKE} -C ${WRKSRC}/lib/util
60
60
post-install:
61
post-install:
61
	@${ECHO_MSG} "===>  Installing man pages..."
62
	@${ECHO_MSG} "===>  Installing man pages..."
62
	@${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \
63
	@${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \
(-)files/patch-Makefile.common (-3 / +12 lines)
Lines 1-6 Link Here
1
--- Makefile.common.orig	Wed Oct  9 11:17:24 2002
1
--- ./Makefile.common.orig	2006-11-13 05:14:19.000000000 +0100
2
+++ Makefile.common	Sat Oct 12 00:00:00 2002
2
+++ ./Makefile.common	2011-05-10 15:44:47.000000000 +0200
3
@@ -231,19 +231,19 @@
3
@@ -68,7 +68,7 @@
4
 
5
 include $(SRCDIR)/Makefile.version
6
 
7
-INCLUDES2 := $(INCLUDES) -I$(SRCDIR)/$(SUBDIR) -I. -I importinc
8
+INCLUDES2 := $(shell echo "$(INCLUDES) " | sed -Ee 's|-I$(LOCALBASE)/include/?[ 	]+||g;') -I$(SRCDIR)/$(SUBDIR) -I.  -Iimportinc -I$(LOCALBASE)/include
9
 
10
 ifeq ($(NETPBMLIBTYPE),unixstatic)
11
   NETPBMLIBFNAME = libnetpbm.$(STATICLIBSUFFIX)
12
@@ -408,19 +408,19 @@
4
 INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
13
 INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
5
 .PHONY: $(INSTALLBIN_TARGETS)
14
 .PHONY: $(INSTALLBIN_TARGETS)
6
 $(INSTALLBIN_TARGETS): $(PKGDIR)/bin
15
 $(INSTALLBIN_TARGETS): $(PKGDIR)/bin

Return to bug 156930