Mon Nov 12 17:54:40 2018 UTC ()
Refactor libtoolization: integrate it into the upstream Makefile.
No visible change on NetBSD, CentOS 6, OS X 10.14.


(schmonz)
diff -r1.11 -r1.12 pkgsrc/devel/syncdir/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/syncdir/distinfo
diff -r0 -r1.1 pkgsrc/devel/syncdir/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/devel/syncdir/patches/patch-testsync.c
cvs diff -r1.11 -r1.12 pkgsrc/devel/syncdir/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/syncdir/Makefile 2017/07/20 02:07:27 1.11
+++ pkgsrc/devel/syncdir/Makefile 2018/11/12 17:54:40 1.12
@@ -1,37 +1,27 @@ @@ -1,37 +1,27 @@
1# $NetBSD: Makefile,v 1.11 2017/07/20 02:07:27 schmonz Exp $ 1# $NetBSD: Makefile,v 1.12 2018/11/12 17:54:40 schmonz Exp $
2# 2#
3 3
4DISTNAME= syncdir-1.0 4DISTNAME= syncdir-1.0
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${HOMEPAGE} 7MASTER_SITES= ${HOMEPAGE}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://untroubled.org/syncdir/ 10HOMEPAGE= http://untroubled.org/syncdir/
11COMMENT= Implementation of open, link, rename, and unlink 11COMMENT= Synchronous open, link, rename, and unlink
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15 15
16INSTALLATION_DIRS= lib 16INSTALLATION_DIRS= lib
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20.if ${OPSYS} == "SunOS" 20.if ${OPSYS} == "SunOS"
21SUBST_CLASSES+= fsync 21SUBST_CLASSES+= fsync
22SUBST_STAGE.fsync= do-configure 22SUBST_STAGE.fsync= do-configure
23SUBST_FILES.fsync= syncdir.c 23SUBST_FILES.fsync= syncdir.c
24SUBST_SED.fsync= -e 's|syscall(SYS_fsync, FD)|fsync(FD)|' 24SUBST_SED.fsync= -e 's|syscall(SYS_fsync, FD)|fsync(FD)|'
25.endif 25.endif
26 26
27do-build: 
28 cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c syncdir.c 
29 cd ${WRKSRC} && ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} \ 
30 -o libsyncdir.la syncdir.lo \ 
31 -version-info 1:0:0 -rpath ${PREFIX}/lib 
32 
33do-install: 
34 cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 
35 -c libsyncdir.la ${DESTDIR}${PREFIX}/lib/libsyncdir.la 
36 
37.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/devel/syncdir/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/syncdir/distinfo 2017/07/20 03:21:16 1.5
+++ pkgsrc/devel/syncdir/distinfo 2018/11/12 17:54:40 1.6
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.5 2017/07/20 03:21:16 schmonz Exp $ 1$NetBSD: distinfo,v 1.6 2018/11/12 17:54:40 schmonz Exp $
2 2
3SHA1 (syncdir-1.0.tar.gz) = fdc3e282acd4af15e9bffb343ee825d69dde162e 3SHA1 (syncdir-1.0.tar.gz) = fdc3e282acd4af15e9bffb343ee825d69dde162e
4RMD160 (syncdir-1.0.tar.gz) = b032a8481529c54b4ac149fdf98ad888e0a392f0 4RMD160 (syncdir-1.0.tar.gz) = b032a8481529c54b4ac149fdf98ad888e0a392f0
5SHA512 (syncdir-1.0.tar.gz) = 0b5262e23e43f34be7bc31ed6baf7624a115a509e459504651b184a0856c7918671db4be1b8e14552f275c49c5c6bbc00d786c57f1d96548a491048674f58317 5SHA512 (syncdir-1.0.tar.gz) = 0b5262e23e43f34be7bc31ed6baf7624a115a509e459504651b184a0856c7918671db4be1b8e14552f275c49c5c6bbc00d786c57f1d96548a491048674f58317
6Size (syncdir-1.0.tar.gz) = 8878 bytes 6Size (syncdir-1.0.tar.gz) = 8878 bytes
 7SHA1 (patch-Makefile) = ed9063d6359f4dc8cf905cb85b14e830a65832d9
7SHA1 (patch-syncdir.c) = eb289d0fd2fa29adb941899603835a14df4bc4f0 8SHA1 (patch-syncdir.c) = eb289d0fd2fa29adb941899603835a14df4bc4f0
 9SHA1 (patch-testsync.c) = 03f536c6ba1af64c9dca6735ce8cc58a1270bc3f
File Added: pkgsrc/devel/syncdir/patches/Attic/patch-Makefile
$NetBSD: patch-Makefile,v 1.1 2018/11/12 17:54:40 schmonz Exp $

Libtoolize for portability.

--- Makefile.orig	1998-07-13 19:33:23.000000000 +0000
+++ Makefile
@@ -1,34 +1,33 @@
 VERSION	= 1.0
 
-CFLAGS	= -O2 -Wall -g
-CC	= gcc
-LDFLAGS	=
-LD	= $(CC)
-prefix	= /usr
+CFLAGS	?= -O2 -Wall -g
+CC	?= gcc
+LDFLAGS	?=
+LD	?= $(CC)
+prefix	= $(PREFIX)
 libdir	= $(prefix)/lib
 
-OBJS	= syncdir.o
 LOBJS	= syncdir.lo
 
-all:	libsyncdir.so libsyncdir.a
+LIBTOOL	= libtool --tag=CC
 
-testsync: testsync.o libsyncdir.a
-	$(LD) $(LDFLAGS) -o $@ $< libsyncdir.a
+all:	libsyncdir.la
 
-libsyncdir.so:	$(LOBJS)
-	$(LD) $(LDFLAGS) -shared -Wl,-soname,libsyncdir.so \
-		-o libsyncdir.so $(LOBJS)
+.SUFFIXES: .lo
+.c.lo:
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
 
-syncdir.lo:	syncdir.c
-	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
-syncdir.o:	syncdir.c
+testsync: testsync.lo libsyncdir.la
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $< libsyncdir.la
 
-libsyncdir.a:	$(OBJS)
-	ar r libsyncdir.a $(OBJS)
+libsyncdir.la: libtool-version-info $(LOBJS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) -version-info `cat libtool-version-info` -rpath $(libdir)
+
+libtool-version-info:
+	echo $(VERSION) | awk -F. '{ printf "%d:%d:0", $$1, $$2 }' > $@
 
 install:	all
-	install -m 755 libsyncdir.so $(libdir)
-	install -m 644 libsyncdir.a $(libdir)
+	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) libsyncdir.la $(DESTDIR)$(libdir)
 
 TARGET	= syncdir-$(VERSION)
 FILES	= Makefile COPYING syncdir.c syncdir.spec testsync.c
@@ -39,5 +38,5 @@ distrib:
 	$(RM) -r $(TARGET)
 
 clean:
-	$(RM) core *.o *.lo *.so *.a testsync $(TARGET).tar.gz
-
+	$(RM) libtool-version-info core *.o *.lo *.la *.so *.a testsync $(TARGET).tar.gz
+	$(RM) -r .libs
File Added: pkgsrc/devel/syncdir/patches/Attic/patch-testsync.c
$NetBSD: patch-testsync.c,v 1.1 2018/11/12 17:54:40 schmonz Exp $

Libtoolize.

--- testsync.c.orig	1998-07-13 19:43:05.000000000 +0000
+++ testsync.c
@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <string.h>
 
-inline void msg(const char* m)
+void msg(const char* m)
 {
   write(1, m, strlen(m));
 }