diff options
| author | jylefort <jylefort@FreeBSD.org> | 2006-01-26 03:34:23 +0000 |
|---|---|---|
| committer | jylefort <jylefort@FreeBSD.org> | 2006-01-26 03:34:23 +0000 |
| commit | 88573008006efeb5cf8c0d1b18f6670071283b75 (patch) | |
| tree | 8edeb0180b009eb002e2f44213b8203f7a49af4b | |
| parent | 50f4fd43cd9a3093e4d730b8a6d6b7cc4bedebc1 (diff) | |
| download | FreeBSD-ports-88573008006efeb5cf8c0d1b18f6670071283b75.zip FreeBSD-ports-88573008006efeb5cf8c0d1b18f6670071283b75.tar.gz | |
[1]:
- Install using ${INSTALL_DATA}
- Respect ${PREFIX} in the wrapper script
Moreover [2]:
- Invoke java using exec
- Move to ${X11BASE}
[1]:
PR: ports/91981
Submitted by: maintainer
[2]:
Approved by: maintainer
| -rw-r--r-- | german/tvbrowser/Makefile | 17 | ||||
| -rw-r--r-- | german/tvbrowser/files/tvbrowser | 3 | ||||
| -rw-r--r-- | german/tvbrowser/files/tvbrowser.in | 2 | ||||
| -rw-r--r-- | misc/tvbrowser/Makefile | 17 | ||||
| -rw-r--r-- | misc/tvbrowser/files/tvbrowser | 3 | ||||
| -rw-r--r-- | misc/tvbrowser/files/tvbrowser.in | 2 |
6 files changed, 30 insertions, 14 deletions
diff --git a/german/tvbrowser/Makefile b/german/tvbrowser/Makefile index 52329d0..f042e6d 100644 --- a/german/tvbrowser/Makefile +++ b/german/tvbrowser/Makefile @@ -7,6 +7,7 @@ PORTNAME= tvbrowser PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= german java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= tvbrowser @@ -14,14 +15,22 @@ MASTER_SITE_SUBDIR= tvbrowser MAINTAINER= lars.engels@0x20.net COMMENT= A digital tv guide +USE_X_PREFIX= yes NO_BUILD= yes USE_JAVA= yes JAVA_VERSION= 1.4+ +SUB_FILES= tvbrowser + +DESKTOP_ENTRIES="TV-Browser" \ + "Browse TV programs" \ + "${DATADIR}/imgs/tvbrowser128.png" \ + "tvbrowser" \ + "Application;TV;" \ + false do-install: - @${MKDIR} ${PREFIX}/share/${PORTNAME} - @${CP} -r ${WRKSRC}/* ${PREFIX}/share/${PORTNAME} - @${CP} -r ${FILESDIR}/tvbrowser /${PREFIX}/bin/ - @${CHMOD} 755 /${PREFIX}/bin/tvbrowser + cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} "${DATADIR}/{}" \; + cd ${WRKSRC} && ${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \; + ${INSTALL_SCRIPT} ${WRKDIR}/tvbrowser ${PREFIX}/bin .include <bsd.port.mk> diff --git a/german/tvbrowser/files/tvbrowser b/german/tvbrowser/files/tvbrowser deleted file mode 100644 index 2def45e..0000000 --- a/german/tvbrowser/files/tvbrowser +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -cd /usr/local/share/tvbrowser && java -jar tvbrowser.jar diff --git a/german/tvbrowser/files/tvbrowser.in b/german/tvbrowser/files/tvbrowser.in new file mode 100644 index 0000000..6c2ee84 --- /dev/null +++ b/german/tvbrowser/files/tvbrowser.in @@ -0,0 +1,2 @@ +#!/bin/sh +cd %%DATADIR%% && exec %%LOCALBASE%%/bin/java -jar tvbrowser.jar "$@" diff --git a/misc/tvbrowser/Makefile b/misc/tvbrowser/Makefile index 52329d0..f042e6d 100644 --- a/misc/tvbrowser/Makefile +++ b/misc/tvbrowser/Makefile @@ -7,6 +7,7 @@ PORTNAME= tvbrowser PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= german java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= tvbrowser @@ -14,14 +15,22 @@ MASTER_SITE_SUBDIR= tvbrowser MAINTAINER= lars.engels@0x20.net COMMENT= A digital tv guide +USE_X_PREFIX= yes NO_BUILD= yes USE_JAVA= yes JAVA_VERSION= 1.4+ +SUB_FILES= tvbrowser + +DESKTOP_ENTRIES="TV-Browser" \ + "Browse TV programs" \ + "${DATADIR}/imgs/tvbrowser128.png" \ + "tvbrowser" \ + "Application;TV;" \ + false do-install: - @${MKDIR} ${PREFIX}/share/${PORTNAME} - @${CP} -r ${WRKSRC}/* ${PREFIX}/share/${PORTNAME} - @${CP} -r ${FILESDIR}/tvbrowser /${PREFIX}/bin/ - @${CHMOD} 755 /${PREFIX}/bin/tvbrowser + cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} "${DATADIR}/{}" \; + cd ${WRKSRC} && ${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \; + ${INSTALL_SCRIPT} ${WRKDIR}/tvbrowser ${PREFIX}/bin .include <bsd.port.mk> diff --git a/misc/tvbrowser/files/tvbrowser b/misc/tvbrowser/files/tvbrowser deleted file mode 100644 index 2def45e..0000000 --- a/misc/tvbrowser/files/tvbrowser +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -cd /usr/local/share/tvbrowser && java -jar tvbrowser.jar diff --git a/misc/tvbrowser/files/tvbrowser.in b/misc/tvbrowser/files/tvbrowser.in new file mode 100644 index 0000000..6c2ee84 --- /dev/null +++ b/misc/tvbrowser/files/tvbrowser.in @@ -0,0 +1,2 @@ +#!/bin/sh +cd %%DATADIR%% && exec %%LOCALBASE%%/bin/java -jar tvbrowser.jar "$@" |
