Index: Makefile =================================================================== --- Makefile (revision 496257) +++ Makefile (working copy) @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LGPL USES= cpe gmake libtool -GNU_CONFIGURE= yes -ALL_TARGET= without_doc USE_LDCONFIG= yes OPTIONS_DEFINE= X11 DOCS @@ -23,14 +21,11 @@ OPTIONS_DEFAULT= X11 OPTIONS_SUB= yes -X11_USE= XORG=xaw +X11_USE= XORG=ice,sm,x11,xaw,xext,xmu,xpm,xt X11_CONFIGURE_WITH= x -# Build fails with: -# gmake[2]: Entering directory '/wrkdirs/usr/ports/devel/t1lib/work/t1lib-5.1.2/lib' -# gmake[2]: *** pselect jobs pipe: Bad file descriptor. Stop. -# gmake[2]: *** Waiting for unfinished jobs.... -MAKE_JOBS_UNSAFE= YES +ALL_TARGET= without_doc +GNU_CONFIGURE= yes post-patch: @${REINPLACE_CMD} -e \ Index: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (nonexistent) +++ files/patch-Makefile.in (working copy) @@ -0,0 +1,47 @@ +add + for submake lines - needed by gmake for parallel building if $(MAKE) not used directly + +--- Makefile.in.orig 2007-12-23 15:49:43 UTC ++++ Makefile.in +@@ -93,25 +93,25 @@ dependencies: dummy + + + $(DOCSUBDIRS): dummy +- for i in $(DOCSUBDIRS); do \ ++ +for i in $(DOCSUBDIRS); do \ + (cd $$i; $(SUBMAKE) ) || exit 1; \ + done + + + $(DUMMYSUBDIRS): dummy +- for i in $(ALLSUBDIRS); do \ ++ +for i in $(ALLSUBDIRS); do \ + (cd $$i; $(SUBMAKE) ) || exit 1; \ + done + + + install: dummy +- for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \ ++ +for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \ + (cd $$i; $(MAKE) install) || exit 1; \ + done + + + uninstall: dummy +- for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \ ++ +for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \ + (cd $$i; $(MAKE) uninstall) || exit 1; \ + done + $(RM) -Rf $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision) +@@ -127,10 +127,10 @@ uninstall: dummy + + + clean: dummy +- for i in $(ALLSUBDIRS); do \ ++ +for i in $(ALLSUBDIRS); do \ + (cd $$i; $(MAKE) clean) || exit 1; \ + done +- for i in $(DOCSUBDIRS); do \ ++ +for i in $(DOCSUBDIRS); do \ + (cd $$i; $(MAKE) clean) || exit 1; \ + done + Property changes on: files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-lib-Makefile.in =================================================================== --- files/patch-lib-Makefile.in (nonexistent) +++ files/patch-lib-Makefile.in (working copy) @@ -0,0 +1,43 @@ +specify libt1 as dependency for libt1x (for parallel builds) + +--- lib/Makefile.in.orig 2007-12-23 15:49:42 UTC ++++ lib/Makefile.in +@@ -118,11 +118,11 @@ $(T1LIB_OBJS) $(T1LIBX_OBJS): t1lib_targ + + + type1_target: +- @set -e; (cd type1; $(SUBMAKE) ) || exit 1 ++ +@set -e; (cd type1; $(SUBMAKE) ) || exit 1 + + + t1lib_target: +- @set -e; (cd t1lib; $(SUBMAKE) ) || exit 1 ++ +@set -e; (cd t1lib; $(SUBMAKE) ) || exit 1 + + + libt1.la: $(TYPE1_OBJS) $(T1LIB_OBJS) +@@ -133,7 +133,7 @@ libt1.la: $(TYPE1_OBJS) $(T1LIB_OBJS) + cp t1lib/t1lib.h . + + +-libt1x.la: $(T1LIBX_OBJS) ++libt1x.la: $(T1LIBX_OBJS) libt1.la + $(LIBTOOL) --mode=link \ + $(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \ + -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \ +@@ -145,13 +145,13 @@ libt1x.la: $(T1LIBX_OBJS) + + + dependencies: dummy +- for i in $(LIBSUBDIRS); do \ ++ +for i in $(LIBSUBDIRS); do \ + (cd $$i; $(MAKE) dependencies) || exit 1; \ + done + + + clean: dummy +- for i in $(LIBSUBDIRS); do \ ++ +for i in $(LIBSUBDIRS); do \ + (cd $$i; $(MAKE) clean) || exit 1; \ + done + -$(RM) -f libt1*.la libt1*.a libt1*.so* *~ t1lib*.h .libs/* Property changes on: files/patch-lib-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property