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

Drop RUN_DEPENDY on cups. If it's installed then it can be used, if not

Browse Source 
then it won't; no need to enforce the dependency.
While here, remove 3 patches and use some perl subst instead.
This commit is contained in:
ajacoutot 2012-02-17 17:22:08 +00:00
parent 1ee40d5fc7
commit 3fc9167fc9
4 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/nx/opennx/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.25 2012/01/18 11:57:50 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.26 2012/02/17 17:22:08 ajacoutot Exp $
COMMENT= OSS replacement for Nomachine's nxclient COMMENT= OSS replacement for Nomachine's nxclient
DISTNAME= opennx-0.16.0.658 DISTNAME= opennx-0.16.0.658
REVISION= 3 REVISION= 4
CATEGORIES= sysutils CATEGORIES= sysutils
@ -32,7 +32,6 @@ BUILD_DEPENDS= archivers/zip \
net/samba \ net/samba \
print/cups print/cups
RUN_DEPENDS= devel/desktop-file-utils \ RUN_DEPENDS= devel/desktop-file-utils \
print/cups \
x11/nx/nxproxy \ x11/nx/nxproxy \
x11/nx/nxssh x11/nx/nxssh
@ -41,19 +40,14 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \ CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
DOT_DESKTOP= innovidata-opennx-admin.desktop \
innovidata-opennx-wizard.desktop \
innovidata-opennx.desktop
pre-configure: pre-configure:
${SUBST_CMD} ${WRKSRC}/opennxApp.cpp \ ${SUBST_CMD} ${WRKSRC}/opennxApp.cpp \
${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in
cd ${WRKSRC}/extres/xdg && \ perl -pi -e 's,/usr/NX,${PREFIX}/NX,g' \
${SUBST_CMD} ${DOT_DESKTOP} ${WRKSRC}/extres/xdg/innovidata-opennx*.desktop
post-install: post-install:
ln -s ${TRUEPREFIX}/NX/bin/opennx ${PREFIX}/bin/opennx ln -s ${TRUEPREFIX}/NX/bin/opennx ${PREFIX}/bin/opennx
rm ${PREFIX}/share/applications/*.{beforesubst,orig}
rm ${PREFIX}/share/applications/innovidata-opennx.directory rm ${PREFIX}/share/applications/innovidata-opennx.directory
.include <bsd.port.mk> .include <bsd.port.mk>

12
x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx-admin_desktop
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-extres_xdg_innovidata-opennx-admin_desktop,v 1.1 2012/01/03 16:46:36 sebastia Exp $
--- extres/xdg/innovidata-opennx-admin.desktop.orig Fri Dec 30 10:34:47 2011
+++ extres/xdg/innovidata-opennx-admin.desktop Fri Dec 30 10:35:28 2011
@@ -2,7 +2,7 @@
Version=1.0
Encoding=UTF-8
Type=Application
-Exec=/usr/NX/bin/opennx --admin
+Exec=${PREFIX}/NX/bin/opennx --admin
Icon=opennx-admin
Comment=Manage OpenNX sessions
Comment[de]=Verwalte OpenNX Sitzungen

12
x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx-wizard_desktop
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-extres_xdg_innovidata-opennx-wizard_desktop,v 1.1 2012/01/03 16:46:36 sebastia Exp $
--- extres/xdg/innovidata-opennx-wizard.desktop.orig Fri Dec 30 10:35:45 2011
+++ extres/xdg/innovidata-opennx-wizard.desktop Fri Dec 30 10:36:09 2011
@@ -2,7 +2,7 @@
Version=1.0
Encoding=UTF-8
Type=Application
-Exec=/usr/NX/bin/opennx --wizard
+Exec=${PREFIX}/NX/bin/opennx --wizard
Icon=opennx-wizard
Comment=Create a new OpenNX session definition
Comment[de]=Erstelle eine neue OpenNX Sitzungs-Definition

12
x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx_desktop
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-extres_xdg_innovidata-opennx_desktop,v 1.1 2012/01/03 16:46:36 sebastia Exp $
--- extres/xdg/innovidata-opennx.desktop.orig Fri Dec 30 10:36:17 2011
+++ extres/xdg/innovidata-opennx.desktop Fri Dec 30 10:37:16 2011
@@ -2,7 +2,7 @@
Version=1.0
Encoding=UTF-8
Type=Application
-Exec=/usr/NX/bin/opennx
+Exec=${PREFIX}/NX/bin/opennx
Icon=nx
Comment=Connect to a remote NX server
Comment[de]=Mit einem NX-Server verbinden