aboutsummaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2005-09-27 14:03:00 +0000
committerVolker Stolz <vs@FreeBSD.org>2005-09-27 14:03:00 +0000
commit48c21d76cf0926a408932cb45780a1884221fb8e (patch)
treeba5c1b5760ea186155da897cecc3c3f2a907dbd1 /archivers
parent05f6fa2a022e8e71219edc3112a1b34288f49362 (diff)
downloadports-48c21d76cf0926a408932cb45780a1884221fb8e.tar.gz
ports-48c21d76cf0926a408932cb45780a1884221fb8e.zip
Cleanup:
- no need for separate Makefile-patch - nuke static lib
Notes
Notes: svn path=/head/; revision=143626
Diffstat (limited to 'archivers')
-rw-r--r--archivers/dact/Makefile6
-rw-r--r--archivers/dact/files/patch-Makefile22
-rw-r--r--archivers/dact/pkg-plist1
3 files changed, 6 insertions, 23 deletions
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index fd9ebb9cd076..8da052b07743 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -28,11 +28,17 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
--libdir=${PREFIX}/lib
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ARGS= CONF=${EXAMPLESDIR}/dact.conf
MAN1= dact.1
INSTALLS_SHLIB= yes
+pre-install:
+ @${MKDIR} ${EXAMPLESDIR}
+ @${RM} -f ${WRKSRC}/libdact.a
+
post-install:
+ @${CP} -n ${EXAMPLESDIR}/dact.conf ${PREFIX}/etc
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/Docs/dact.txt ${DOCSDIR}
diff --git a/archivers/dact/files/patch-Makefile b/archivers/dact/files/patch-Makefile
deleted file mode 100644
index affd1f0ef0c6..000000000000
--- a/archivers/dact/files/patch-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig Tue Jan 18 21:48:30 2005
-+++ Makefile.in Tue Jan 18 21:54:30 2005
-@@ -25,6 +25,7 @@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
- libdir = @libdir@
-+exampledir= @prefix@/share/examples/dact
-
- CONF = $(sysconfdir)/dact.conf
- CFLAGS += -DDACT_CONFIG_FILE=\"$(CONF)\" -DEXEEXT=\"$(EXEEXT)\"
-@@ -87,7 +88,10 @@
- $(INSTALL) -m 755 dact$(EXEEXT) $(bindir)/dact$(EXEEXT)
-
- install: all install-bin
-- $(INSTALL) -m 644 dact.conf $(CONF)
-+ mkdir -p $(exampledir)
-+ $(INSTALL) -m 644 dact.conf $(exampledir)
-+ if [ ! -f $(CONF) ] ; then \
-+ $(INSTALL) -m 644 $(exampledir)/dact.conf $(CONF) ; fi
- $(INSTALL) -m 644 Docs/dact.1 $(mandir)/man1/dact.1
- @MODS@ -$(INSTALL) -m 755 libdact.so $(libdir)/libdact.so
- -$(INSTALL) -m 644 libdact.a $(libdir)/libdact.a
diff --git a/archivers/dact/pkg-plist b/archivers/dact/pkg-plist
index 643c3921d92a..2969226eca33 100644
--- a/archivers/dact/pkg-plist
+++ b/archivers/dact/pkg-plist
@@ -2,7 +2,6 @@ bin/dact
@unexec if cmp -s %D/etc/dact.conf %D/%%EXAMPLESDIR%%/dact.conf; then rm -f %D/etc/dact.conf; fi
%%EXAMPLESDIR%%/dact.conf
@exec [ -f %D/etc/dact.conf ] || cp %D/%%EXAMPLESDIR%%/dact.conf %D/etc/dact.conf
-lib/libdact.a
lib/libdact.so
%%DATADIR%%/cipher_chaos.so
%%DATADIR%%/cipher_psub.so