diff options
| author | gahr <gahr@FreeBSD.org> | 2014-02-17 22:17:21 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2014-02-17 22:17:21 +0800 |
| commit | 238a93701575811a380d6a285a251b28365f989d (patch) | |
| tree | d1bb39ae0a0369142fb25768191da3d03d56343e | |
| parent | ba8d31dc37d8daaa0f09014b2f294b6422f82e73 (diff) | |
| download | freebsd-ports-gnome-238a93701575811a380d6a285a251b28365f989d.tar.gz freebsd-ports-gnome-238a93701575811a380d6a285a251b28365f989d.tar.zst freebsd-ports-gnome-238a93701575811a380d6a285a251b28365f989d.zip | |
- STAGE-clean
- Convert to USES=tk
- Fix build
| -rw-r--r-- | devel/gdb66/Makefile | 32 | ||||
| -rw-r--r-- | devel/gdb66/pkg-plist | 1 |
2 files changed, 16 insertions, 17 deletions
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile index f14329f88806..a050d1b55cb7 100644 --- a/devel/gdb66/Makefile +++ b/devel/gdb66/Makefile @@ -34,15 +34,13 @@ EXCLUDE= dejagnu expect readline sim texinfo intl EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /} VER= ${PORTVERSION:S/.//} PLIST_SUB= VER=${VER} -MAN1= gdb${VER}.1 -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MINSIGHT} PKGNAMESUFFIX= -insight -USE_TK= 84+ -LIB_DEPENDS= itk:${PORTSDIR}/x11-toolkits/itk +USES+= tk +LIB_DEPENDS= libitk.so:${PORTSDIR}/x11-toolkits/itk RUN_DEPENDS= ${LOCALBASE}/lib/iwidgets:${PORTSDIR}/x11-toolkits/iwidgets DISTFILES+= gdbtk-6.6${EXTRACT_SUFX}:gdbtk PLIST_SUB+= INSIGHT='' @@ -50,10 +48,10 @@ EXTRA_PATCHES= ${FILESDIR}/itcl33-patch \ ${FILESDIR}/extra-gdb-gdbtk-generic-gdbtk.c \ ${FILESDIR}/extra-gdb-gdbtk-generic-gdbtk-hooks.c CONFIGURE_ARGS+=--enable-gdbtk \ - --with-tclconfig=${LOCALBASE}/lib/tcl${TCL_VER} \ - --with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER}/generic \ - --with-tkconfig=${LOCALBASE}/lib/tk${TK_VER} \ - --with-tkinclude=${LOCALBASE}/include/tk${TK_VER}/generic \ + --with-tclconfig=${TCL_LIBDIR} \ + --with-tclinclude=${TCL_INCLUDEDIR}/generic \ + --with-tkconfig=${TK_LIBDIR} \ + --with-tkinclude=${TK_INCLUDEDIR}/generic \ --with-itclconfig=${LOCALBASE}/lib/itcl3.4 \ --with-itkconfig=${LOCALBASE}/lib/itk3.3 @@ -88,19 +86,19 @@ post-patch: -e 's/^readline/#readline/' \ -e 's,^LIBICONV =.*,LIBICONV=-L${LOCALBASE}/lib ${ICONV_LIB},' \ ${WRKSRC}/gdb/Makefile.in - ${ECHO} 'READLINE = -lreadline' >> ${WRKSRC}/gdb/Makefile.in + ${ECHO} 'READLINE = -lreadline_p' >> ${WRKSRC}/gdb/Makefile.in do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${PREFIX}/bin/gdb${VER} - ${LN} ${PREFIX}/bin/gdb${VER} ${PREFIX}/bin/gdbtui${VER} - ${INSTALL_MAN} ${WRKSRC}/gdb/gdb.1 ${MAN1PREFIX}/man/man1/gdb${VER}.1 + ${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${STAGEDIR}${PREFIX}/bin/gdb${VER} + ${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdbtui${VER} + ${INSTALL_MAN} ${WRKSRC}/gdb/gdb.1 ${STAGEDIR}${PREFIX}/man/man1/gdb${VER}.1 .if ${PORT_OPTIONS:MINSIGHT} - ${LN} ${PREFIX}/bin/gdb${VER} ${PREFIX}/bin/insight - ${MKDIR} ${PREFIX}/share/redhat/gui + ${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/insight + @${MKDIR} ${STAGEDIR}${PREFIX}/share/redhat/gui ${CP} -p ${WRKSRC}/libgui/library/*.tcl \ ${WRKSRC}/libgui/library/tclIndex \ - ${PREFIX}/share/redhat/gui/ - ${MKDIR} ${PREFIX}/lib/insight1.0 + ${STAGEDIR}${PREFIX}/share/redhat/gui/ + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/insight1.0 ${CP} -Rp ${WRKSRC}/gdb/gdbtk/library/*.tcl \ ${WRKSRC}/gdb/gdbtk/library/*.itcl \ ${WRKSRC}/gdb/gdbtk/library/*.ith \ @@ -108,7 +106,7 @@ do-install: ${WRKSRC}/gdb/gdbtk/library/help \ ${WRKSRC}/gdb/gdbtk/library/images* \ ${WRKSRC}/gdb/gdbtk/library/tclIndex \ - ${PREFIX}/lib/insight1.0 + ${STAGEDIR}${PREFIX}/lib/insight1.0 .endif .include <bsd.port.mk> diff --git a/devel/gdb66/pkg-plist b/devel/gdb66/pkg-plist index be617efdb079..b092f90a246f 100644 --- a/devel/gdb66/pkg-plist +++ b/devel/gdb66/pkg-plist @@ -1,5 +1,6 @@ bin/gdb%%VER%% bin/gdbtui%%VER%% +man/man1/gdb%%VER%%.1.gz %%INSIGHT%%bin/insight %%INSIGHT%%share/redhat/gui/advice.tcl %%INSIGHT%%share/redhat/gui/balloon.tcl |