summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authortv <tv>1998-07-20 15:10:35 +0000
committertv <tv>1998-07-20 15:10:35 +0000
commitbd796740c6c1ef6f27ac1f65a10cf7a70f7d76c1 (patch)
tree694bc870a5dc6c5e8fc63210c43b4aa540b4eb9b /converters
parent2767ea57ce1c115d9095d2da604cc216d9ed9b91 (diff)
downloadpkgsrc-bd796740c6c1ef6f27ac1f65a10cf7a70f7d76c1.tar.gz
Use libtool to create shared library. Don't try to build anything in
uudeview except libuu.
Diffstat (limited to 'converters')
-rw-r--r--converters/uulib/Makefile21
-rw-r--r--converters/uulib/patches/patch-aa82
-rw-r--r--converters/uulib/patches/patch-ab14
3 files changed, 54 insertions, 63 deletions
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 82b158c4812..30730f265e4 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/07/15 11:57:30 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/07/20 15:10:35 tv Exp $
# FreeBSD Id: Makefile,v 1.14 1998/02/18 22:20:02 hoek Exp
#
@@ -10,12 +10,17 @@ MASTER_SITES= http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/ \
MAINTAINER= packages@netbsd.org
+BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool
+
# "kdesupport-2.1b" included "uu" library.
CONFLICTS= kdesupport-2.1b
GNU_CONFIGURE= yes
-ALL_TARGET= libuu.a libuu.so.1.0
+ALL_TARGET= libuu.la
+MAKE_ENV= LIBTOOL=${PREFIX}/bin/libtool
+
+WRKSRC= ${WRKDIR}/${DISTNAME}/uulib
DOCFILES= HISTORY doc/Makefile doc/README doc/binhex.fig \
doc/library.ltx doc/structure.fig doc/td-v1.c doc/td-v2.c \
@@ -24,18 +29,14 @@ DOCFILES= HISTORY doc/Makefile doc/README doc/binhex.fig \
.include "../../mk/bsd.prefs.mk"
do-install:
- ${INSTALL_DATA} ${WRKSRC}/uulib/libuu.so.1.0 ${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/uulib/libuu.a ${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/uulib/uudeview.h ${PREFIX}/include/uu.h
+ ${PREFIX}/bin/libtool ${INSTALL_DATA} ${WRKSRC}/libuu.la ${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKSRC}/uudeview.h ${PREFIX}/include/uu.h
${SED} -e 's|FUNKYTOKENHERE|${PREFIX}|g' <${FILESDIR}/uulib.3 >${WRKSRC}/uulib.3
${INSTALL_MAN} ${WRKSRC}/uulib.3 ${PREFIX}/man/man3
-.if !defined(NOPORTDOCS)
- @echo "===> Installing documentation for ${PKGNAME}"
- @${MKDIR} ${PREFIX}/share/doc/uulib
+ @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uulib
@${INSTALL_MAN} ${FILESDIR}/porting.notes ${PREFIX}/share/doc/uulib
.for docfile in ${DOCFILES}
- @${INSTALL_MAN} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/uulib
+ @${INSTALL_MAN} ${WRKSRC}/../${docfile} ${PREFIX}/share/doc/uulib
.endfor
-.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/uulib/patches/patch-aa b/converters/uulib/patches/patch-aa
index a8f3f482963..784acff630d 100644
--- a/converters/uulib/patches/patch-aa
+++ b/converters/uulib/patches/patch-aa
@@ -1,39 +1,43 @@
-*** uulib/Makefile.in Mon Oct 14 16:19:18 1996
---- /devel/ports/new.new.uulib/src/uulib/Makefile.in Sun Feb 9 23:37:42 1997
-***************
-*** 50,56 ****
- #
-
- .SUFFIXES:
-! .SUFFIXES: .c .o
-
- all: libuu.a
-
---- 50,56 ----
- #
-
- .SUFFIXES:
-! .SUFFIXES: .c .o .so
-
- all: libuu.a
-
-***************
-*** 73,80 ****
---- 73,89 ----
- ar r $@ $(UULIB_OBJ)
- -$(RANLIB) $@
-
-+ SOBJS= $(UULIB_OBJ:.o=.so)
-+ libuu.so.1.0: $(SOBJS)
-+ rm -f $(.TARGET)
-+ ld -Bshareable -x -o libuu.so.1.0 `lorder $(SOBJS) | tsort -q`
-+
-+ .c.so:
-+ $(CC) -fpic -DPIC -c -o $(.TARGET) $(CFLAGS) $(VDEF) $(.IMPSRC)
-+
- .c.o:
- $(CC) -c $(CFLAGS) $(VDEF) $<
-+
-
- uuencode.o: uuencode.c uudeview.h uuint.h uustring.h fptools.h config.h
- uulib.o: uulib.c uudeview.h uuint.h uustring.h fptools.h config.h
+--- Makefile.in.orig Mon Jul 20 10:54:23 1998
++++ Makefile.in Mon Jul 20 10:55:55 1998
+@@ -20,7 +20,7 @@
+ #
+ # If you don't have the GNU C compiler installed, set CC=cc here
+ #
+-CC = @CC@
++CC = $(LIBTOOL) @CC@
+ #
+ # C Compiler Options
+ #
+@@ -52,11 +52,11 @@
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+
+-all: libuu.a
++all: libuu.la
+
+ clean:
+ rm -f [Xx]deview gif2gfp
+- rm -f *.o *.a *.so core *~ TAGS
++ rm -f *.o *.la *.so core *~ TAGS
+
+ distclean: clean
+ rm -f config.status config.cache config.log Makefile config.h
+@@ -65,13 +65,13 @@
+ realclean: distclean
+
+ new: clean
+- rm -f libuu.a
++ rm -f libuu.la
+ $(MAKE) all
+
+-libuu.a: $(UULIB_OBJ)
++libuu.la: $(UULIB_OBJ)
+ rm -f $@
+- ar r $@ $(UULIB_OBJ)
+- -$(RANLIB) $@
++ $(CC) -o libuu.la $(UULIB_OBJ:.o=.lo) -rpath $(PREFIX)/lib \
++ -version-info 1:0
+
+ .c.o:
+ $(CC) -c $(CFLAGS) $(VDEF) $<
diff --git a/converters/uulib/patches/patch-ab b/converters/uulib/patches/patch-ab
deleted file mode 100644
index 8551de5336b..00000000000
--- a/converters/uulib/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-*** Makefile.in Mon Oct 14 16:19:01 1996
---- /devel/ports/new.new.uulib/src/Makefile.in Mon Feb 10 00:03:24 1997
-***************
-*** 170,175 ****
---- 170,179 ----
- libuu.a: uulib/config.h
- (cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )
-
-+ libuu.so.1.0: uulib/config.h
-+ (cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' \
-+ libuu.so.1.0 )
-+
- minews:
- (cd inews; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )