From 8a41ef31eea153c2d553025d3e0844b7bd86a405 Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Sun, 1 Jun 2014 14:02:15 +0000 Subject: [PATCH] - Add staging support, strip binaries - Remove leading article from COMMENT - Use canonical names for patches --- lang/siod/Makefile | 8 +-- lang/siod/files/patch-aa | 37 ---------- lang/siod/files/patch-makefile | 79 +++++++++++++++++++++ lang/siod/files/{patch-ab => patch-regex.c} | 0 lang/siod/files/{patch-ac => patch-slibu.c} | 0 lang/siod/pkg-plist | 12 ++++ 6 files changed, 94 insertions(+), 42 deletions(-) delete mode 100644 lang/siod/files/patch-aa create mode 100644 lang/siod/files/patch-makefile rename lang/siod/files/{patch-ab => patch-regex.c} (100%) rename lang/siod/files/{patch-ac => patch-slibu.c} (100%) diff --git a/lang/siod/Makefile b/lang/siod/Makefile index b6b4331676c9..94ee9537585e 100644 --- a/lang/siod/Makefile +++ b/lang/siod/Makefile @@ -10,7 +10,7 @@ DISTNAME= siod EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= A small footprint implementation of the Scheme programming language +COMMENT= Small footprint implementation of the Scheme programming language USE_LDCONFIG= yes @@ -20,9 +20,7 @@ ALL_TARGET= freebsd MAKE_ENV= LD_LIBRARY_PATH=. MAKE_JOBS_UNSAFE= yes -MAN1= siod.1 snapshot-dir.1 snapshot-compare.1 http-get.1 \ - cp-build.1 ftp-cp.1 csiod.1 ftp-put.1 ftp-test.1 ftp-get.1 \ - http-stress.1 proxy-server.1 +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/siod -NO_STAGE= yes .include diff --git a/lang/siod/files/patch-aa b/lang/siod/files/patch-aa deleted file mode 100644 index e03746807030..000000000000 --- a/lang/siod/files/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ ---- makefile-- Fri Feb 20 18:22:04 1998 -+++ makefile Wed Apr 28 13:02:03 1999 -@@ -19,10 +19,10 @@ - # - # - MANSEC=1 --MANDIR=$(IROOT)/usr/local/man/man$(MANSEC) --BINDIR=$(IROOT)/usr/local/bin --INCDIR=$(IROOT)/usr/local/include --LIBDIR=$(IROOT)/usr/local/lib -+MANDIR=$(PREFIX)/man/man$(MANSEC) -+BINDIR=$(PREFIX)/bin -+INCDIR=$(PREFIX)/include -+LIBDIR=$(PREFIX)/lib - LIBSIODDIR=$(LIBDIR)/siod - CP_F=cp -f - # -Wmissing-prototypes -@@ -270,6 +270,19 @@ - CFLAGS="$(CDEBUG)" \ - LD_EXE_LIBS="-lm -ldl" \ - build_driver -+ -+## FreeBSD, possibly other BSDs -+freebsd: -+ $(MAKE) \ -+ PROGS="siod tar.so parser_pratt.so ss.so \ -+ regex.so" \ -+ CFLAGS="$(CDEBUG) $(GCCW) -DHAVE_SYS_PARAM_H $(CFLAGS) -fPIC" \ -+ LD_LIB_LIBS="-lcrypt -lm" \ -+ LD_LIB_FLAGS="-shared" \ -+ LD_EXE_FLAGS="-rdynamic -Xlinker -rpath -Xlinker $(LIBDIR) -Xlinker -rpath -Xlinker $(LIBSIODDIR)" \ -+ SO="so" \ -+ build_driver -+ - - unknown: - -ln -s ssiod siod diff --git a/lang/siod/files/patch-makefile b/lang/siod/files/patch-makefile new file mode 100644 index 000000000000..b3ff3a4244ea --- /dev/null +++ b/lang/siod/files/patch-makefile @@ -0,0 +1,79 @@ +--- makefile.orig 2000-03-14 16:26:55.000000000 +0100 ++++ makefile 2014-06-01 15:48:40.620294169 +0200 +@@ -19,10 +19,10 @@ + # + # + MANSEC=1 +-MANDIR=$(IROOT)/usr/local/man/man$(MANSEC) +-BINDIR=$(IROOT)/usr/local/bin +-INCDIR=$(IROOT)/usr/local/include +-LIBDIR=$(IROOT)/usr/local/lib ++MANDIR=$(PREFIX)/man/man$(MANSEC) ++BINDIR=$(PREFIX)/bin ++INCDIR=$(PREFIX)/include ++LIBDIR=$(PREFIX)/lib + LIBSIODDIR=$(LIBDIR)/siod + CP_F=cp -f + # -Wmissing-prototypes +@@ -300,6 +300,19 @@ + LD_EXE_LIBS="-lm -ldl" \ + build_driver + ++## FreeBSD, possibly other BSDs ++freebsd: ++ $(MAKE) \ ++ PROGS="siod tar.so parser_pratt.so ss.so \ ++ regex.so" \ ++ CFLAGS="$(CDEBUG) $(GCCW) -DHAVE_SYS_PARAM_H $(CFLAGS) -fPIC" \ ++ LD_LIB_LIBS="-lcrypt -lm" \ ++ LD_LIB_FLAGS="-shared" \ ++ LD_EXE_FLAGS="-rdynamic -Xlinker -rpath -Xlinker $(LIBDIR) -Xlinker -rpath -Xlinker $(LIBSIODDIR)" \ ++ SO="so" \ ++ build_driver ++ ++ + unknown: + -ln -s ssiod siod + $(MAKE) \ +@@ -457,30 +470,30 @@ + install: $(DISTFILES) + @echo "Note: This does not do a build. Only installs what already" + @echo " sits in the directory." +- -mkdir -p $(MANDIR) +- -mkdir -p $(BINDIR) +- -mkdir -p $(LIBDIR) +- -mkdir -p $(INCDIR) +- -mkdir -p $(LIBSIODDIR) ++ -mkdir -p $(DESTDIR)$(MANDIR) ++ -mkdir -p $(DESTDIR)$(BINDIR) ++ -mkdir -p $(DESTDIR)$(LIBDIR) ++ -mkdir -p $(DESTDIR)$(INCDIR) ++ -mkdir -p $(DESTDIR)$(LIBSIODDIR) + -for X in $(INTO_BINDIR) ; do \ +- $(CP_F) $$X $(BINDIR) ;\ ++ $(CP_F) $$X $(DESTDIR)$(BINDIR) ;\ + done + -for X in $(LIBFILES) ; do \ +- $(CP_F) $$X $(LIBSIODDIR) ;\ ++ $(CP_F) $$X $(DESTDIR)$(LIBSIODDIR) ;\ + done + -for X in $(SOLIBFILES) ; do \ + for E in so sl ; do \ +- $(CP_F) $$X.$$E $(LIBSIODDIR) ;\ ++ $(BSD_INSTALL_LIB) $$X.$$E $(DESTDIR)$(LIBSIODDIR) ;\ + done ;\ + done + -for X in $(INTO_LIBDIR) ; do \ +- $(CP_F) $$X $(LIBDIR) ;\ ++ $(BSD_INSTALL_LIB) $$X $(DESTDIR)$(LIBDIR) ;\ + done + -for X in $(MANPAGES) ; do \ +- $(CP_F) $$X.man $(MANDIR)/$$X.$(MANSEC) ;\ ++ $(CP_F) $$X.man $(DESTDIR)$(MANDIR)/$$X.$(MANSEC) ;\ + done + -for X in $(PUBINCS) ; do \ +- $(CP_F) $$X $(INCDIR) ;\ ++ $(CP_F) $$X $(DESTDIR)$(INCDIR) ;\ + done + @echo "Install done." + diff --git a/lang/siod/files/patch-ab b/lang/siod/files/patch-regex.c similarity index 100% rename from lang/siod/files/patch-ab rename to lang/siod/files/patch-regex.c diff --git a/lang/siod/files/patch-ac b/lang/siod/files/patch-slibu.c similarity index 100% rename from lang/siod/files/patch-ac rename to lang/siod/files/patch-slibu.c diff --git a/lang/siod/pkg-plist b/lang/siod/pkg-plist index d823e8e07d06..d60cbfa9c6f1 100644 --- a/lang/siod/pkg-plist +++ b/lang/siod/pkg-plist @@ -39,4 +39,16 @@ lib/siod/regex.so lib/siod/parser_pratt.so lib/libsiod.so include/siod.h +man/man1/cp-build.1.gz +man/man1/csiod.1.gz +man/man1/ftp-cp.1.gz +man/man1/ftp-get.1.gz +man/man1/ftp-put.1.gz +man/man1/ftp-test.1.gz +man/man1/http-get.1.gz +man/man1/http-stress.1.gz +man/man1/proxy-server.1.gz +man/man1/siod.1.gz +man/man1/snapshot-compare.1.gz +man/man1/snapshot-dir.1.gz @dirrm lib/siod