cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- actually fix this patch

Browse Source
This commit is contained in:
jasper 2010-09-13 07:10:24 +00:00
parent 3dd9327e1a
commit 90f1cf4be0
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cad/pcb/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2010/09/09 07:54:12 jasper Exp $
# $OpenBSD: Makefile,v 1.13 2010/09/13 07:10:24 jasper Exp $
COMMENT= printed circuit board layout tool
DISTNAME= pcb-20091103
@ -29,7 +29,8 @@ RUN_DEPENDS= ::devel/m4 \
::graphics/ImageMagick \
::misc/shared-mime-info \
${MODTK_RUN_DEPENDS}
BUILD_DEPENDS= ${RUN_DEPENDS}
BUILD_DEPENDS= ${RUN_DEPENDS} \
::shells/bash
LIB_DEPENDS= ::graphics/gd \
::x11/gtk+2
@ -47,7 +48,8 @@ CONFIGURE_ARGS= --disable-doc \
pre-configure:
${SUBST_CMD} ${WRKSRC}/doc/pcb.1
${SUBST_CMD} ${WRKSRC}/doc/pcb.1 \
${WRKSRC}/icon-theme-installer
post-install:
rm -rf ${PREFIX}/share/${DISTNAME}

27
cad/pcb/patches/patch-icon-theme-installer
View File

@ -1,15 +1,24 @@
$OpenBSD: patch-icon-theme-installer,v 1.1 2010/09/09 07:51:22 jasper Exp $
--- icon-theme-installer.orig Wed Aug 25 18:54:22 2010
+++ icon-theme-installer Wed Aug 25 18:55:12 2010
@@ -108,9 +108,11 @@ if test ! -x `echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d'
$OpenBSD: patch-icon-theme-installer,v 1.2 2010/09/13 07:10:24 jasper Exp $
--- icon-theme-installer.orig Mon Sep 13 09:04:42 2010
+++ icon-theme-installer Mon Sep 13 09:05:25 2010
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!${LOCALBASE}/bin/bash
# icon-theme-installer
# Copyright (C) 2006 Novell, Inc.
@@ -103,12 +103,12 @@ if test -z "$INSTALL_BASE_DIR"; then
exit 1
fi
+if false; then #stupid crap
if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
-if test ! -x `echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '`; then
+if ! which $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then
echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)"
exit 1
fi
-if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
+if ! which $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then
echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
exit 1
+fi
fi
if test -z "$SRC_DIR"; then