Bug 190846 - [maintainer-update] Add staging support to sysutils/ezjail
Summary: [maintainer-update] Add staging support to sysutils/ezjail
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Danilo Egea Gondolfo
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-06-09 21:09 UTC by Dirk Engling
Modified: 2014-06-10 03:47 UTC (History)
1 user (show)

See Also:

Attachments
New patch. Bumps version number. (2.27 KB, patch)
2014-06-10 00:54 UTC, Dirk Engling 		no flags Details | Diff
This patch has distinfo for newly rolled ezjail-3.4.tar.b2 (2.27 KB, patch)
2014-06-10 03:21 UTC, Dirk Engling 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Dirk Engling 2014-06-09 21:09:07 UTC 
diff -ru /usr/ports/sysutils/ezjail/Makefile ./Makefile
--- /usr/ports/sysutils/ezjail/Makefile 2014-01-22 18:00:46.000000000 +0100
+++ ./Makefile  2014-06-01 13:46:54.559769660 +0200
@@ -8,16 +8,8 @@
 MAINTAINER=    erdgeist@erdgeist.org
 COMMENT=       Framework to easily create, manipulate, and run FreeBSD jails
 
-USE_BZIP2=     yes
+USES=          tar:bzip2
 
-MAN5=          ezjail.conf.5
-MAN7=          ezjail.7
-MAN8=          ezjail-admin.8
-
-NO_STAGE=      yes
-post-install:
-       [ -f ${PREFIX}/etc/${PORTNAME}.conf ] || \
-               ${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.sample \
-                        ${PREFIX}/etc/${PORTNAME}.conf
+MAKE_ENV=      DESTDIR=${STAGEDIR}
 
 .include <bsd.port.mk>
diff -ru /usr/ports/sysutils/ezjail/pkg-plist ./pkg-plist
--- /usr/ports/sysutils/ezjail/pkg-plist        2014-01-22 16:16:56.000000000 +0100
+++ ./pkg-plist 2014-06-01 13:48:19.275149967 +0200
@@ -1,6 +1,4 @@
-@unexec cmp -s %D/etc/ezjail.conf.sample %D/etc/ezjail.conf && rm -f %D/etc/ezjail.conf || true
-etc/ezjail.conf.sample
-@exec [ -f %B/ezjail.conf ] || cp -p %D/%F %B/ezjail.conf
+@sample etc/ezjail.conf.sample
 etc/rc.d/ezjail
 bin/ezjail-admin
 share/zsh/site-functions/ezjail-admin
@@ -13,6 +11,9 @@
 %%EXAMPLESDIR%%/nullmailer-example/etc/rc.conf
 %%EXAMPLESDIR%%/nullmailer-example/etc/mail/mailer.conf
 %%EXAMPLESDIR%%/nullmailer-example/usr/local/etc/nullmailer/remotes
+man/man5/ezjail.conf.5.gz
+man/man7/ezjail.7.gz
+man/man8/ezjail-admin.8.gz
 @dirrm etc/ezjail
 @dirrm %%EXAMPLESDIR%%/example/usr/local/etc
 @dirrm %%EXAMPLESDIR%%/example/usr/local
Comment 1 Dirk Engling 2014-06-09 21:13:10 UTC 
This one references the wrong version of ezjail. I will roll another one.
Comment 2 Dirk Engling 2014-06-10 00:54:10 UTC 
Created attachment 143586 [details]
New patch. Bumps version number.
Comment 3 Danilo Egea Gondolfo freebsd_committer freebsd_triage 2014-06-10 03:07:48 UTC 
It's failing to stage.

chown: /usr/ports/sysutils/ezjail/work/stage/usr/local/man/man8/ezjail-admin.8: Operation not permitted
chown: /usr/ports/sysutils/ezjail/work/stage/usr/local/man/man5/ezjail.conf.5: Operation not permitted
chown: /usr/ports/sysutils/ezjail/work/stage/usr/local/man/man7/ezjail.7: Operation not permitted
.
.
.

The "chown" in work/ezjail-3.4/Makefile isn't necessary.

Can you check, please?

Thanks!
Comment 4 Dirk Engling 2014-06-10 03:21:17 UTC 
Created attachment 143590 [details]
This patch has distinfo for newly rolled ezjail-3.4.tar.b2
Comment 5 Dirk Engling 2014-06-10 03:22:07 UTC 
I removed the -p flag from the cp lines in the Makefile, removing the need for the later chown.

HTH and thanks
Comment 6 commit-hook freebsd_committer freebsd_triage 2014-06-10 03:46:33 UTC 
A commit references this bug:

Author: danilo
Date: Tue Jun 10 03:45:47 UTC 2014
New revision: 357253
URL: http://svnweb.freebsd.org/changeset/ports/357253

Log:
  - Update from 3.3 to 3.4
  - Convert USE_BZIP2 to USES
  - Add stage support

  PR:		ports/190846
  Submitted by:	erdgeist@erdgeist.org

Changes:
  head/sysutils/ezjail/Makefile
  head/sysutils/ezjail/distinfo
  head/sysutils/ezjail/pkg-plist
Comment 7 Danilo Egea Gondolfo freebsd_committer freebsd_triage 2014-06-10 03:47:12 UTC 
Committed, thanks!