Responsible-Changed-From-To: freebsd-ports-bugs->itetcu
Responsible-Changed-By: itetcu
Responsible-Changed-When: Sun May 14 11:04:40 UTC 2006
Responsible-Changed-Why:
I'll take it.
http://www.freebsd.org/cgi/query-pr.cgi?pr=97210
State-Changed-From-To: open->feedback
State-Changed-By: itetcu
State-Changed-When: Sun May 14 12:08:15 UTC 2006
State-Changed-Why:
s:/usr/local:${PREFIX}: in CONFIGURE_ARGS, is here a reason to install
docs in doc/epkg and not share/doc/epkg ? Please don't overwrite
etc/mkencap_environment on reinstall / portupgade and also install it at
.sample. Thanks.
http://www.freebsd.org/cgi/query-pr.cgi?pr=97210
From: Jim Pirzyk <pirzyk@FreeBSD.org>
To: Ion-Mihai Tetcu <itetcu@FreeBSD.org>, bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/97210: New port: archivers/epkg - Encap Package manager
Date: Sun, 14 May 2006 13:59:07 -0500
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--Apple-Mail-3--325260294
Content-Type: multipart/mixed; boundary=Apple-Mail-2--325260506
--Apple-Mail-2--325260506
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
delsp=yes;
format=flowed
On May 14, 2006, at 12:08 PM, Ion-Mihai Tetcu wrote:
> Synopsis: New port: archivers/epkg - Encap Package manager
>
> State-Changed-From-To: open->feedback
> State-Changed-By: itetcu
> State-Changed-When: Sun May 14 12:08:15 UTC 2006
> State-Changed-Why:
> s:/usr/local:${PREFIX}: in CONFIGURE_ARGS, is here a reason to install
> docs in doc/epkg and not share/doc/epkg ? Please don't overwrite
> etc/mkencap_environment on reinstall / portupgade and also install
> it at
> .sample. Thanks.
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=97210
Here is a diff from the original that I submitted. If I should
resubmit the entire package, I can do that as well.
I had some suggestions, maybe portlint can detect and warn about
these cases as well (and the ones you also suggested in nph)?
The /usr/local probably should be an error though.
--Apple-Mail-2--325260506
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="epkg.patch"
Content-Disposition: attachment;
filename=epkg.patch
diff -Nru epkg.orig/Makefile epkg/Makefile
--- epkg.orig/Makefile Sat May 13 11:45:06 2006
+++ epkg/Makefile Sun May 14 11:06:34 2006
@@ -18,7 +18,7 @@
${LOCALBASE}/lib/libcurl.a:${PORTSDIR}/ftp/curl
HAS_CONFIGURE= YES
-CONFIGURE_ENV= CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib
+CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib
CONFIGURE_ARGS= --disable-encap --disable-epkg-install --with-libfget --without-libtar
MAN1= epkg.1 \
@@ -63,4 +63,13 @@
encapinfo_write.3
MAN5= encap_profile.5
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+do-install:
+ @(cd ${BUILD_WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-recurse)
+
+ -@${MKDIR} ${PREFIX}/etc
+ @${CP} ${WRKSRC}/mkencap/mkencap_environment ${PREFIX}/etc/mkencap_environment.sample
+ PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.post.mk>
diff -Nru epkg.orig/files/patch-doc::Makefile.in epkg/files/patch-doc::Makefile.in
--- epkg.orig/files/patch-doc::Makefile.in Wed Dec 31 18:00:00 1969
+++ epkg/files/patch-doc::Makefile.in Sun May 14 10:50:03 2006
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig Thu Nov 21 11:56:12 2002
++++ doc/Makefile.in Sun May 14 10:49:48 2006
+@@ -6,7 +6,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ mandir = @mandir@
+-docdir = @prefix@/doc
++docdir = @datadir@/doc
+
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
diff -Nru epkg.orig/pkg-install epkg/pkg-install
--- epkg.orig/pkg-install Wed Dec 31 18:00:00 1969
+++ epkg/pkg-install Sun May 14 11:16:00 2006
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+PKG_PREFIX=${PKG_PREFIX:-/usr/local}
+
+if [ $# -ne 2 ]; then
+ echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+ exit 1
+fi
+
+case $2 in
+ POST-INSTALL)
+
+ if [ ! -d "${PKG_PREFIX}/etc" ]; then
+ echo "creating directory: ${PKG_PREFIX}/etc";
+ mkdir -p "${PKG_PREFIX}/etc";
+ fi
+
+ if [ ! -f "${PKG_PREFIX}/etc/mkencap_environment" ]; then
+ echo "installing: ${PKG_PREFIX}/etc/mkencap_environment";
+ cp "${PKG_PREFIX}/etc/mkencap_environment.sample" "${PKG_PREFIX}/etc/mkencap_environment";
+ fi
+ ;;
+esac
+
+exit 0
diff -Nru epkg.orig/pkg-plist epkg/pkg-plist
--- epkg.orig/pkg-plist Sat May 13 11:49:21 2006
+++ epkg/pkg-plist Sun May 14 11:07:56 2006
@@ -1,11 +1,12 @@
+@unexec cmp %D/etc/mkencap_environment.sample %D/etc/mkencap_environment && rm %D/etc/mkencap_environment
bin/epkg
bin/mkencap
-doc/encap/encap2.0-specification.txt
-doc/encap/encap2.1-specification.txt
-doc/encap/encap_profile.dtd
-etc/mkencap_environment
+etc/mkencap_environment.sample
include/encap.h
include/encap_listhash.h
lib/libencap.a
+share/doc/encap/encap2.0-specification.txt
+share/doc/encap/encap2.1-specification.txt
+share/doc/encap/encap_profile.dtd
share/mkencap.m4
-@dirrmtry doc/encap
+@dirrmtry share/doc/encap
diff -Nru epkg.orig/pkg-descr epkg/pkg-descr
--- epkg.orig/pkg-descr Sun May 14 12:09:24 2006
+++ epkg/pkg-descr Sun May 14 11:59:20 2006
@@ -1 +1,3 @@
Encap Package Manger
+
+WWW: http://www.encap.org/epkg/
--Apple-Mail-2--325260506
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
Thanks
- JimP
--- @(#) $Id: dot.signature,v 1.14 2004/02/03 02:46:26 pirzyk Exp $
__o pirzyk@uiuc.edu --------------------------- jim@pirzyk.org
_'\<,_ Systems Management Group, CITES
(*)/ (*) University of Illinois at Urbana-Champaign
--Apple-Mail-2--325260506--
--Apple-Mail-3--325260294
content-type: application/pgp-signature; x-mac-type=70674453;
name=PGP.sig
content-description: This is a digitally signed message part
content-disposition: inline; filename=PGP.sig
content-transfer-encoding: 7bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (Darwin)
iD8DBQFEZ34A2EYx0U4j2soRAqREAKCf/dNPzKO2v2NXxR+iJDQl6RG5RwCfXqoa
v0VsIVumnqSnc45dZrjUS/c=
=SqY5
-----END PGP SIGNATURE-----
--Apple-Mail-3--325260294--
State-Changed-From-To: feedback->open
State-Changed-By: itetcu
State-Changed-When: Tue May 16 15:49:48 UTC 2006
State-Changed-Why:
new patch receved
http://www.freebsd.org/cgi/query-pr.cgi?pr=97210
State-Changed-From-To: open->closed
State-Changed-By: itetcu
State-Changed-When: Sun Jun 25 14:13:33 UTC 2006
State-Changed-Why:
New port added. Thanks!
http://www.freebsd.org/cgi/query-pr.cgi?pr=97210
