Little fix to x11/xarchive
Fix wantlib and license marker, use $SUBST_CMD, regen PLIST.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xarchive/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 26 Jan 2008 12:49:12 -0000 1.2
+++ Makefile 21 Nov 2008 18:59:49 -0000
@@ -3,14 +3,14 @@
COMMENT= GTK+2 front-end for command line archiving tools
DISTNAME= xarchive-0.2.8-6
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES= x11
HOMEPAGE= http://xarchive.sourceforge.net/
MAINTAINER= Giovanni Bechis <[EMAIL PROTECTED]>
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -21,7 +21,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
Xrender c expat fontconfig freetype m z atk-1.0 \
glib-2.0 gmodule-2.0 gobject-2.0 glitz png pango-1.0 \
- pangoft2-1.0 pangocairo-1.0 cairo Xcomposite Xdamage
+ pangoft2-1.0 pangocairo-1.0 pixman-1 cairo Xcomposite Xdamage
MODULES= devel/gettext
LIB_DEPENDS=
gdk_pixbuf-2.0.>=1000,gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2
@@ -35,8 +35,7 @@ CONFIGURE_ENV= BASH_PROG=/bin/sh
pre-configure:
@perl -pi -e 's,AWK_PROGS="mawk gawk awk",AWK_PROGS="awk gawk mawk",g' \
${WRKSRC}/wrappers/*.src
- @perl -pi -e 's,!!PREFIX!!,${PREFIX},g' \
- ${WRKSRC}/doc/xarchive.1 \
+ ${SUBST_CMD} ${WRKSRC}/doc/xarchive.1 \
${WRKSRC}/doc/xarchive.1.txt.src
.include <bsd.port.mk>
Index: patches/patch-doc_xarchive_1
===================================================================
RCS file: /cvs/ports/x11/xarchive/patches/patch-doc_xarchive_1,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-doc_xarchive_1
--- patches/patch-doc_xarchive_1 16 Jul 2007 21:35:42 -0000 1.1.1.1
+++ patches/patch-doc_xarchive_1 21 Nov 2008 18:59:49 -0000
@@ -9,11 +9,11 @@ $OpenBSD: patch-doc_xarchive_1,v 1.1.1.1
-.TP 0.2i
-\(bu
-(or, depending on installation /usr/lib/xarchive/wrappers/)
-+!!PREFIX!!/lib/xarchive/wrappers/
++${PREFIX}/lib/xarchive/wrappers/
.PP
The first wrappers found are the first ones used. Thus, if you copy a wrapper
-from the system wide directory (/usr/local/lib/xarchive/wrappers/) to your own
-+from the system wide directory (!!PREFIX!!/lib/xarchive/wrappers/) to your own
++from the system wide directory (${PREFIX}/lib/xarchive/wrappers/) to your own
private wrapper directory (~/.xarchive/wrappers/) and modify it, your modified
version will be used.
.PP
@@ -22,7 +22,7 @@ $OpenBSD: patch-doc_xarchive_1,v 1.1.1.1
Anything else for wrapper failure
.PP
-See the wrappers included in /usr/local/lib/xarchive/wrappers (or
/usr/lib/xarchive/wrappers) for examples.
-+See the wrappers included in !!PREFIX!!/lib/xarchive/wrappers for examples.
++See the wrappers included in ${PREFIX}/lib/xarchive/wrappers for examples.
.SH BUGS
Use bug tracker on the sourceforge project page:
.PP
Index: patches/patch-doc_xarchive_1_txt_src
===================================================================
RCS file: /cvs/ports/x11/xarchive/patches/patch-doc_xarchive_1_txt_src,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-doc_xarchive_1_txt_src
--- patches/patch-doc_xarchive_1_txt_src 16 Jul 2007 21:35:42 -0000
1.1.1.1
+++ patches/patch-doc_xarchive_1_txt_src 21 Nov 2008 18:59:49 -0000
@@ -6,13 +6,13 @@ $OpenBSD: patch-doc_xarchive_1_txt_src,v
- ~/.xarchive/wrappers/
-- /usr/local/lib/xarchive/wrappers/
-+- !!PREFIX!!/lib/xarchive/wrappers/
++- ${PREFIX}/lib/xarchive/wrappers/
-- (or, depending on installation /usr/lib/xarchive/wrappers/)
-
The first wrappers found are the first ones used. Thus, if you copy a wrapper
-from the system wide directory (/usr/local/lib/xarchive/wrappers/) to your own
-+from the system wide directory (!!PREFIX!!/lib/xarchive/wrappers/) to your own
++from the system wide directory (${PREFIX}/lib/xarchive/wrappers/) to your own
private wrapper directory (~/.xarchive/wrappers/) and modify it, your modified
version will be used.
@@ -21,7 +21,7 @@ $OpenBSD: patch-doc_xarchive_1_txt_src,v
- Anything else for wrapper failure
-See the wrappers included in /usr/local/lib/xarchive/wrappers (or
/usr/lib/xarchive/wrappers) for examples.
-+See the wrappers included in !!PREFIX!!/lib/xarchive/wrappers for examples.
++See the wrappers included in ${PREFIX}/lib/xarchive/wrappers for examples.
BUGS
----
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/xarchive/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 16 Jul 2007 21:35:42 -0000 1.1.1.1
+++ pkg/PLIST 21 Nov 2008 18:59:49 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/16 21:35:42 ajacoutot Exp $
-bin/xarchive
[EMAIL PROTECTED] bin/xarchive
lib/xarchive/
lib/xarchive/wrappers/
lib/xarchive/wrappers/7za-wrap.sh
@@ -11,7 +11,6 @@ lib/xarchive/wrappers/rpm-wrap.sh
lib/xarchive/wrappers/tar-wrap.sh
lib/xarchive/wrappers/zip-wrap.sh
@man man/man1/xarchive.1
-share/applications/
share/applications/xarchive.desktop
share/doc/xarchive/
share/doc/xarchive/xarchive.1.txt