View | Details | Raw Unified | Return to bug 236640
Collapse All | Expand All

(-)Makefile (-8 / +3 lines)
Lines 15-22 Link Here
15
LICENSE_FILE=	${WRKSRC}/LGPL
15
LICENSE_FILE=	${WRKSRC}/LGPL
16
16
17
USES=		cpe gmake libtool
17
USES=		cpe gmake libtool
18
GNU_CONFIGURE=	yes
19
ALL_TARGET=	without_doc
20
USE_LDCONFIG=	yes
18
USE_LDCONFIG=	yes
21
19
22
OPTIONS_DEFINE=	X11 DOCS
20
OPTIONS_DEFINE=	X11 DOCS
Lines 23-36 Link Here
23
OPTIONS_DEFAULT=	X11
21
OPTIONS_DEFAULT=	X11
24
22
25
OPTIONS_SUB=	yes
23
OPTIONS_SUB=	yes
26
X11_USE=	XORG=xaw
24
X11_USE=	XORG=ice,sm,x11,xaw,xext,xmu,xpm,xt
27
X11_CONFIGURE_WITH=	x
25
X11_CONFIGURE_WITH=	x
28
26
29
# Build fails with:
27
ALL_TARGET=	without_doc
30
#  gmake[2]: Entering directory '/wrkdirs/usr/ports/devel/t1lib/work/t1lib-5.1.2/lib'
28
GNU_CONFIGURE=	yes
31
#  gmake[2]: *** pselect jobs pipe: Bad file descriptor.  Stop.
32
#  gmake[2]: *** Waiting for unfinished jobs....
33
MAKE_JOBS_UNSAFE=	YES
34
29
35
post-patch:
30
post-patch:
36
	@${REINPLACE_CMD} -e \
31
	@${REINPLACE_CMD} -e \
(-)files/patch-Makefile.in (+47 lines)
Line 0 Link Here
1
add + for submake lines - needed by gmake for parallel building if $(MAKE) not used directly
2
3
--- Makefile.in.orig	2007-12-23 15:49:43 UTC
4
+++ Makefile.in
5
@@ -93,25 +93,25 @@ dependencies: dummy
6
 
7
 
8
 $(DOCSUBDIRS): dummy
9
-	for i in $(DOCSUBDIRS); do \
10
+	+for i in $(DOCSUBDIRS); do \
11
 	  (cd $$i; $(SUBMAKE) ) || exit 1; \
12
 	done
13
 
14
 
15
 $(DUMMYSUBDIRS):        dummy
16
-	for i in $(ALLSUBDIRS); do \
17
+	+for i in $(ALLSUBDIRS); do \
18
 	  (cd $$i; $(SUBMAKE) ) || exit 1; \
19
 	done
20
 
21
 
22
 install: dummy
23
-	for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \
24
+	+for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \
25
 	  (cd $$i; $(MAKE) install) || exit 1; \
26
 	done
27
 
28
 
29
 uninstall: dummy
30
-	for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \
31
+	+for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \
32
 	  (cd $$i; $(MAKE) uninstall) || exit 1; \
33
 	done
34
 	$(RM) -Rf $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision)
35
@@ -127,10 +127,10 @@ uninstall: dummy
36
 
37
 
38
 clean: dummy
39
-	for i in $(ALLSUBDIRS); do \
40
+	+for i in $(ALLSUBDIRS); do \
41
 	  (cd $$i; $(MAKE) clean) || exit 1; \
42
 	done
43
-	for i in $(DOCSUBDIRS); do \
44
+	+for i in $(DOCSUBDIRS); do \
45
 	  (cd $$i; $(MAKE) clean) || exit 1; \
46
 	done
47
 
(-)files/patch-lib-Makefile.in (+43 lines)
Line 0 Link Here
1
specify libt1 as dependency for libt1x (for parallel builds)
2
3
--- lib/Makefile.in.orig	2007-12-23 15:49:42 UTC
4
+++ lib/Makefile.in
5
@@ -118,11 +118,11 @@ $(T1LIB_OBJS) $(T1LIBX_OBJS): t1lib_targ
6
 
7
 
8
 type1_target:
9
-	@set -e; (cd type1; $(SUBMAKE) ) || exit 1
10
+	+@set -e; (cd type1; $(SUBMAKE) ) || exit 1
11
 
12
 
13
 t1lib_target:
14
-	@set -e; (cd t1lib; $(SUBMAKE) ) || exit 1
15
+	+@set -e; (cd t1lib; $(SUBMAKE) ) || exit 1
16
 
17
 
18
 libt1.la: $(TYPE1_OBJS) $(T1LIB_OBJS)
19
@@ -133,7 +133,7 @@ libt1.la: $(TYPE1_OBJS) $(T1LIB_OBJS)
20
 	cp t1lib/t1lib.h .
21
 
22
 
23
-libt1x.la: $(T1LIBX_OBJS)
24
+libt1x.la: $(T1LIBX_OBJS) libt1.la
25
 	$(LIBTOOL) --mode=link \
26
 		$(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \
27
 	         -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
28
@@ -145,13 +145,13 @@ libt1x.la: $(T1LIBX_OBJS)
29
 
30
 
31
 dependencies: dummy
32
-	for i in $(LIBSUBDIRS); do \
33
+	+for i in $(LIBSUBDIRS); do \
34
 	  (cd $$i; $(MAKE) dependencies) || exit 1; \
35
 	done
36
 
37
 
38
 clean: dummy
39
-	for i in $(LIBSUBDIRS); do \
40
+	+for i in $(LIBSUBDIRS); do \
41
 	  (cd $$i; $(MAKE) clean) || exit 1; \
42
 	done
43
 	-$(RM) -f libt1*.la libt1*.a libt1*.so* *~ t1lib*.h .libs/*

Return to bug 236640