diff options
| author | thierry <thierry@FreeBSD.org> | 2007-07-17 03:07:54 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2007-07-17 03:07:54 +0800 |
| commit | 64dcdc3bbd5124d78c0c50a5f6c70194ffaa1176 (patch) | |
| tree | f88b563570786bd5720e704739da306ef546a899 /cad | |
| parent | 80b48f721c08a24eea67b404613c53cfaab14e64 (diff) | |
| download | freebsd-ports-gnome-64dcdc3bbd5124d78c0c50a5f6c70194ffaa1176.tar.gz freebsd-ports-gnome-64dcdc3bbd5124d78c0c50a5f6c70194ffaa1176.tar.zst freebsd-ports-gnome-64dcdc3bbd5124d78c0c50a5f6c70194ffaa1176.zip | |
Fix desktopdir entry.
Reported by: pointyhat via Pav.
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/kicad-devel/Makefile | 5 | ||||
| -rw-r--r-- | cad/kicad-devel/pkg-plist | 3 | ||||
| -rw-r--r-- | cad/kicad/Makefile | 5 | ||||
| -rw-r--r-- | cad/kicad/pkg-plist | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 12c7c479b393..d0ad538f4892 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -40,7 +40,8 @@ USE_GNOME= atk # Required by libwx_gtk2_aui-2.8.so #TODO Add support for Python. INSTDIR= ${PORTNAME} -PLIST_SUB= INSTDIR=${INSTDIR} OPSYS=${OPSYS} +PLIST_SUB= INSTDIR=${INSTDIR} OPSYS=${OPSYS} \ + DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||} DOS2CNV= makefile.gtk makefile.include libs.linux BINS= cvpcb eeschema gerbview kicad pcbnew @@ -85,7 +86,7 @@ pre-configure: ${WRKSRC}/common/eda_doc.cpp pre-install: - ${MKDIR} ${PREFIX}/${INSTDIR}/${OPSYS}/plugins + ${MKDIR} ${PREFIX}/${INSTDIR}/${OPSYS}/plugins ${DESKTOPDIR} (cd ${PREFIX} && ${TAR} -xzopf ${_DISTDIR}/${PORTNAME}-${DISTVERSION}.tgz) ${SED} -e 's|Exec=/usr/local/kicad/linux|Exec=$(PREFIX)/bin|' \ -e 's|Icon=/usr/local/kicad/linux|Icon=${PREFIX}/${INSTDIR}|' \ diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist index 735f81ec1983..3ff94de0eee9 100644 --- a/cad/kicad-devel/pkg-plist +++ b/cad/kicad-devel/pkg-plist @@ -1214,7 +1214,8 @@ %%INSTDIR%%/tutorial/Kicad_Tutorial_ru.odt %%INSTDIR%%/tutorial/Tutorial_Kicad_FR.odt %%INSTDIR%%/version.txt -share/applications/kicad.desktop +%%DESKTOPDIR%%/kicad.desktop +@dirrmtry %%DESKTOPDIR%% @dirrm %%INSTDIR%%/tutorial @dirrm %%INSTDIR%%/template @dirrm %%INSTDIR%%/modules/packages3d/valves diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 12c7c479b393..d0ad538f4892 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -40,7 +40,8 @@ USE_GNOME= atk # Required by libwx_gtk2_aui-2.8.so #TODO Add support for Python. INSTDIR= ${PORTNAME} -PLIST_SUB= INSTDIR=${INSTDIR} OPSYS=${OPSYS} +PLIST_SUB= INSTDIR=${INSTDIR} OPSYS=${OPSYS} \ + DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||} DOS2CNV= makefile.gtk makefile.include libs.linux BINS= cvpcb eeschema gerbview kicad pcbnew @@ -85,7 +86,7 @@ pre-configure: ${WRKSRC}/common/eda_doc.cpp pre-install: - ${MKDIR} ${PREFIX}/${INSTDIR}/${OPSYS}/plugins + ${MKDIR} ${PREFIX}/${INSTDIR}/${OPSYS}/plugins ${DESKTOPDIR} (cd ${PREFIX} && ${TAR} -xzopf ${_DISTDIR}/${PORTNAME}-${DISTVERSION}.tgz) ${SED} -e 's|Exec=/usr/local/kicad/linux|Exec=$(PREFIX)/bin|' \ -e 's|Icon=/usr/local/kicad/linux|Icon=${PREFIX}/${INSTDIR}|' \ diff --git a/cad/kicad/pkg-plist b/cad/kicad/pkg-plist index 735f81ec1983..3ff94de0eee9 100644 --- a/cad/kicad/pkg-plist +++ b/cad/kicad/pkg-plist @@ -1214,7 +1214,8 @@ %%INSTDIR%%/tutorial/Kicad_Tutorial_ru.odt %%INSTDIR%%/tutorial/Tutorial_Kicad_FR.odt %%INSTDIR%%/version.txt -share/applications/kicad.desktop +%%DESKTOPDIR%%/kicad.desktop +@dirrmtry %%DESKTOPDIR%% @dirrm %%INSTDIR%%/tutorial @dirrm %%INSTDIR%%/template @dirrm %%INSTDIR%%/modules/packages3d/valves |