diff options
-rw-r--r-- | net/Makefile | 3 | ||||
-rw-r--r-- | net/unison-devel/DESCR | 7 | ||||
-rw-r--r-- | net/unison-devel/Makefile | 52 | ||||
-rw-r--r-- | net/unison-devel/PLIST | 9 | ||||
-rw-r--r-- | net/unison-devel/distinfo | 8 | ||||
-rw-r--r-- | net/unison-devel/patches/patch-aa | 42 | ||||
-rw-r--r-- | net/unison-devel/patches/patch-ab | 27 | ||||
-rw-r--r-- | net/unison-devel/patches/patch-ac | 13 |
8 files changed, 1 insertions, 160 deletions
diff --git a/net/Makefile b/net/Makefile index f640f9c7ede..b5823625a3f 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.791 2009/11/19 15:50:13 sborrill Exp $ +# $NetBSD: Makefile,v 1.792 2009/11/20 20:22:08 wiz Exp $ # COMMENT= Networking tools @@ -547,7 +547,6 @@ SUBDIR+= udptunnel SUBDIR+= unbound SUBDIR+= unfs3 SUBDIR+= unison -SUBDIR+= unison-devel SUBDIR+= unworkable SUBDIR+= upclient SUBDIR+= upnpinspector diff --git a/net/unison-devel/DESCR b/net/unison-devel/DESCR deleted file mode 100644 index adb6e8f2641..00000000000 --- a/net/unison-devel/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -Unison is a file-synchronization tool for Unix and Windows. It allows -two replicas of a collection of files and directories to be stored -on different hosts (or different disks on the same host), modified -separately, and then brought up to date by propagating the changes -in each replica to the other. - -This is a beta version of Unison. diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile deleted file mode 100644 index d69a37c4c55..00000000000 --- a/net/unison-devel/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# $NetBSD: Makefile,v 1.21 2008/07/25 19:43:13 tonio Exp $ - -DISTNAME= unison-2.30.4 - -CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/beta/ - -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/ -COMMENT= File-synchronization tool - -PKG_INSTALLATION_TYPES= overwrite pkgviews -PKG_DESTDIR_SUPPORT= user-destdir - -DIST_SUBDIR= ${PKGNAME_NOREV} -BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2 - -# docs: unison-manual.pdf/html/ps/dvi -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_TOOLS+= gmake -MAKE_FLAGS+= CFLAGS="" -MAKE_ENV+= HOME=${WRKDIR:Q} - -.include "../../net/unison/options.mk" -.include "../../mk/bsd.prefs.mk" - -.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc") -MAKE_FLAGS+= NATIVE=true -.else -MAKE_FLAGS+= NATIVE=false -.endif - -.include "../../mk/pthread.buildlink3.mk" - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none") -MAKE_FLAGS+= THREADS=true -.endif - -INSTALLATION_DIRS= bin -INSTALLATION_DIRS+= share/doc/unison - -post-install: - ${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison - ${INSTALL_MAN} ${WRKSRC}/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison - -.include "../../lang/ocaml/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/unison-devel/PLIST b/net/unison-devel/PLIST deleted file mode 100644 index cb41766f15f..00000000000 --- a/net/unison-devel/PLIST +++ /dev/null @@ -1,9 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:09:47 joerg Exp $ -bin/unison -share/doc/unison/BUGS.txt -share/doc/unison/CONTRIB -share/doc/unison/COPYING -share/doc/unison/NEWS -share/doc/unison/README -share/doc/unison/ROADMAP.txt -share/doc/unison/TODO.txt diff --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo deleted file mode 100644 index 1644a156d8c..00000000000 --- a/net/unison-devel/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.15 2008/07/25 19:43:14 tonio Exp $ - -SHA1 (unison-2.30.4/unison-2.30.4.tar.gz) = 7bb8611bddba1a2515e3aae3b9dcb49502d1c207 -RMD160 (unison-2.30.4/unison-2.30.4.tar.gz) = 947ac175162b04a67d7b7b2b093c42f67005da61 -Size (unison-2.30.4/unison-2.30.4.tar.gz) = 627145 bytes -SHA1 (patch-aa) = 87c99147960e8d77d2d8b9fc47e4ebff2d77d884 -SHA1 (patch-ab) = d1ca5128ff3177c2592e0035da10350d91c5f68f -SHA1 (patch-ac) = d996e1ffff23da511976ba4455391952afab6234 diff --git a/net/unison-devel/patches/patch-aa b/net/unison-devel/patches/patch-aa deleted file mode 100644 index 1e62538174b..00000000000 --- a/net/unison-devel/patches/patch-aa +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2008/07/25 19:43:14 tonio Exp $ - ---- Makefile.orig 2007-04-02 05:03:20.000000000 +0200 -+++ Makefile -@@ -39,7 +39,7 @@ all:: INSTALL - - INSTALL: $(NAME)$(EXEC_EXT) - # file isn't made for OS X, so check that it's there first -- (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi) -+## (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi) - - ######################################################################## - ## Miscellaneous developer-only switches -@@ -68,7 +68,7 @@ include Makefile.OCaml - ###################################################################### - # Installation - --INSTALLDIR = $(HOME)/bin/ -+INSTALLDIR = ${DESTDIR}$(PREFIX)/bin/ - - # This has two names because on OSX the file INSTALL shadows the target 'install'! - install: doinstall -@@ -80,10 +80,7 @@ text: - make -C .. text - - doinstall: $(NAME)$(EXEC_EXT) -- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) - cp $(NAME)$(EXEC_EXT) $(INSTALLDIR) -- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT) -- - - ###################################################################### - # Demo -@@ -332,7 +329,7 @@ testmerge: - tags: - -$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt - --all:: TAGS -+#all:: TAGS - - TAGS: - $(MAKE) tags diff --git a/net/unison-devel/patches/patch-ab b/net/unison-devel/patches/patch-ab deleted file mode 100644 index 8fe03892500..00000000000 --- a/net/unison-devel/patches/patch-ab +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2005/09/27 14:44:18 tonio Exp $ - ---- Makefile.OCaml.orig 2005-08-12 02:26:59.000000000 +0200 -+++ Makefile.OCaml -@@ -29,6 +29,11 @@ ifeq ($(shell uname),Darwin) - else - ifeq ($(shell uname),OpenBSD) - OSARCH=OpenBSD -+ else -+ifeq ($(shell uname),NetBSD) -+ OSARCH=NetBSD -+ STATIC=true -+endif - endif - endif - endif -@@ -242,6 +247,10 @@ else - endif - endif - -+ifeq ($(OSARCH), NetBSD) -+ OCAMLDOT=false -+endif -+ - # Rebuild dependencies (must be invoked manually) - .PHONY: depend - depend:: diff --git a/net/unison-devel/patches/patch-ac b/net/unison-devel/patches/patch-ac deleted file mode 100644 index e09e6cea3a3..00000000000 --- a/net/unison-devel/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.9 2007/05/30 12:46:58 tonio Exp $ - ---- pty.c.orig 2007-04-13 16:30:01.000000000 +0200 -+++ pty.c -@@ -15,7 +15,7 @@ extern void uerror (char * cmdname, valu - #define HAS_OPENPTY 1 - #endif - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__NetBSD__) - #include <util.h> - #define HAS_OPENPTY 1 - #endif |